[libvirt] [PATCH] Only probe for CPU models if required
CPU models where probe everytime a qemu command line was built. But it
only makes sense to do so when a guest's XML contains CPU model.
Signed-off-by: Jiri Denemark <jdenemar(a)redhat.com>
---
src/qemu/qemu_conf.c | 7 ++++---
1 files changed, 4 insertions(+), 3 deletions(-)
diff --git a/src/qemu/qemu_conf.c b/src/qemu/qemu_conf.c
index 36bf9a2..3f6c79b 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);
--
1.6.6.rc4