From: Mark McLoughlin <markmc@redhat.com>
Date: Thu, 15 Oct 2009 11:09:17 +0000 (+0100)
Subject: Don't copy old machines from a domain which has none
X-Git-Tag: v0.7.3~217
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=2210f8a3a8e2774ca4fb8b42e21899e5b85ca913;p=thirdparty%2Flibvirt.git

Don't copy old machines from a domain which has none

If the the qemu and kvm binaries are the same, we don't include machine
types in the kvm domain info.

However, the code which refreshes the machine types info from the
previous capabilities structure first looks at the kvm domain's info,
finds it matches and then copies the empty machine types list over
for the top-level qemu domain.

That doesn't make sense, we shouldn't copy an empty machin types list.

* src/qemu/qemu_conf.c: qemudGetOldMachinesFromInfo(): don't copy an
  empty machine types list.
---

diff --git a/src/qemu/qemu_conf.c b/src/qemu/qemu_conf.c
index ac63570e90..b881f1e4d1 100644
--- a/src/qemu/qemu_conf.c
+++ b/src/qemu/qemu_conf.c
@@ -505,6 +505,9 @@ qemudGetOldMachinesFromInfo(virCapsGuestDomainInfoPtr info,
     virCapsGuestMachinePtr *list;
     int i;
 
+    if (!info->nmachines)
+        return 0;
+
     if (!info->emulator || !STREQ(emulator, info->emulator))
         return 0;