From 9c89cc5d6ff60122e15c086c92e93aeb5180cb6e Mon Sep 17 00:00:00 2001 From: =?utf8?q?Daniel=20P=2E=20Berrang=C3=A9?= Date: Fri, 5 Feb 2021 18:21:14 +0000 Subject: [PATCH] qemu: probe for "-cpu max" support MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit This is a special CPU model similar to "-cpu host", so won't use our normal CPU model detection logic. Reviewed-by: Pavel Hrdina Signed-off-by: Daniel P. Berrangé --- src/qemu/qemu_capabilities.c | 12 ++++++++++++ src/qemu/qemu_capabilities.h | 1 + 2 files changed, 13 insertions(+) diff --git a/src/qemu/qemu_capabilities.c b/src/qemu/qemu_capabilities.c index fb302c8e0c..a61a2616c7 100644 --- a/src/qemu/qemu_capabilities.c +++ b/src/qemu/qemu_capabilities.c @@ -614,6 +614,7 @@ VIR_ENUM_IMPL(virQEMUCaps, /* 390 */ "vhost-user-blk", + "cpu-max", ); @@ -2984,12 +2985,23 @@ virQEMUCapsProbeQMPCPUDefinitions(virQEMUCapsPtr qemuCaps, virQEMUCapsAccelPtr accel, qemuMonitorPtr mon) { + qemuMonitorCPUDefsPtr defs; + size_t i; + if (!virQEMUCapsGet(qemuCaps, QEMU_CAPS_QUERY_CPU_DEFINITIONS)) return 0; if (virQEMUCapsFetchCPUDefinitions(mon, qemuCaps->arch, &accel->cpuModels) < 0) return -1; + defs = accel->cpuModels; + for (i = 0; i < defs->ncpus; i++) { + if (STREQ_NULLABLE(defs->cpus[i].name, "max")) { + virQEMUCapsSet(qemuCaps, QEMU_CAPS_CPU_MAX); + break; + } + } + return 0; } diff --git a/src/qemu/qemu_capabilities.h b/src/qemu/qemu_capabilities.h index 8cb5673042..79d443adfb 100644 --- a/src/qemu/qemu_capabilities.h +++ b/src/qemu/qemu_capabilities.h @@ -594,6 +594,7 @@ typedef enum { /* virQEMUCapsFlags grouping marker for syntax-check */ /* 390 */ QEMU_CAPS_DEVICE_VHOST_USER_BLK, /* -device vhost-user-blk */ + QEMU_CAPS_CPU_MAX, /* -cpu max */ QEMU_CAPS_LAST /* this must always be the last item */ } virQEMUCapsFlags; -- 2.47.2