From: Michal Privoznik <mprivozn@redhat.com>
Date: Thu, 2 Aug 2012 14:25:41 +0000 (+0200)
Subject: qemu: Fix typo in qemuDomainModifyDeviceFlags
X-Git-Tag: v0.10.0-rc1~226
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=e94c0a09ee8da3edb7eba14154a13fb83c9139a7;p=thirdparty%2Flibvirt.git

qemu: Fix typo in qemuDomainModifyDeviceFlags

One of our latest commits fbe87126 introduced this nasty typo:
func(vmdef, ...); where func() dereference vmdef->ncontrollers,
and vmdef was initialized to NULL. This leaves us with unconditional
immediate segfault. It should be vm->def instead.
---

diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c
index b3f946c911..270e4dd93a 100644
--- a/src/qemu/qemu_driver.c
+++ b/src/qemu/qemu_driver.c
@@ -5833,7 +5833,7 @@ qemuDomainModifyDeviceFlags(virDomainPtr dom, const char *xml,
     }
 
     if (flags & VIR_DOMAIN_AFFECT_CONFIG) {
-        if (virDomainDefCompatibleDevice(vmdef, dev) < 0)
+        if (virDomainDefCompatibleDevice(vm->def, dev) < 0)
             goto endjob;
 
         /* Make a copy for updated domain. */