Translate <maxphysaddr limit='39'/> to:
host-phys-bits-limit=39

https://gitlab.com/libvirt/libvirt/-/issues/450
https://bugzilla.redhat.com/show_bug.cgi?id=2171860

Signed-off-by: Ján Tomko <jtomko@redhat.com>
---
 src/qemu/qemu_command.c                       |  3 ++
 .../cpu-phys-bits-limit.x86_64-latest.args    | 34 +++++++++++++++++++
 tests/qemuxml2argvtest.c                      |  1 +
 3 files changed, 38 insertions(+)
 create mode 100644 tests/qemuxml2argvdata/cpu-phys-bits-limit.x86_64-latest.args

diff --git a/src/qemu/qemu_command.c b/src/qemu/qemu_command.c
index 4839d45a34..7eae858813 100644
--- a/src/qemu/qemu_command.c
+++ b/src/qemu/qemu_command.c
@@ -6450,6 +6450,9 @@ qemuBuildCpuCommandLine(virCommand *cmd,
         switch (addr->mode) {
         case VIR_CPU_MAX_PHYS_ADDR_MODE_PASSTHROUGH:
             virBufferAddLit(&buf, ",host-phys-bits=on");
+
+            if (addr->limit > 0)
+                virBufferAsprintf(&buf, ",host-phys-bits-limit=%d", addr->limit);
             break;
 
         case VIR_CPU_MAX_PHYS_ADDR_MODE_EMULATE:
diff --git a/tests/qemuxml2argvdata/cpu-phys-bits-limit.x86_64-latest.args b/tests/qemuxml2argvdata/cpu-phys-bits-limit.x86_64-latest.args
new file mode 100644
index 0000000000..a4652ba9f4
--- /dev/null
+++ b/tests/qemuxml2argvdata/cpu-phys-bits-limit.x86_64-latest.args
@@ -0,0 +1,34 @@
+LC_ALL=C \
+PATH=/bin \
+HOME=/tmp/lib/domain--1-foo \
+USER=test \
+LOGNAME=test \
+XDG_DATA_HOME=/tmp/lib/domain--1-foo/.local/share \
+XDG_CACHE_HOME=/tmp/lib/domain--1-foo/.cache \
+XDG_CONFIG_HOME=/tmp/lib/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":"/tmp/lib/domain--1-foo/master-key.aes"}' \
+-machine pc,usb=off,dump-guest-core=off,memory-backend=pc.ram \
+-accel kvm \
+-cpu host,migratable=on,host-phys-bits=on,host-phys-bits-limit=39 \
+-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 \
+-no-acpi \
+-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/qemuxml2argvtest.c b/tests/qemuxml2argvtest.c
index 5a33c336c8..492f98b3f1 100644
--- a/tests/qemuxml2argvtest.c
+++ b/tests/qemuxml2argvtest.c
@@ -2987,6 +2987,7 @@ mymain(void)
     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_VER("sgx-epc", "7.0.0");
 
-- 
2.39.2

On Wed, Mar 01, 2023 at 13:34:33 +0100, Ján Tomko wrote:
> Translate <maxphysaddr limit='39'/> to:
> host-phys-bits-limit=39
> 
> https://gitlab.com/libvirt/libvirt/-/issues/450
> https://bugzilla.redhat.com/show_bug.cgi?id=2171860
> 
> Signed-off-by: Ján Tomko <jtomko@redhat.com>
> ---
>  src/qemu/qemu_command.c                       |  3 ++
>  .../cpu-phys-bits-limit.x86_64-latest.args    | 34 +++++++++++++++++++
>  tests/qemuxml2argvtest.c                      |  1 +
>  3 files changed, 38 insertions(+)
>  create mode 100644 tests/qemuxml2argvdata/cpu-phys-bits-limit.x86_64-latest.args
> 
> diff --git a/src/qemu/qemu_command.c b/src/qemu/qemu_command.c
> index 4839d45a34..7eae858813 100644
> --- a/src/qemu/qemu_command.c
> +++ b/src/qemu/qemu_command.c
> @@ -6450,6 +6450,9 @@ qemuBuildCpuCommandLine(virCommand *cmd,
>          switch (addr->mode) {
>          case VIR_CPU_MAX_PHYS_ADDR_MODE_PASSTHROUGH:
>              virBufferAddLit(&buf, ",host-phys-bits=on");
> +
> +            if (addr->limit > 0)
> +                virBufferAsprintf(&buf, ",host-phys-bits-limit=%d", addr->limit);
>              break;

Continuation from previous patch:
 - here you format it only when mode is _PASSTHROUGH
 - Value 0 is in a limbo state, parser accepts it but it doesn't get
   formatted on the commandline

Reviewed-by: Peter Krempa <pkrempa@redhat.com>