[PATCH] Fix segfault when starting a domain with no cpu definition

[Ján Tomko <jtomko@xxxxxxxxxx>]

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

 src/qemu/qemu_migration.c | 2 +-
 src/qemu/qemu_process.c   | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/qemu/qemu_migration.c b/src/qemu/qemu_migration.c
index bbfb09a..99d4c4a 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 a39cc0a..570960e 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)
-- 
1.8.5.5

--
libvir-list mailing list
libvir-list@xxxxxxxxxx
https://www.redhat.com/mailman/listinfo/libvir-list