From: Ján Tomko <jtomko@redhat.com>
Date: Wed, 2 Jul 2014 08:35:31 +0000 (+0200)
Subject: Fix segfault when starting a domain with no cpu definition
X-Git-Tag: v1.2.7-rc1~261
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=1cd8f500ee133653ecb9d1b7f72b2b2e9870a1c3;p=thirdparty%2Flibvirt.git

Fix segfault when starting a domain with no cpu definition

My commit fba6bc4 iterated over the features in cpu definition
without checking if there is one.
---

diff --git a/src/qemu/qemu_migration.c b/src/qemu/qemu_migration.c
index bbfb09ac34..99d4c4a799 100644
--- a/src/qemu/qemu_migration.c
+++ b/src/qemu/qemu_migration.c
@@ -1513,7 +1513,7 @@ qemuMigrationIsAllowed(virQEMUDriverPtr driver, virDomainObjPtr vm,
         return false;
     }
 
-    for (i = 0; i < def->cpu->nfeatures; i++) {
+    for (i = 0; def->cpu && i < def->cpu->nfeatures; i++) {
         virCPUFeatureDefPtr feature = &def->cpu->features[i];
 
         if (feature->policy != VIR_CPU_FEATURE_REQUIRE)
diff --git a/src/qemu/qemu_process.c b/src/qemu/qemu_process.c
index a39cc0a0aa..570960e669 100644
--- a/src/qemu/qemu_process.c
+++ b/src/qemu/qemu_process.c
@@ -3636,7 +3636,7 @@ qemuProcessVerifyGuestCPU(virQEMUDriverPtr driver, virDomainObjPtr vm)
             }
         }
 
-        for (i = 0; i < def->cpu->nfeatures; i++) {
+        for (i = 0; def->cpu && i < def->cpu->nfeatures; i++) {
             virCPUFeatureDefPtr feature = &def->cpu->features[i];
 
             if (feature->policy != VIR_CPU_FEATURE_REQUIRE)