From 71d5686f7841fad073d1107a5e8b9e799ae54640 Mon Sep 17 00:00:00 2001 From: Jiri Denemark Date: Wed, 7 Apr 2010 16:49:04 +0200 Subject: [PATCH] Properly advertise cpuselection guest capability There's no sense in advertising cpuselection capability when host CPU is not properly detected and advertised in host capabilities. --- src/qemu/qemu_conf.c | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/src/qemu/qemu_conf.c b/src/qemu/qemu_conf.c index f56a7ef55c..df57d88800 100644 --- a/src/qemu/qemu_conf.c +++ b/src/qemu/qemu_conf.c @@ -892,9 +892,10 @@ qemudCapsInitGuest(virCapsPtr caps, guest->arch.defaultInfo.emulator_mtime = binary_mtime; - if (qemudProbeCPUModels(binary, info->arch, &ncpus, NULL) == 0 - && ncpus > 0 - && !virCapabilitiesAddGuestFeature(guest, "cpuselection", 1, 0)) + if (caps->host.cpu && + qemudProbeCPUModels(binary, info->arch, &ncpus, NULL) == 0 && + ncpus > 0 && + !virCapabilitiesAddGuestFeature(guest, "cpuselection", 1, 0)) goto error; if (hvm) { -- GitLab