]> git.ipfire.org Git - thirdparty/libvirt.git/commitdiff
Fix crash in device hotplug cleanup code
authorDaniel P. Berrange <berrange@redhat.com>
Thu, 24 Sep 2009 14:42:25 +0000 (15:42 +0100)
committerDaniel P. Berrange <berrange@redhat.com>
Tue, 29 Sep 2009 11:20:56 +0000 (12:20 +0100)
* src/qemu/qemu_driver.c: Fix crash in scenario where XML
  parsing of hotplugged device failed & thus 'dev' is NULL

src/qemu/qemu_driver.c

index cf225c15cec694d22d24e4c1d6ee442063c5e12e..155e4a301566cdd693cf83c8cd63d34cd346f8eb 100644 (file)
@@ -4880,7 +4880,7 @@ cleanup:
     if (cgroup)
         virCgroupFree(&cgroup);
 
-    if (ret < 0) {
+    if (ret < 0 && dev != NULL) {
         if (qemuDomainSetDeviceOwnership(dom->conn, driver, dev, 1) < 0)
             VIR_WARN0("Fail to restore disk device ownership");
         virDomainDeviceDefFree(dev);