From: Jiri Denemark <jdenemar@redhat.com>
Date: Tue, 22 Dec 2009 11:23:56 +0000 (+0100)
Subject: Only probe for CPU models if required
X-Git-Tag: v0.7.5~18
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=8153c72b979c3355f6a9d523aee3c1f5c5ed190b;p=thirdparty%2Flibvirt.git

Only probe for CPU models if required

* src/qemu/qemu_conf.c: CPU models should be probed only if the
  a guest's XML contains CPU model, not each time a qemu command line
  is generated.
---

diff --git a/src/qemu/qemu_conf.c b/src/qemu/qemu_conf.c
index 36bf9a273f..3f6c79b124 100644
--- a/src/qemu/qemu_conf.c
+++ b/src/qemu/qemu_conf.c
@@ -1778,17 +1778,18 @@ qemudBuildCommandLineCPU(virConnectPtr conn,
 {
     const virCPUDefPtr host = driver->caps->host.cpu;
     virCPUDefPtr guest = NULL;
-    unsigned int ncpus;
+    unsigned int ncpus = 0;
     const char **cpus = NULL;
     union cpuData *data = NULL;
     int ret = -1;
     virBuffer buf = VIR_BUFFER_INITIALIZER;
     int i;
 
-    if (qemudProbeCPUModels(emulator, ut->machine, &ncpus, &cpus) < 0)
+    if (def->cpu && def->cpu->model
+        && qemudProbeCPUModels(emulator, ut->machine, &ncpus, &cpus) < 0)
         goto cleanup;
 
-    if (ncpus > 0 && host && def->cpu && def->cpu->model) {
+    if (ncpus > 0 && host) {
         virCPUCompareResult cmp;
 
         cmp = cpuGuestData(conn, host, def->cpu, &data);