From 089fcf6b4e99b847ef34ebe0a83a75ea7a6dd011 Mon Sep 17 00:00:00 2001 From: Zvonko Kaiser Date: Fri, 17 Jul 2026 16:15:00 +0000 Subject: [PATCH] qemu/machine/fixtures: normalize memory-backend-file option order The vEGM fixtures used id,mem-path,size,share,prealloc while the vCMDQ and Q35 SHM fixtures use id,size,mem-path with prealloc before share. QEMU treats the options as unordered, but the golden tests compare strings exactly, so a single canonical order keeps the emitter free of per-backend special cases. Canonical: id, size, mem-path, then host-nodes/policy where pinned, then prealloc=on, share=on. Assisted-by: Claude Signed-off-by: Zvonko Kaiser --- .../tests/fixtures/qemu/grace_6_vegm_1_per_socket.args | 8 ++++---- .../tests/fixtures/qemu/grace_7_vegm_2_per_socket.args | 4 ++-- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/src/runtime-rs/crates/hypervisor/tests/fixtures/qemu/grace_6_vegm_1_per_socket.args b/src/runtime-rs/crates/hypervisor/tests/fixtures/qemu/grace_6_vegm_1_per_socket.args index 9459ffa078..a3f206ec6f 100644 --- a/src/runtime-rs/crates/hypervisor/tests/fixtures/qemu/grace_6_vegm_1_per_socket.args +++ b/src/runtime-rs/crates/hypervisor/tests/fixtures/qemu/grace_6_vegm_1_per_socket.args @@ -4,13 +4,13 @@ -object iommufd,id=iommufd0 -object -memory-backend-file,id=m0,mem-path=/dev/egm4,size=56896M,share=on,prealloc=on +memory-backend-file,id=m0,size=56896M,mem-path=/dev/egm4,prealloc=on,share=on -object -memory-backend-file,id=m1,mem-path=/dev/egm5,size=56896M,share=on,prealloc=on +memory-backend-file,id=m1,size=56896M,mem-path=/dev/egm5,prealloc=on,share=on -object -memory-backend-file,id=m2,mem-path=/dev/egm6,size=56896M,share=on,prealloc=on +memory-backend-file,id=m2,size=56896M,mem-path=/dev/egm6,prealloc=on,share=on -object -memory-backend-file,id=m3,mem-path=/dev/egm7,size=56896M,share=on,prealloc=on +memory-backend-file,id=m3,size=56896M,mem-path=/dev/egm7,prealloc=on,share=on -machine virt,accel=kvm,gic-version=3,ras=on,highmem-mmio-size=4T -numa diff --git a/src/runtime-rs/crates/hypervisor/tests/fixtures/qemu/grace_7_vegm_2_per_socket.args b/src/runtime-rs/crates/hypervisor/tests/fixtures/qemu/grace_7_vegm_2_per_socket.args index d78ba4b605..755206a0bd 100644 --- a/src/runtime-rs/crates/hypervisor/tests/fixtures/qemu/grace_7_vegm_2_per_socket.args +++ b/src/runtime-rs/crates/hypervisor/tests/fixtures/qemu/grace_7_vegm_2_per_socket.args @@ -5,9 +5,9 @@ -object iommufd,id=iommufd0 -object -memory-backend-file,id=m0,mem-path=/dev/egm4,size=56896M,share=on,prealloc=on +memory-backend-file,id=m0,size=56896M,mem-path=/dev/egm4,prealloc=on,share=on -object -memory-backend-file,id=m1,mem-path=/dev/egm5,size=56896M,share=on,prealloc=on +memory-backend-file,id=m1,size=56896M,mem-path=/dev/egm5,prealloc=on,share=on -machine virt,accel=kvm,gic-version=3,ras=on,highmem-mmio-size=4T -numa