From 03ca889b153f190c8a4ac6950cb93b7cb06cbddc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=A1n=20Tomko?= Date: Tue, 25 Apr 2023 11:11:59 +0200 Subject: [PATCH] qemu: allow forcing emulated maxphysaddr MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Treat: as a request not to take the maximum address size from the host. This is useful if QEMU changes the default. Signed-off-by: Ján Tomko Reviewed-by: Martin Kletzander --- docs/formatdomain.rst | 3 +- src/qemu/qemu_command.c | 5 ++- src/qemu/qemu_validate.c | 7 ---- ...-phys-bits-emulate-bare.x86_64-latest.args | 33 +++++++++++++++++++ ...te3.xml => cpu-phys-bits-emulate-bare.xml} | 0 .../cpu-phys-bits-emulate3.err | 1 - tests/qemuxml2argvtest.c | 2 +- ...u-phys-bits-emulate-bare.x86_64-latest.xml | 31 +++++++++++++++++ tests/qemuxml2xmltest.c | 1 + 9 files changed, 72 insertions(+), 11 deletions(-) create mode 100644 tests/qemuxml2argvdata/cpu-phys-bits-emulate-bare.x86_64-latest.args rename tests/qemuxml2argvdata/{cpu-phys-bits-emulate3.xml => cpu-phys-bits-emulate-bare.xml} (100%) delete mode 100644 tests/qemuxml2argvdata/cpu-phys-bits-emulate3.err create mode 100644 tests/qemuxml2xmloutdata/cpu-phys-bits-emulate-bare.x86_64-latest.xml diff --git a/docs/formatdomain.rst b/docs/formatdomain.rst index f5bbfdc20a..8420f5f99c 100644 --- a/docs/formatdomain.rst +++ b/docs/formatdomain.rst @@ -1636,7 +1636,8 @@ In case no restrictions need to be put on CPU model and its features, a simpler passed through to the virtual CPUs ``emulate`` The hypervisor will define a specific value for the number of bits - of physical addresses via the ``bits`` attribute, which is mandatory. + of physical addresses via the ``bits`` attribute, (optional + :since:`since 9.2.0`) The number of bits cannot exceed the number of physical address bits supported by the hypervisor. diff --git a/src/qemu/qemu_command.c b/src/qemu/qemu_command.c index 77e39d2b79..58a0484b33 100644 --- a/src/qemu/qemu_command.c +++ b/src/qemu/qemu_command.c @@ -6531,7 +6531,10 @@ qemuBuildCpuCommandLine(virCommand *cmd, break; case VIR_CPU_MAX_PHYS_ADDR_MODE_EMULATE: - virBufferAsprintf(&buf, ",phys-bits=%d", addr->bits); + if (addr->bits > 0) + virBufferAsprintf(&buf, ",phys-bits=%d", addr->bits); + else + virBufferAddLit(&buf, ",host-phys-bits=off"); break; case VIR_CPU_MAX_PHYS_ADDR_MODE_LAST: diff --git a/src/qemu/qemu_validate.c b/src/qemu/qemu_validate.c index fdfb4c6407..da4b9a3b35 100644 --- a/src/qemu/qemu_validate.c +++ b/src/qemu/qemu_validate.c @@ -269,13 +269,6 @@ qemuValidateDomainDefCpu(virQEMUDriver *driver, break; case VIR_CPU_MAX_PHYS_ADDR_MODE_EMULATE: - if (addr->bits == -1) { - virReportError(VIR_ERR_CONFIG_UNSUPPORTED, - _("if using CPU maximum physical address mode='%1$s', bits= must be specified too"), - virCPUMaxPhysAddrModeTypeToString(VIR_CPU_MAX_PHYS_ADDR_MODE_EMULATE)); - return -1; - } - if (driver->hostcpu && driver->hostcpu->addr && cpu->addr->bits > driver->hostcpu->addr->bits) { diff --git a/tests/qemuxml2argvdata/cpu-phys-bits-emulate-bare.x86_64-latest.args b/tests/qemuxml2argvdata/cpu-phys-bits-emulate-bare.x86_64-latest.args new file mode 100644 index 0000000000..28578fac20 --- /dev/null +++ b/tests/qemuxml2argvdata/cpu-phys-bits-emulate-bare.x86_64-latest.args @@ -0,0 +1,33 @@ +LC_ALL=C \ +PATH=/bin \ +HOME=/var/lib/libvirt/qemu/domain--1-foo \ +USER=test \ +LOGNAME=test \ +XDG_DATA_HOME=/var/lib/libvirt/qemu/domain--1-foo/.local/share \ +XDG_CACHE_HOME=/var/lib/libvirt/qemu/domain--1-foo/.cache \ +XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-foo/.config \ +/usr/bin/qemu-system-x86_64 \ +-name guest=foo,debug-threads=on \ +-S \ +-object '{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/var/lib/libvirt/qemu/domain--1-foo/master-key.aes"}' \ +-machine pc,usb=off,dump-guest-core=off,memory-backend=pc.ram,acpi=off \ +-accel kvm \ +-cpu host,migratable=on,host-phys-bits=off \ +-m 214 \ +-object '{"qom-type":"memory-backend-ram","id":"pc.ram","size":224395264}' \ +-overcommit mem-lock=off \ +-smp 1,sockets=1,cores=1,threads=1 \ +-uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ +-display none \ +-no-user-config \ +-nodefaults \ +-chardev socket,id=charmonitor,fd=1729,server=on,wait=off \ +-mon chardev=charmonitor,id=monitor,mode=control \ +-rtc base=utc \ +-no-shutdown \ +-boot strict=on \ +-device '{"driver":"piix3-usb-uhci","id":"usb","bus":"pci.0","addr":"0x1.0x2"}' \ +-audiodev '{"id":"audio1","driver":"none"}' \ +-device '{"driver":"virtio-balloon-pci","id":"balloon0","bus":"pci.0","addr":"0x2"}' \ +-sandbox on,obsolete=deny,elevateprivileges=deny,spawn=deny,resourcecontrol=deny \ +-msg timestamp=on diff --git a/tests/qemuxml2argvdata/cpu-phys-bits-emulate3.xml b/tests/qemuxml2argvdata/cpu-phys-bits-emulate-bare.xml similarity index 100% rename from tests/qemuxml2argvdata/cpu-phys-bits-emulate3.xml rename to tests/qemuxml2argvdata/cpu-phys-bits-emulate-bare.xml diff --git a/tests/qemuxml2argvdata/cpu-phys-bits-emulate3.err b/tests/qemuxml2argvdata/cpu-phys-bits-emulate3.err deleted file mode 100644 index 5e21998259..0000000000 --- a/tests/qemuxml2argvdata/cpu-phys-bits-emulate3.err +++ /dev/null @@ -1 +0,0 @@ -unsupported configuration: if using CPU maximum physical address mode='emulate', bits= must be specified too diff --git a/tests/qemuxml2argvtest.c b/tests/qemuxml2argvtest.c index 48ddc102f7..270d6fa59e 100644 --- a/tests/qemuxml2argvtest.c +++ b/tests/qemuxml2argvtest.c @@ -2720,9 +2720,9 @@ mymain(void) DO_TEST("cpu-phys-bits-passthrough", QEMU_CAPS_KVM); DO_TEST("cpu-phys-bits-emulate", QEMU_CAPS_KVM); DO_TEST("cpu-phys-bits-emulate2", QEMU_CAPS_KVM); - DO_TEST_PARSE_ERROR("cpu-phys-bits-emulate3", QEMU_CAPS_KVM); DO_TEST_PARSE_ERROR("cpu-phys-bits-passthrough2", QEMU_CAPS_KVM); DO_TEST_CAPS_LATEST("cpu-phys-bits-limit"); + DO_TEST_CAPS_LATEST("cpu-phys-bits-emulate-bare"); DO_TEST_CAPS_VER("sgx-epc", "7.0.0"); diff --git a/tests/qemuxml2xmloutdata/cpu-phys-bits-emulate-bare.x86_64-latest.xml b/tests/qemuxml2xmloutdata/cpu-phys-bits-emulate-bare.x86_64-latest.xml new file mode 100644 index 0000000000..94b3627a46 --- /dev/null +++ b/tests/qemuxml2xmloutdata/cpu-phys-bits-emulate-bare.x86_64-latest.xml @@ -0,0 +1,31 @@ + + foo + c7a5fdbd-edaf-9455-926a-d65c16db1809 + 219136 + 219136 + 1 + + hvm + + + + + + + destroy + restart + destroy + + /usr/bin/qemu-system-x86_64 + +
+ + + + +