motorhead/qemu
1
0
Fork 0
mirror of https://github.com/Motorhead1991/qemu.git synced 2025-08-09 10:34:58 -06:00
Code Issues Projects Releases Packages Wiki Activity Actions

tests/functional/test_mem_addr_space: Use set_machine() to select the machine

Browse source 
By using self.set_machine() the tests get properly skipped in case
the machine has not been compiled into the QEMU binary, e.g. when
"configure" has been run with "--without-default-devices".

Reviewed-by: Philippe Mathieu-Daudé <philmd@linaro.org>
Reviewed-by: Richard Henderson <richard.henderson@linaro.org>
Signed-off-by: Thomas Huth <thuth@redhat.com>
Message-ID: <20250521143732.140711-1-thuth@redhat.com>
This commit is contained in:
Thomas Huth 2025-05-21 16:37:32 +02:00
parent 644ded5c81
commit 9f7cf938ef
1 changed files with 32 additions and 31 deletions
Download patch file Download diff file Expand all files Collapse all files

63
tests/functional/test_mem_addr_space.py
View file

@ -58,8 +58,8 @@ class MemAddrCheck(QemuSystemTest):
should start fine. should start fine.
""" """
self.ensure_64bit_binary() self.ensure_64bit_binary()
self.vm.add_args('-S', '-machine', 'q35', '-m', self.set_machine('q35')
'512,slots=1,maxmem=59.6G', self.vm.add_args('-S', '-m', '512,slots=1,maxmem=59.6G',
'-cpu', 'pentium,pse36=on', '-display', 'none', '-cpu', 'pentium,pse36=on', '-display', 'none',
'-object', 'memory-backend-ram,id=mem1,size=1G', '-object', 'memory-backend-ram,id=mem1,size=1G',
'-device', 'pc-dimm,id=vm0,memdev=mem1') '-device', 'pc-dimm,id=vm0,memdev=mem1')
@ -76,8 +76,8 @@ class MemAddrCheck(QemuSystemTest):
with pse36 above. with pse36 above.
""" """
self.ensure_64bit_binary() self.ensure_64bit_binary()
self.vm.add_args('-S', '-machine', 'q35', '-m', self.set_machine('q35')
'512,slots=1,maxmem=59.6G', self.vm.add_args('-S', '-m', '512,slots=1,maxmem=59.6G',
'-cpu', 'pentium,pae=on', '-display', 'none', '-cpu', 'pentium,pae=on', '-display', 'none',
'-object', 'memory-backend-ram,id=mem1,size=1G', '-object', 'memory-backend-ram,id=mem1,size=1G',
'-device', 'pc-dimm,id=vm0,memdev=mem1') '-device', 'pc-dimm,id=vm0,memdev=mem1')
@ -93,8 +93,8 @@ class MemAddrCheck(QemuSystemTest):
same options as the failing case above with pse36 cpu feature. same options as the failing case above with pse36 cpu feature.
""" """
self.ensure_64bit_binary() self.ensure_64bit_binary()
self.vm.add_args('-machine', 'q35', '-m', self.set_machine('q35')
'512,slots=1,maxmem=59.5G', self.vm.add_args('-m', '512,slots=1,maxmem=59.5G',
'-cpu', 'pentium,pse36=on', '-display', 'none', '-cpu', 'pentium,pse36=on', '-display', 'none',
'-object', 'memory-backend-ram,id=mem1,size=1G', '-object', 'memory-backend-ram,id=mem1,size=1G',
'-device', 'pc-dimm,id=vm0,memdev=mem1') '-device', 'pc-dimm,id=vm0,memdev=mem1')
@ -111,8 +111,8 @@ class MemAddrCheck(QemuSystemTest):
with the same options as the case above. with the same options as the case above.
""" """
self.ensure_64bit_binary() self.ensure_64bit_binary()
self.vm.add_args('-machine', 'q35', '-m', self.set_machine('q35')
'512,slots=1,maxmem=59.5G', self.vm.add_args('-m', '512,slots=1,maxmem=59.5G',
'-cpu', 'pentium,pae=on', '-display', 'none', '-cpu', 'pentium,pae=on', '-display', 'none',
'-object', 'memory-backend-ram,id=mem1,size=1G', '-object', 'memory-backend-ram,id=mem1,size=1G',
'-device', 'pc-dimm,id=vm0,memdev=mem1') '-device', 'pc-dimm,id=vm0,memdev=mem1')
@ -128,8 +128,8 @@ class MemAddrCheck(QemuSystemTest):
with pse36 ON. with pse36 ON.
""" """
self.ensure_64bit_binary() self.ensure_64bit_binary()
self.vm.add_args('-machine', 'q35', '-m', self.set_machine('q35')
'512,slots=1,maxmem=59.5G', self.vm.add_args('-m', '512,slots=1,maxmem=59.5G',
'-cpu', 'pentium2', '-display', 'none', '-cpu', 'pentium2', '-display', 'none',
'-object', 'memory-backend-ram,id=mem1,size=1G', '-object', 'memory-backend-ram,id=mem1,size=1G',
'-device', 'pc-dimm,id=vm0,memdev=mem1') '-device', 'pc-dimm,id=vm0,memdev=mem1')
@ -148,8 +148,8 @@ class MemAddrCheck(QemuSystemTest):
above 4 GiB due to the PCI hole and simplicity. above 4 GiB due to the PCI hole and simplicity.
""" """
self.ensure_64bit_binary() self.ensure_64bit_binary()
self.vm.add_args('-S', '-machine', 'q35', '-m', self.set_machine('q35')
'512,slots=1,maxmem=4G', self.vm.add_args('-S', '-m', '512,slots=1,maxmem=4G',
'-cpu', 'pentium', '-display', 'none', '-cpu', 'pentium', '-display', 'none',
'-object', 'memory-backend-ram,id=mem1,size=1G', '-object', 'memory-backend-ram,id=mem1,size=1G',
'-device', 'pc-dimm,id=vm0,memdev=mem1') '-device', 'pc-dimm,id=vm0,memdev=mem1')
@ -176,8 +176,8 @@ class MemAddrCheck(QemuSystemTest):
make QEMU fail with the error message. make QEMU fail with the error message.
""" """
self.ensure_64bit_binary() self.ensure_64bit_binary()
self.vm.add_args('-S', '-machine', 'pc-q35-7.0', '-m', self.set_machine('pc-q35-7.0')
'512,slots=1,maxmem=988G', self.vm.add_args('-S', '-m', '512,slots=1,maxmem=988G',
'-display', 'none', '-display', 'none',
'-object', 'memory-backend-ram,id=mem1,size=1G', '-object', 'memory-backend-ram,id=mem1,size=1G',
'-device', 'pc-dimm,id=vm0,memdev=mem1') '-device', 'pc-dimm,id=vm0,memdev=mem1')
@ -197,8 +197,8 @@ class MemAddrCheck(QemuSystemTest):
than 988 GiB). than 988 GiB).
""" """
self.ensure_64bit_binary() self.ensure_64bit_binary()
self.vm.add_args('-S', '-machine', 'pc-q35-7.1', '-m', self.set_machine('pc-q35-7.1')
'512,slots=1,maxmem=976G', self.vm.add_args('-S', '-m', '512,slots=1,maxmem=976G',
'-display', 'none', '-display', 'none',
'-object', 'memory-backend-ram,id=mem1,size=1G', '-object', 'memory-backend-ram,id=mem1,size=1G',
'-device', 'pc-dimm,id=vm0,memdev=mem1') '-device', 'pc-dimm,id=vm0,memdev=mem1')
@ -214,8 +214,8 @@ class MemAddrCheck(QemuSystemTest):
successfully start when maxmem is < 988G. successfully start when maxmem is < 988G.
""" """
self.ensure_64bit_binary() self.ensure_64bit_binary()
self.vm.add_args('-S', '-machine', 'pc-q35-7.0', '-m', self.set_machine('pc-q35-7.0')
'512,slots=1,maxmem=987.5G', self.vm.add_args('-S', '-m', '512,slots=1,maxmem=987.5G',
'-display', 'none', '-display', 'none',
'-object', 'memory-backend-ram,id=mem1,size=1G', '-object', 'memory-backend-ram,id=mem1,size=1G',
'-device', 'pc-dimm,id=vm0,memdev=mem1') '-device', 'pc-dimm,id=vm0,memdev=mem1')
@ -231,8 +231,8 @@ class MemAddrCheck(QemuSystemTest):
successfully start when maxmem is < 976G. successfully start when maxmem is < 976G.
""" """
self.ensure_64bit_binary() self.ensure_64bit_binary()
self.vm.add_args('-S', '-machine', 'pc-q35-7.1', '-m', self.set_machine('pc-q35-7.1')
'512,slots=1,maxmem=975.5G', self.vm.add_args('-S', '-m', '512,slots=1,maxmem=975.5G',
'-display', 'none', '-display', 'none',
'-object', 'memory-backend-ram,id=mem1,size=1G', '-object', 'memory-backend-ram,id=mem1,size=1G',
'-device', 'pc-dimm,id=vm0,memdev=mem1') '-device', 'pc-dimm,id=vm0,memdev=mem1')
@ -249,9 +249,9 @@ class MemAddrCheck(QemuSystemTest):
"above_4G" memory starts at 4G. "above_4G" memory starts at 4G.
""" """
self.ensure_64bit_binary() self.ensure_64bit_binary()
self.set_machine('pc-q35-7.1')
self.vm.add_args('-S', '-cpu', 'Skylake-Server', self.vm.add_args('-S', '-cpu', 'Skylake-Server',
'-machine', 'pc-q35-7.1', '-m', '-m', '512,slots=1,maxmem=976G',
'512,slots=1,maxmem=976G',
'-display', 'none', '-display', 'none',
'-object', 'memory-backend-ram,id=mem1,size=1G', '-object', 'memory-backend-ram,id=mem1,size=1G',
'-device', 'pc-dimm,id=vm0,memdev=mem1') '-device', 'pc-dimm,id=vm0,memdev=mem1')
@ -274,9 +274,9 @@ class MemAddrCheck(QemuSystemTest):
fail to start. fail to start.
""" """
self.ensure_64bit_binary() self.ensure_64bit_binary()
self.set_machine('pc-q35-7.1')
self.vm.add_args('-S', '-cpu', 'EPYC-v4,phys-bits=41', self.vm.add_args('-S', '-cpu', 'EPYC-v4,phys-bits=41',
'-machine', 'pc-q35-7.1', '-m', '-m', '512,slots=1,maxmem=992G',
'512,slots=1,maxmem=992G',
'-display', 'none', '-display', 'none',
'-object', 'memory-backend-ram,id=mem1,size=1G', '-object', 'memory-backend-ram,id=mem1,size=1G',
'-device', 'pc-dimm,id=vm0,memdev=mem1') '-device', 'pc-dimm,id=vm0,memdev=mem1')
@ -293,9 +293,9 @@ class MemAddrCheck(QemuSystemTest):
QEMU should start fine. QEMU should start fine.
""" """
self.ensure_64bit_binary() self.ensure_64bit_binary()
self.set_machine('pc-q35-7.1')
self.vm.add_args('-S', '-cpu', 'EPYC-v4,phys-bits=41', self.vm.add_args('-S', '-cpu', 'EPYC-v4,phys-bits=41',
'-machine', 'pc-q35-7.1', '-m', '-m', '512,slots=1,maxmem=990G',
'512,slots=1,maxmem=990G',
'-display', 'none', '-display', 'none',
'-object', 'memory-backend-ram,id=mem1,size=1G', '-object', 'memory-backend-ram,id=mem1,size=1G',
'-device', 'pc-dimm,id=vm0,memdev=mem1') '-device', 'pc-dimm,id=vm0,memdev=mem1')
@ -314,12 +314,12 @@ class MemAddrCheck(QemuSystemTest):
alignment constraints with 40 bits (1 TiB) of processor physical bits. alignment constraints with 40 bits (1 TiB) of processor physical bits.
""" """
self.ensure_64bit_binary() self.ensure_64bit_binary()
self.set_machine('q35')
self.vm.add_args('-S', '-cpu', 'Skylake-Server,phys-bits=40', self.vm.add_args('-S', '-cpu', 'Skylake-Server,phys-bits=40',
'-machine', 'q35,cxl=on', '-m', '-m', '512,slots=1,maxmem=987G',
'512,slots=1,maxmem=987G',
'-display', 'none', '-display', 'none',
'-device', 'pxb-cxl,bus_nr=12,bus=pcie.0,id=cxl.1', '-device', 'pxb-cxl,bus_nr=12,bus=pcie.0,id=cxl.1',
'-M', 'cxl-fmw.0.targets.0=cxl.1,cxl-fmw.0.size=1G') '-M', 'cxl=on,cxl-fmw.0.targets.0=cxl.1,cxl-fmw.0.size=1G')
self.vm.set_qmp_monitor(enabled=False) self.vm.set_qmp_monitor(enabled=False)
self.vm.launch() self.vm.launch()
self.vm.wait() self.vm.wait()
@ -333,9 +333,10 @@ class MemAddrCheck(QemuSystemTest):
with cxl enabled. with cxl enabled.
""" """
self.ensure_64bit_binary() self.ensure_64bit_binary()
self.set_machine('q35')
self.vm.add_args('-S', '-cpu', 'Skylake-Server,phys-bits=40', self.vm.add_args('-S', '-cpu', 'Skylake-Server,phys-bits=40',
'-machine', 'q35,cxl=on', '-m', '-machine', 'cxl=on',
'512,slots=1,maxmem=987G', '-m', '512,slots=1,maxmem=987G',
'-display', 'none', '-display', 'none',
'-device', 'pxb-cxl,bus_nr=12,bus=pcie.0,id=cxl.1') '-device', 'pxb-cxl,bus_nr=12,bus=pcie.0,id=cxl.1')
self.vm.set_qmp_monitor(enabled=False) self.vm.set_qmp_monitor(enabled=False)