[libvirt] [PATCH 27/27] Fix crash in device hotplug cleanup code

Daniel P. Berrange berrange at redhat.com
Thu Sep 24 15:00:29 UTC 2009


* 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 |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c
index da72913..7dc9353 100644
--- a/src/qemu/qemu_driver.c
+++ b/src/qemu/qemu_driver.c
@@ -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);
-- 
1.6.2.5




More information about the libvir-list mailing list