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 bbfb09ac34bf88816a65511c869e4e26827683e2..99d4c4a7993c46cbefb68cd286d29774c1db6a8b 100644 (file)
--- 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 a39cc0a0aa7172fc637a2f0989c2285558dd5913..570960e669351b0526dd6c8ae321e924e405b078 100644 (file)
--- 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)