]> git.ipfire.org Git - thirdparty/libvirt.git/commitdiff
qemu: Simplify the code
authorOsier Yang <jyang@redhat.com>
Tue, 4 Dec 2012 17:29:15 +0000 (01:29 +0800)
committerOsier Yang <jyang@redhat.com>
Wed, 5 Dec 2012 04:45:10 +0000 (12:45 +0800)
"disk" is initialized to "dev->data.disk" in the beginning of the
function.

src/qemu/qemu_driver.c

index a0503148f0573e477a9bbba10836292e20ebf409..64221cf99d75008272f3d2872dad8332b322dad5 100644 (file)
@@ -6136,9 +6136,8 @@ qemuDomainDetachDeviceDiskLive(virQEMUDriverPtr driver,
     case VIR_DOMAIN_DISK_DEVICE_LUN:
         if (disk->bus == VIR_DOMAIN_DISK_BUS_VIRTIO)
             ret = qemuDomainDetachPciDiskDevice(driver, vm, dev);
-        else if (disk->bus == VIR_DOMAIN_DISK_BUS_SCSI)
-            ret = qemuDomainDetachDiskDevice(driver, vm, dev);
-        else if (dev->data.disk->bus == VIR_DOMAIN_DISK_BUS_USB)
+        else if (disk->bus == VIR_DOMAIN_DISK_BUS_SCSI ||
+                 disk->bus == VIR_DOMAIN_DISK_BUS_USB)
             ret = qemuDomainDetachDiskDevice(driver, vm, dev);
         else
             virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s",