NuKVM/libvirt
3
0
Fork 0
mirror of https://github.com/libvirt/libvirt.git synced 2025-02-25 18:55:26 -06:00
Code Issues Packages Projects Releases Wiki Activity

maint: clean up the unused variable 'caps' in src/qemu/qemu_*.c

Browse Source 
Signed-off-by: Wang Rui <moon.wangrui@huawei.com>
This commit is contained in:
Wang Rui 2014-12-10 17:45:33 +08:00 committed by Martin Kletzander
parent 0d60a03094
commit 6ee1c0ff67
2 changed files with 0 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/qemu/qemu_driver.c
View File

@ -1864,7 +1864,6 @@ static int qemuDomainResume(virDomainPtr dom)
virObjectEventPtr event = NULL; virObjectEventPtr event = NULL;
int state; int state;
virQEMUDriverConfigPtr cfg = NULL; virQEMUDriverConfigPtr cfg = NULL;
virCapsPtr caps = NULL;
if (!(vm = qemuDomObjFromDomain(dom))) if (!(vm = qemuDomObjFromDomain(dom)))
return -1; return -1;
@ -1901,8 +1900,6 @@ static int qemuDomainResume(virDomainPtr dom)
VIR_DOMAIN_EVENT_RESUMED, VIR_DOMAIN_EVENT_RESUMED,
VIR_DOMAIN_EVENT_RESUMED_UNPAUSED); VIR_DOMAIN_EVENT_RESUMED_UNPAUSED);
} }
if (!(caps = virQEMUDriverGetCapabilities(driver, false)))
goto endjob;
if (virDomainSaveStatus(driver->xmlopt, cfg->stateDir, vm) < 0) if (virDomainSaveStatus(driver->xmlopt, cfg->stateDir, vm) < 0)
goto endjob; goto endjob;
ret = 0; ret = 0;
@ -1916,7 +1913,6 @@ static int qemuDomainResume(virDomainPtr dom)
virObjectUnlock(vm); virObjectUnlock(vm);
if (event) if (event)
qemuDomainEventQueue(driver, event); qemuDomainEventQueue(driver, event);
virObjectUnref(caps);
virObjectUnref(cfg); virObjectUnref(cfg);
return ret; return ret;
} }
@ -7108,7 +7104,6 @@ qemuDomainChangeDiskMediaLive(virConnectPtr conn,
{ {
virDomainDiskDefPtr disk = dev->data.disk; virDomainDiskDefPtr disk = dev->data.disk;
virDomainDiskDefPtr orig_disk = NULL; virDomainDiskDefPtr orig_disk = NULL;
virCapsPtr caps = NULL;
int ret = -1; int ret = -1;
if (virStorageTranslateDiskSourcePool(conn, disk) < 0) if (virStorageTranslateDiskSourcePool(conn, disk) < 0)
@ -7129,9 +7124,6 @@ qemuDomainChangeDiskMediaLive(virConnectPtr conn,
goto end; goto end;
} }
if (!(caps = virQEMUDriverGetCapabilities(driver, false)))
goto end;
/* Add the new disk src into shared disk hash table */ /* Add the new disk src into shared disk hash table */
if (qemuAddSharedDevice(driver, dev, vm->def->name) < 0) if (qemuAddSharedDevice(driver, dev, vm->def->name) < 0)
goto end; goto end;
@ -7154,7 +7146,6 @@ qemuDomainChangeDiskMediaLive(virConnectPtr conn,
} }
end: end:
virObjectUnref(caps);
return ret; return ret;
} }

5
src/qemu/qemu_hotplug.c
View File

@ -758,7 +758,6 @@ qemuDomainAttachDeviceDiskLive(virConnectPtr conn,
{ {
virDomainDiskDefPtr disk = dev->data.disk; virDomainDiskDefPtr disk = dev->data.disk;
virDomainDiskDefPtr orig_disk = NULL; virDomainDiskDefPtr orig_disk = NULL;
virCapsPtr caps = NULL;
int ret = -1; int ret = -1;
const char *driverName = virDomainDiskGetDriver(disk); const char *driverName = virDomainDiskGetDriver(disk);
const char *src = virDomainDiskGetSource(disk); const char *src = virDomainDiskGetSource(disk);
@ -796,9 +795,6 @@ qemuDomainAttachDeviceDiskLive(virConnectPtr conn,
goto end; goto end;
} }
if (!(caps = virQEMUDriverGetCapabilities(driver, false)))
goto end;
if (qemuDomainChangeEjectableMedia(driver, conn, vm, orig_disk, if (qemuDomainChangeEjectableMedia(driver, conn, vm, orig_disk,
disk->src, false) < 0) disk->src, false) < 0)
goto end; goto end;
@ -837,7 +833,6 @@ qemuDomainAttachDeviceDiskLive(virConnectPtr conn,
end: end:
if (ret != 0) if (ret != 0)
ignore_value(qemuRemoveSharedDevice(driver, dev, vm->def->name)); ignore_value(qemuRemoveSharedDevice(driver, dev, vm->def->name));
virObjectUnref(caps);
return ret; return ret;
} }