]> xenbits.xensource.com Git - libvirt.git/commitdiff
maint: clean up the unused variable 'caps' in src/qemu/qemu_*.c
authorWang Rui <moon.wangrui@huawei.com>
Wed, 10 Dec 2014 09:45:33 +0000 (17:45 +0800)
committerMartin Kletzander <mkletzan@redhat.com>
Wed, 10 Dec 2014 10:21:31 +0000 (11:21 +0100)
Signed-off-by: Wang Rui <moon.wangrui@huawei.com>
src/qemu/qemu_driver.c
src/qemu/qemu_hotplug.c

index ae6225b2224b6d3dffa0d076de98559d28fe19d2..830fca737bcc7a8ffdb27b5ca7a090c21d3d0710 100644 (file)
@@ -1864,7 +1864,6 @@ static int qemuDomainResume(virDomainPtr dom)
     virObjectEventPtr event = NULL;
     int state;
     virQEMUDriverConfigPtr cfg = NULL;
-    virCapsPtr caps = NULL;
 
     if (!(vm = qemuDomObjFromDomain(dom)))
         return -1;
@@ -1901,8 +1900,6 @@ static int qemuDomainResume(virDomainPtr dom)
                                          VIR_DOMAIN_EVENT_RESUMED,
                                          VIR_DOMAIN_EVENT_RESUMED_UNPAUSED);
     }
-    if (!(caps = virQEMUDriverGetCapabilities(driver, false)))
-        goto endjob;
     if (virDomainSaveStatus(driver->xmlopt, cfg->stateDir, vm) < 0)
         goto endjob;
     ret = 0;
@@ -1916,7 +1913,6 @@ static int qemuDomainResume(virDomainPtr dom)
         virObjectUnlock(vm);
     if (event)
         qemuDomainEventQueue(driver, event);
-    virObjectUnref(caps);
     virObjectUnref(cfg);
     return ret;
 }
@@ -7108,7 +7104,6 @@ qemuDomainChangeDiskMediaLive(virConnectPtr conn,
 {
     virDomainDiskDefPtr disk = dev->data.disk;
     virDomainDiskDefPtr orig_disk = NULL;
-    virCapsPtr caps = NULL;
     int ret = -1;
 
     if (virStorageTranslateDiskSourcePool(conn, disk) < 0)
@@ -7129,9 +7124,6 @@ qemuDomainChangeDiskMediaLive(virConnectPtr conn,
             goto end;
         }
 
-        if (!(caps = virQEMUDriverGetCapabilities(driver, false)))
-            goto end;
-
         /* Add the new disk src into shared disk hash table */
         if (qemuAddSharedDevice(driver, dev, vm->def->name) < 0)
             goto end;
@@ -7154,7 +7146,6 @@ qemuDomainChangeDiskMediaLive(virConnectPtr conn,
     }
 
  end:
-    virObjectUnref(caps);
     return ret;
 }
 
index 0d97b579969c6890327b23b158818d401fd0f06d..95304517af26e66d217ad5cfc7288389eb25c7e4 100644 (file)
@@ -758,7 +758,6 @@ qemuDomainAttachDeviceDiskLive(virConnectPtr conn,
 {
     virDomainDiskDefPtr disk = dev->data.disk;
     virDomainDiskDefPtr orig_disk = NULL;
-    virCapsPtr caps = NULL;
     int ret = -1;
     const char *driverName = virDomainDiskGetDriver(disk);
     const char *src = virDomainDiskGetSource(disk);
@@ -796,9 +795,6 @@ qemuDomainAttachDeviceDiskLive(virConnectPtr conn,
             goto end;
         }
 
-        if (!(caps = virQEMUDriverGetCapabilities(driver, false)))
-            goto end;
-
         if (qemuDomainChangeEjectableMedia(driver, conn, vm, orig_disk,
                                            disk->src, false) < 0)
             goto end;
@@ -837,7 +833,6 @@ qemuDomainAttachDeviceDiskLive(virConnectPtr conn,
  end:
     if (ret != 0)
         ignore_value(qemuRemoveSharedDevice(driver, dev, vm->def->name));
-    virObjectUnref(caps);
     return ret;
 }