From 1cd8f500ee133653ecb9d1b7f72b2b2e9870a1c3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=A1n=20Tomko?= Date: Wed, 2 Jul 2014 10:35:31 +0200 Subject: [PATCH] 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. --- 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 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) -- GitLab