7:47 a.m.
Fixes https://bugzilla.redhat.com/show_bug.cgi?id=1519146
---
Shivaprasad G Bhat (2):
qemu: Add capability for pseries machine's max-cpu-compat= parameter
qemu: Add support for pseries machine's max-cpu-compat= parameter
src/qemu/qemu_capabilities.c | 7 +++++++
src/qemu/qemu_capabilities.h | 1 +
src/qemu/qemu_command.c | 11 ++++++++++
tests/qemucapabilitiesdata/caps_2.10.0.ppc64.xml | 1 +
.../pseries-machine-max-cpu-compat.args | 21 ++++++++++++++++++++
.../pseries-machine-max-cpu-compat.xml | 17 ++++++++++++++++
tests/qemuxml2argvtest.c | 5 +++++
7 files changed, 62 insertions(+), 1 deletion(-)
create mode 100644 tests/qemuxml2argvdata/pseries-machine-max-cpu-compat.args
create mode 100644 tests/qemuxml2argvdata/pseries-machine-max-cpu-compat.xml
--
Signature
7:47 a.m.
New subject: [libvirt] [PATCH v2 1/2] qemu: Add capability for pseries machine's max-cpu-compat= parameter
Signed-off-by: Shivaprasad G Bhat <sbhat(a)linux.vnet.ibm.com>
---
src/qemu/qemu_capabilities.c | 7 +++++++
src/qemu/qemu_capabilities.h | 1 +
tests/qemucapabilitiesdata/caps_2.10.0.ppc64.xml | 1 +
3 files changed, 9 insertions(+)
diff --git a/src/qemu/qemu_capabilities.c b/src/qemu/qemu_capabilities.c
index 9673ef8..5a554df 100644
--- a/src/qemu/qemu_capabilities.c
+++ b/src/qemu/qemu_capabilities.c
@@ -456,6 +456,7 @@ VIR_ENUM_IMPL(virQEMUCaps, QEMU_CAPS_LAST,
/* 280 */
"pl011",
+ "machine.pseries.max-cpu-compat",
);
@@ -4836,6 +4837,12 @@ virQEMUCapsInitQMPMonitor(virQEMUCapsPtr qemuCaps,
if (qemuCaps->version >= 2010000)
virQEMUCapsSet(qemuCaps, QEMU_CAPS_NUMA_DIST);
+ /* no way to query max-cpu-compat */
+ if (qemuCaps->version >= 2010000 &&
+ ARCH_IS_PPC64(qemuCaps->arch)) {
+ virQEMUCapsSet(qemuCaps, QEMU_CAPS_MACHINE_PSERIES_MAX_CPU_COMPAT);
+ }
+
if (virQEMUCapsProbeQMPCommands(qemuCaps, mon) < 0)
goto cleanup;
diff --git a/src/qemu/qemu_capabilities.h b/src/qemu/qemu_capabilities.h
index e73dbaa..f0690af 100644
--- a/src/qemu/qemu_capabilities.h
+++ b/src/qemu/qemu_capabilities.h
@@ -442,6 +442,7 @@ typedef enum {
/* 280 */
QEMU_CAPS_DEVICE_PL011, /* -device pl011 (not user-instantiable) */
+ QEMU_CAPS_MACHINE_PSERIES_MAX_CPU_COMPAT, /* -machine pseries,max-cpu-compat= */
QEMU_CAPS_LAST /* this must always be the last item */
} virQEMUCapsFlags;
diff --git a/tests/qemucapabilitiesdata/caps_2.10.0.ppc64.xml
b/tests/qemucapabilitiesdata/caps_2.10.0.ppc64.xml
index ca55e11..37fed23 100644
--- a/tests/qemucapabilitiesdata/caps_2.10.0.ppc64.xml
+++ b/tests/qemucapabilitiesdata/caps_2.10.0.ppc64.xml
@@ -183,6 +183,7 @@
<flag name='disk-share-rw'/>
<flag name='iscsi.password-secret'/>
<flag name='isa-serial'/>
+ <flag name='machine.pseries.max-cpu-compat'/>
<version>2010000</version>
<kvmVersion>0</kvmVersion>
<package> (v2.10.0)</package>
7:48 a.m.
New subject: [libvirt] [PATCH v2 2/2] qemu: Add support for pseries machine's max-cpu-compat= parameter
When the -machine pseries,max-cpu-compat=X is supported use
machine parameter instead of -cpu host,compat=X parameter as
that is deprecated now with qemu > v2.10.
Fixes https://bugzilla.redhat.com/show_bug.cgi?id=1519146
Signed-off-by: Shivaprasad G Bhat <sbhat(a)linux.vnet.ibm.com>
---
src/qemu/qemu_command.c | 11 ++++++++++
.../pseries-machine-max-cpu-compat.args | 21 ++++++++++++++++++++
.../pseries-machine-max-cpu-compat.xml | 17 ++++++++++++++++
tests/qemuxml2argvtest.c | 5 +++++
4 files changed, 53 insertions(+), 1 deletion(-)
create mode 100644 tests/qemuxml2argvdata/pseries-machine-max-cpu-compat.args
create mode 100644 tests/qemuxml2argvdata/pseries-machine-max-cpu-compat.xml
diff --git a/src/qemu/qemu_command.c b/src/qemu/qemu_command.c
index 4d0c141..1051a5c 100644
--- a/src/qemu/qemu_command.c
+++ b/src/qemu/qemu_command.c
@@ -6923,8 +6923,10 @@ qemuBuildCpuModelArgStr(virQEMUDriverPtr driver,
case VIR_CPU_MODE_HOST_MODEL:
if (ARCH_IS_PPC64(def->os.arch)) {
virBufferAddLit(buf, "host");
- if (cpu->model)
+ if (cpu->model &&
+ !(qemuDomainIsPSeries(def) && virQEMUCapsGet(qemuCaps,
QEMU_CAPS_MACHINE_PSERIES_MAX_CPU_COMPAT))) {
virBufferAsprintf(buf, ",compat=%s", cpu->model);
+ }
} else {
virReportError(VIR_ERR_INTERNAL_ERROR,
_("unexpected host-model CPU for %s architecture"),
@@ -7414,6 +7416,7 @@ qemuBuildMachineCommandLine(virCommandPtr cmd,
} else {
virTristateSwitch vmport = def->features[VIR_DOMAIN_FEATURE_VMPORT];
virTristateSwitch smm = def->features[VIR_DOMAIN_FEATURE_SMM];
+ virCPUDefPtr cpu = def->cpu;
virCommandAddArg(cmd, "-machine");
virBufferAdd(&buf, def->os.machine, -1);
@@ -7588,6 +7591,12 @@ qemuBuildMachineCommandLine(virCommandPtr cmd,
virBufferAsprintf(&buf, ",resize-hpt=%s", str);
}
+ if (qemuDomainIsPSeries(def) && cpu && cpu->model &&
+ cpu->mode == VIR_CPU_MODE_HOST_MODEL &&
+ virQEMUCapsGet(qemuCaps, QEMU_CAPS_MACHINE_PSERIES_MAX_CPU_COMPAT)) {
+ virBufferAsprintf(&buf, ",max-cpu-compat=%s", cpu->model);
+ }
+
if (virQEMUCapsGet(qemuCaps, QEMU_CAPS_BOOTINDEX) &&
virQEMUCapsGet(qemuCaps, QEMU_CAPS_LOADPARM))
qemuAppendLoadparmMachineParm(&buf, def);
diff --git a/tests/qemuxml2argvdata/pseries-machine-max-cpu-compat.args
b/tests/qemuxml2argvdata/pseries-machine-max-cpu-compat.args
new file mode 100644
index 0000000..2796d23
--- /dev/null
+++ b/tests/qemuxml2argvdata/pseries-machine-max-cpu-compat.args
@@ -0,0 +1,21 @@
+LC_ALL=C \
+PATH=/bin \
+HOME=/home/test \
+USER=test \
+LOGNAME=test \
+QEMU_AUDIO_DRV=none \
+/usr/bin/qemu-system-ppc64 \
+-name QEMUGuest1 \
+-S \
+-machine pseries,accel=kvm,max-cpu-compat=power7 \
+-cpu host \
+-m 256 \
+-smp 4,sockets=4,cores=1,threads=1 \
+-uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \
+-nographic \
+-nodefconfig \
+-nodefaults \
+-chardev socket,id=charmonitor,path=/tmp/lib/domain--1-QEMUGuest1/monitor.sock,\
+server,nowait \
+-mon chardev=charmonitor,id=monitor,mode=readline \
+-boot c
diff --git a/tests/qemuxml2argvdata/pseries-machine-max-cpu-compat.xml
b/tests/qemuxml2argvdata/pseries-machine-max-cpu-compat.xml
new file mode 100644
index 0000000..19668c7
--- /dev/null
+++ b/tests/qemuxml2argvdata/pseries-machine-max-cpu-compat.xml
@@ -0,0 +1,17 @@
+<domain type='kvm'>
+ <name>QEMUGuest1</name>
+ <uuid>c7a5fdbd-edaf-9455-926a-d65c16db1809</uuid>
+ <memory unit='KiB'>219100</memory>
+ <vcpu placement='static'>4</vcpu>
+ <os>
+ <type arch='ppc64' machine='pseries'>hvm</type>
+ </os>
+ <cpu mode='host-model'>
+ <model>power7</model>
+ </cpu>
+ <devices>
+ <emulator>/usr/bin/qemu-system-ppc64</emulator>
+ <controller type='usb' model='none'/>
+ <memballoon model="none"/>
+ </devices>
+</domain>
diff --git a/tests/qemuxml2argvtest.c b/tests/qemuxml2argvtest.c
index fe15072..be32d89 100644
--- a/tests/qemuxml2argvtest.c
+++ b/tests/qemuxml2argvtest.c
@@ -1816,6 +1816,11 @@ mymain(void)
DO_TEST("pseries-cpu-compat", QEMU_CAPS_KVM,
QEMU_CAPS_DEVICE_SPAPR_VTY,
QEMU_CAPS_NODEFCONFIG);
+ DO_TEST("pseries-machine-max-cpu-compat",
+ QEMU_CAPS_KVM,
+ QEMU_CAPS_MACHINE_OPT,
+ QEMU_CAPS_MACHINE_PSERIES_MAX_CPU_COMPAT,
+ QEMU_CAPS_NODEFCONFIG);
DO_TEST("pseries-cpu-le", QEMU_CAPS_KVM,
QEMU_CAPS_DEVICE_SPAPR_VTY,
QEMU_CAPS_NODEFCONFIG);
10:15 a.m.
New subject: [libvirt] [PATCH v2 2/2] qemu: Add support for pseries machine's max-cpu-compat= parameter
On Fri, 2018-01-05 at 19:18 +0530, Shivaprasad G Bhat wrote:
When the -machine pseries,max-cpu-compat=X is supported use
machine parameter instead of -cpu host,compat=X parameter as
that is deprecated now with qemu > v2.10.
That's actually >= 2.10.
Fixes https://bugzilla.redhat.com/show_bug.cgi?id=1519146
Signed-off-by: Shivaprasad G Bhat <sbhat(a)linux.vnet.ibm.com>
---
src/qemu/qemu_command.c | 11 ++++++++++
.../pseries-machine-max-cpu-compat.args | 21 ++++++++++++++++++++
.../pseries-machine-max-cpu-compat.xml | 17 ++++++++++++++++
tests/qemuxml2argvtest.c | 5 +++++
4 files changed, 53 insertions(+), 1 deletion(-)
create mode 100644 tests/qemuxml2argvdata/pseries-machine-max-cpu-compat.args
create mode 100644 tests/qemuxml2argvdata/pseries-machine-max-cpu-compat.xml
Everything else looks good, so
Reviewed-by: Andrea Bolognani <abologna(a)redhat.com>
I've performed some minor formatting tweaks that wouldn't justify
a full respin, addressed the commit message issue mentioned above
and pushed the series.
--
Andrea Bolognani / Red Hat / Virtualization
2513
days inactive
2513
days old
3 comments
2 participants
participants (2)
-
Andrea Bolognani -
Shivaprasad G Bhat