mirror of
https://gitlab.com/libvirt/libvirt.git
synced 2024-10-01 20:05:46 +00:00
qemuhotplugtest: use g_autoptr(virDomainDeviceDef)
This brings us one step closer to the caller of qemuDomainAttachDeviceLive() (qemuDomainAttachDeviceLiveAndConfig()). Signed-off-by: Michal Privoznik <mprivozn@redhat.com> Reviewed-by: Kristina Hanicova <khanicov@redhat.com>
This commit is contained in:
parent
22c082b8a2
commit
11793a5311
@ -154,7 +154,7 @@ testQemuHotplug(const void *data)
|
|||||||
bool keep = test->keep;
|
bool keep = test->keep;
|
||||||
unsigned int device_parse_flags = 0;
|
unsigned int device_parse_flags = 0;
|
||||||
virDomainObj *vm = NULL;
|
virDomainObj *vm = NULL;
|
||||||
virDomainDeviceDef *dev = NULL;
|
g_autoptr(virDomainDeviceDef) dev = NULL;
|
||||||
g_autoptr(qemuMonitorTest) test_mon = NULL;
|
g_autoptr(qemuMonitorTest) test_mon = NULL;
|
||||||
qemuDomainObjPrivate *priv = NULL;
|
qemuDomainObjPrivate *priv = NULL;
|
||||||
|
|
||||||
@ -229,11 +229,6 @@ testQemuHotplug(const void *data)
|
|||||||
switch (test->action) {
|
switch (test->action) {
|
||||||
case ATTACH:
|
case ATTACH:
|
||||||
ret = qemuDomainAttachDeviceLive(vm, dev, &driver);
|
ret = qemuDomainAttachDeviceLive(vm, dev, &driver);
|
||||||
if (ret == 0) {
|
|
||||||
/* vm->def stolen dev->data.* so we just need to free the dev
|
|
||||||
* envelope */
|
|
||||||
VIR_FREE(dev);
|
|
||||||
}
|
|
||||||
if (ret == 0 || fail)
|
if (ret == 0 || fail)
|
||||||
ret = testQemuHotplugCheckResult(vm, result_xml,
|
ret = testQemuHotplugCheckResult(vm, result_xml,
|
||||||
result_filename, fail);
|
result_filename, fail);
|
||||||
@ -262,7 +257,6 @@ testQemuHotplug(const void *data)
|
|||||||
virObjectUnref(vm);
|
virObjectUnref(vm);
|
||||||
test->vm = NULL;
|
test->vm = NULL;
|
||||||
}
|
}
|
||||||
virDomainDeviceDefFree(dev);
|
|
||||||
return ((ret < 0 && fail) || (!ret && !fail)) ? 0 : -1;
|
return ((ret < 0 && fail) || (!ret && !fail)) ? 0 : -1;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user