We want to make sure that not only the controllers themselves are added correctly, but also that devices attached to them get assigned the expected bus value. In order to do that add some devices, one per controller. Signed-off-by: Andrea Bolognani <abologna@redhat.com> --- .../pseries-phb-simple.ppc64-latest.args | 5 ++++- tests/qemuxml2argvdata/pseries-phb-simple.xml | 11 ++++++++++- .../pseries-phb-simple.ppc64-latest.xml | 14 ++++++++++---- 3 files changed, 24 insertions(+), 6 deletions(-) diff --git a/tests/qemuxml2argvdata/pseries-phb-simple.ppc64-latest.args b/tests/qemuxml2argvdata/pseries-phb-simple.ppc64-latest.args index c2c28bd198..b6c0ecae8e 100644 --- a/tests/qemuxml2argvdata/pseries-phb-simple.ppc64-latest.args +++ b/tests/qemuxml2argvdata/pseries-phb-simple.ppc64-latest.args @@ -27,7 +27,10 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \ -no-shutdown \ -boot strict=on \ -device '{"driver":"spapr-pci-host-bridge","index":1,"id":"pci.1"}' \ --device '{"driver":"spapr-pci-host-bridge","index":2,"id":"pci.2"}' \ +-netdev user,id=hostnet0 \ +-device '{"driver":"virtio-net-pci","netdev":"hostnet0","id":"net0","mac":"52:54:00:a2:44:92","bus":"pci.0","addr":"0x1"}' \ +-netdev user,id=hostnet1 \ +-device '{"driver":"virtio-net-pci","netdev":"hostnet1","id":"net1","mac":"52:54:00:a2:44:93","bus":"pci.1.0","addr":"0x1"}' \ -audiodev '{"id":"audio1","driver":"none"}' \ -sandbox on,obsolete=deny,elevateprivileges=deny,spawn=deny,resourcecontrol=deny \ -msg timestamp=on diff --git a/tests/qemuxml2argvdata/pseries-phb-simple.xml b/tests/qemuxml2argvdata/pseries-phb-simple.xml index b1c6ff3006..ae9e78b95b 100644 --- a/tests/qemuxml2argvdata/pseries-phb-simple.xml +++ b/tests/qemuxml2argvdata/pseries-phb-simple.xml @@ -10,7 +10,16 @@ <emulator>/usr/bin/qemu-system-ppc64</emulator> <controller type='pci' model='pci-root'/> <controller type='pci' model='pci-root'/> - <controller type='pci' model='pci-root'/> + <interface type='user'> + <mac address='52:54:00:a2:44:92'/> + <model type='virtio'/> + <address type='pci' domain='0x0000' bus='0x00' slot='0x01' function='0x0'/> + </interface> + <interface type='user'> + <mac address='52:54:00:a2:44:93'/> + <model type='virtio'/> + <address type='pci' domain='0x0000' bus='0x01' slot='0x01' function='0x0'/> + </interface> <controller type='usb' model='none'/> <memballoon model='none'/> </devices> diff --git a/tests/qemuxml2xmloutdata/pseries-phb-simple.ppc64-latest.xml b/tests/qemuxml2xmloutdata/pseries-phb-simple.ppc64-latest.xml index 80231e3dd7..936db5df2b 100644 --- a/tests/qemuxml2xmloutdata/pseries-phb-simple.ppc64-latest.xml +++ b/tests/qemuxml2xmloutdata/pseries-phb-simple.ppc64-latest.xml @@ -25,11 +25,17 @@ <model name='spapr-pci-host-bridge'/> <target index='1'/> </controller> - <controller type='pci' index='2' model='pci-root'> - <model name='spapr-pci-host-bridge'/> - <target index='2'/> - </controller> <controller type='usb' index='0' model='none'/> + <interface type='user'> + <mac address='52:54:00:a2:44:92'/> + <model type='virtio'/> + <address type='pci' domain='0x0000' bus='0x00' slot='0x01' function='0x0'/> + </interface> + <interface type='user'> + <mac address='52:54:00:a2:44:93'/> + <model type='virtio'/> + <address type='pci' domain='0x0000' bus='0x01' slot='0x01' function='0x0'/> + </interface> <audio id='1' type='none'/> <memballoon model='none'/> <panic model='pseries'/> -- 2.43.0

This is the same as the existing pseries-phb-simple, except that each of the controllers is given a user alias. If we tried to start the resulting guest, we'd get an error: Bus 'ua-phb0' not found This is because, at the QEMU command line level, the default PHB is not represented and so it can't be given a custom alias. We're going to address this issue in a follow-up commit. Signed-off-by: Andrea Bolognani <abologna@redhat.com> --- .../pseries-phb-user-alias.ppc64-latest.args | 36 +++++++++++++++ .../pseries-phb-user-alias.xml | 30 +++++++++++++ tests/qemuxml2argvtest.c | 1 + .../pseries-phb-user-alias.ppc64-latest.xml | 45 +++++++++++++++++++ tests/qemuxml2xmltest.c | 1 + 5 files changed, 113 insertions(+) create mode 100644 tests/qemuxml2argvdata/pseries-phb-user-alias.ppc64-latest.args create mode 100644 tests/qemuxml2argvdata/pseries-phb-user-alias.xml create mode 100644 tests/qemuxml2xmloutdata/pseries-phb-user-alias.ppc64-latest.xml diff --git a/tests/qemuxml2argvdata/pseries-phb-user-alias.ppc64-latest.args b/tests/qemuxml2argvdata/pseries-phb-user-alias.ppc64-latest.args new file mode 100644 index 0000000000..e64fc9aa11 --- /dev/null +++ b/tests/qemuxml2argvdata/pseries-phb-user-alias.ppc64-latest.args @@ -0,0 +1,36 @@ +LC_ALL=C \ +PATH=/bin \ +HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1 \ +USER=test \ +LOGNAME=test \ +XDG_DATA_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.local/share \ +XDG_CACHE_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.cache \ +XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \ +/usr/bin/qemu-system-ppc64 \ +-name guest=QEMUGuest1,debug-threads=on \ +-S \ +-object '{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/var/lib/libvirt/qemu/domain--1-QEMUGuest1/master-key.aes"}' \ +-machine pseries,usb=off,dump-guest-core=off,memory-backend=ppc_spapr.ram \ +-accel tcg \ +-cpu POWER9 \ +-m size=524288k \ +-object '{"qom-type":"memory-backend-ram","id":"ppc_spapr.ram","size":536870912}' \ +-overcommit mem-lock=off \ +-smp 1,sockets=1,cores=1,threads=1 \ +-uuid 1ccfd97d-5eb4-478a-bbe6-88d254c16db7 \ +-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":"spapr-pci-host-bridge","index":1,"id":"ua-phb1"}' \ +-netdev user,id=hostnet0 \ +-device '{"driver":"virtio-net-pci","netdev":"hostnet0","id":"net0","mac":"52:54:00:a2:44:92","bus":"ua-phb0","addr":"0x1"}' \ +-netdev user,id=hostnet1 \ +-device '{"driver":"virtio-net-pci","netdev":"hostnet1","id":"net1","mac":"52:54:00:a2:44:93","bus":"ua-phb1.0","addr":"0x1"}' \ +-audiodev '{"id":"audio1","driver":"none"}' \ +-sandbox on,obsolete=deny,elevateprivileges=deny,spawn=deny,resourcecontrol=deny \ +-msg timestamp=on diff --git a/tests/qemuxml2argvdata/pseries-phb-user-alias.xml b/tests/qemuxml2argvdata/pseries-phb-user-alias.xml new file mode 100644 index 0000000000..1f95e52747 --- /dev/null +++ b/tests/qemuxml2argvdata/pseries-phb-user-alias.xml @@ -0,0 +1,30 @@ +<domain type='qemu'> + <name>QEMUGuest1</name> + <uuid>1ccfd97d-5eb4-478a-bbe6-88d254c16db7</uuid> + <memory unit='KiB'>524288</memory> + <vcpu placement='static'>1</vcpu> + <os> + <type arch='ppc64' machine='pseries'>hvm</type> + </os> + <devices> + <emulator>/usr/bin/qemu-system-ppc64</emulator> + <controller type='usb' model='none'/> + <controller type='pci' model='pci-root'> + <alias name='ua-phb0'/> + </controller> + <controller type='pci' model='pci-root'> + <alias name='ua-phb1'/> + </controller> + <interface type='user'> + <mac address='52:54:00:a2:44:92'/> + <model type='virtio'/> + <address type='pci' domain='0x0000' bus='0x00' slot='0x01' function='0x0'/> + </interface> + <interface type='user'> + <mac address='52:54:00:a2:44:93'/> + <model type='virtio'/> + <address type='pci' domain='0x0000' bus='0x01' slot='0x01' function='0x0'/> + </interface> + <memballoon model='none'/> + </devices> +</domain> diff --git a/tests/qemuxml2argvtest.c b/tests/qemuxml2argvtest.c index 1be138bb0f..354f47bea3 100644 --- a/tests/qemuxml2argvtest.c +++ b/tests/qemuxml2argvtest.c @@ -2038,6 +2038,7 @@ mymain(void) DO_TEST_CAPS_LATEST_PPC64("pseries-phb-simple"); DO_TEST_CAPS_LATEST_PPC64("pseries-phb-default-missing"); DO_TEST_CAPS_LATEST_PPC64("pseries-phb-numa-node"); + DO_TEST_CAPS_LATEST_PPC64("pseries-phb-user-alias"); DO_TEST_CAPS_ARCH_LATEST_PARSE_ERROR("pseries-default-phb-numa-node", "ppc64"); DO_TEST_CAPS_ARCH_LATEST_PARSE_ERROR("pseries-phb-invalid-target-index-1", "ppc64"); diff --git a/tests/qemuxml2xmloutdata/pseries-phb-user-alias.ppc64-latest.xml b/tests/qemuxml2xmloutdata/pseries-phb-user-alias.ppc64-latest.xml new file mode 100644 index 0000000000..d6de2037a8 --- /dev/null +++ b/tests/qemuxml2xmloutdata/pseries-phb-user-alias.ppc64-latest.xml @@ -0,0 +1,45 @@ +<domain type='qemu'> + <name>QEMUGuest1</name> + <uuid>1ccfd97d-5eb4-478a-bbe6-88d254c16db7</uuid> + <memory unit='KiB'>524288</memory> + <currentMemory unit='KiB'>524288</currentMemory> + <vcpu placement='static'>1</vcpu> + <os> + <type arch='ppc64' machine='pseries'>hvm</type> + <boot dev='hd'/> + </os> + <cpu mode='custom' match='exact' check='none'> + <model fallback='forbid'>POWER9</model> + </cpu> + <clock offset='utc'/> + <on_poweroff>destroy</on_poweroff> + <on_reboot>restart</on_reboot> + <on_crash>destroy</on_crash> + <devices> + <emulator>/usr/bin/qemu-system-ppc64</emulator> + <controller type='usb' index='0' model='none'/> + <controller type='pci' index='0' model='pci-root'> + <model name='spapr-pci-host-bridge'/> + <target index='0'/> + <alias name='ua-phb0'/> + </controller> + <controller type='pci' index='1' model='pci-root'> + <model name='spapr-pci-host-bridge'/> + <target index='1'/> + <alias name='ua-phb1'/> + </controller> + <interface type='user'> + <mac address='52:54:00:a2:44:92'/> + <model type='virtio'/> + <address type='pci' domain='0x0000' bus='0x00' slot='0x01' function='0x0'/> + </interface> + <interface type='user'> + <mac address='52:54:00:a2:44:93'/> + <model type='virtio'/> + <address type='pci' domain='0x0000' bus='0x01' slot='0x01' function='0x0'/> + </interface> + <audio id='1' type='none'/> + <memballoon model='none'/> + <panic model='pseries'/> + </devices> +</domain> diff --git a/tests/qemuxml2xmltest.c b/tests/qemuxml2xmltest.c index 15cb6bd692..b281d9970f 100644 --- a/tests/qemuxml2xmltest.c +++ b/tests/qemuxml2xmltest.c @@ -541,6 +541,7 @@ mymain(void) DO_TEST_CAPS_ARCH_LATEST("pseries-phb-simple", "ppc64"); DO_TEST_CAPS_ARCH_LATEST("pseries-phb-default-missing", "ppc64"); DO_TEST_CAPS_ARCH_LATEST("pseries-phb-numa-node", "ppc64"); + DO_TEST_CAPS_ARCH_LATEST("pseries-phb-user-alias", "ppc64"); DO_TEST_CAPS_ARCH_LATEST("pseries-many-devices", "ppc64"); DO_TEST_CAPS_ARCH_LATEST("pseries-many-buses-1", "ppc64"); -- 2.43.0

The bus name for the default PHB is always "pci.0". Fixes: 937f319536723fec57ad472b002a159d0f67a77c Signed-off-by: Andrea Bolognani <abologna@redhat.com> --- src/qemu/qemu_command.c | 23 ++++++++++++++++--- .../pseries-phb-user-alias.ppc64-latest.args | 2 +- 2 files changed, 21 insertions(+), 4 deletions(-) diff --git a/src/qemu/qemu_command.c b/src/qemu/qemu_command.c index 712feb7b81..f2a4e1088b 100644 --- a/src/qemu/qemu_command.c +++ b/src/qemu/qemu_command.c @@ -366,9 +366,26 @@ qemuBuildDeviceAddressPCIGetBus(const virDomainDef *domainDef, if (virDomainDeviceAliasIsUserAlias(contAlias)) { /* When domain has builtin pci-root controller we don't put it * onto cmd line. Therefore we can't set its alias. In that - * case, use the default one. */ - if (!qemuDomainIsPSeries(domainDef) && - cont->model == VIR_DOMAIN_CONTROLLER_MODEL_PCI_ROOT) { + * case, use the default one. + * + * Note that we have to check the value of targetIndex here, + * because we need to handle three different cases: + * + * non-pSeries guest (targetIndex == -1) + * => must use default alias + * + * pSeries guest, default PHB (targetIndex == 0) + * => must use default alias + * + * pSeries guest, non-default PHB (targetIndex > 0) + * => can use actual alias + * + * The last one is due to non-default PHBs beind created + * through the spapr-pci-host-bridge device, which supports + * custom device IDs and thus custom bus names. + * */ + if (cont->model == VIR_DOMAIN_CONTROLLER_MODEL_PCI_ROOT && + contTargetIndex <= 0) { if (virQEMUCapsHasPCIMultiBus(domainDef)) contAlias = "pci.0"; else diff --git a/tests/qemuxml2argvdata/pseries-phb-user-alias.ppc64-latest.args b/tests/qemuxml2argvdata/pseries-phb-user-alias.ppc64-latest.args index e64fc9aa11..8a2be8cf0c 100644 --- a/tests/qemuxml2argvdata/pseries-phb-user-alias.ppc64-latest.args +++ b/tests/qemuxml2argvdata/pseries-phb-user-alias.ppc64-latest.args @@ -28,7 +28,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \ -boot strict=on \ -device '{"driver":"spapr-pci-host-bridge","index":1,"id":"ua-phb1"}' \ -netdev user,id=hostnet0 \ --device '{"driver":"virtio-net-pci","netdev":"hostnet0","id":"net0","mac":"52:54:00:a2:44:92","bus":"ua-phb0","addr":"0x1"}' \ +-device '{"driver":"virtio-net-pci","netdev":"hostnet0","id":"net0","mac":"52:54:00:a2:44:92","bus":"pci.0","addr":"0x1"}' \ -netdev user,id=hostnet1 \ -device '{"driver":"virtio-net-pci","netdev":"hostnet1","id":"net1","mac":"52:54:00:a2:44:93","bus":"ua-phb1.0","addr":"0x1"}' \ -audiodev '{"id":"audio1","driver":"none"}' \ -- 2.43.0

After commit 1d8454639f40 (libvirt 3.0.0), the default address type for aarch64/virt guests is PCI. These tests are then pointless, as they are just a subset of other tests, and the comment attached to them inaccurate. Signed-off-by: Andrea Bolognani <abologna@redhat.com> --- ...ch64-virtio-pci-default.aarch64-4.2.0.args | 54 ----------- ...h64-virtio-pci-default.aarch64-latest.args | 54 ----------- .../aarch64-virtio-pci-default.xml | 44 --------- tests/qemuxml2argvtest.c | 6 -- ...ch64-virtio-pci-default.aarch64-latest.xml | 94 ------------------- tests/qemuxml2xmltest.c | 1 - 6 files changed, 253 deletions(-) delete mode 100644 tests/qemuxml2argvdata/aarch64-virtio-pci-default.aarch64-4.2.0.args delete mode 100644 tests/qemuxml2argvdata/aarch64-virtio-pci-default.aarch64-latest.args delete mode 100644 tests/qemuxml2argvdata/aarch64-virtio-pci-default.xml delete mode 100644 tests/qemuxml2xmloutdata/aarch64-virtio-pci-default.aarch64-latest.xml diff --git a/tests/qemuxml2argvdata/aarch64-virtio-pci-default.aarch64-4.2.0.args b/tests/qemuxml2argvdata/aarch64-virtio-pci-default.aarch64-4.2.0.args deleted file mode 100644 index 3ee2bcd93b..0000000000 --- a/tests/qemuxml2argvdata/aarch64-virtio-pci-default.aarch64-4.2.0.args +++ /dev/null @@ -1,54 +0,0 @@ -LC_ALL=C \ -PATH=/bin \ -HOME=/var/lib/libvirt/qemu/domain--1-aarch64test \ -USER=test \ -LOGNAME=test \ -XDG_DATA_HOME=/var/lib/libvirt/qemu/domain--1-aarch64test/.local/share \ -XDG_CACHE_HOME=/var/lib/libvirt/qemu/domain--1-aarch64test/.cache \ -XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-aarch64test/.config \ -/usr/bin/qemu-system-aarch64 \ --name guest=aarch64test,debug-threads=on \ --S \ --object secret,id=masterKey0,format=raw,file=/var/lib/libvirt/qemu/domain--1-aarch64test/master-key.aes \ --machine virt-4.2,usb=off,gic-version=2,dump-guest-core=off \ --accel tcg \ --cpu cortex-a53 \ --m size=1048576k \ --overcommit mem-lock=off \ --smp 1,sockets=1,cores=1,threads=1 \ --uuid 496d7ea8-9739-544b-4ebd-ef08be936e8b \ --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 \ --kernel /aarch64.kernel \ --initrd /aarch64.initrd \ --append 'earlyprintk console=ttyAMA0,115200n8 rw root=/dev/vda rootwait' \ --dtb /aarch64.dtb \ --device pcie-root-port,port=8,chassis=1,id=pci.1,bus=pcie.0,multifunction=on,addr=0x1 \ --device pcie-root-port,port=9,chassis=2,id=pci.2,bus=pcie.0,addr=0x1.0x1 \ --device pcie-root-port,port=10,chassis=3,id=pci.3,bus=pcie.0,addr=0x1.0x2 \ --device pcie-root-port,port=11,chassis=4,id=pci.4,bus=pcie.0,addr=0x1.0x3 \ --device pcie-root-port,port=12,chassis=5,id=pci.5,bus=pcie.0,addr=0x1.0x4 \ --device pcie-root-port,port=13,chassis=6,id=pci.6,bus=pcie.0,addr=0x1.0x5 \ --device virtio-serial-pci,id=virtio-serial0,bus=pci.2,addr=0x0 \ --blockdev '{"driver":"file","filename":"/aarch64.raw","node-name":"libvirt-1-storage","auto-read-only":true,"discard":"unmap"}' \ --blockdev '{"node-name":"libvirt-1-format","read-only":false,"driver":"raw","file":"libvirt-1-storage"}' \ --device virtio-blk-pci,scsi=off,bus=pci.3,addr=0x0,drive=libvirt-1-format,id=virtio-disk0,bootindex=1 \ --netdev user,id=hostnet0 \ --device virtio-net-pci,netdev=hostnet0,id=net0,mac=52:54:00:09:a4:37,bus=pci.1,addr=0x0 \ --chardev pty,id=charserial0 \ --serial chardev:charserial0 \ --chardev pty,id=charconsole1 \ --device virtconsole,chardev=charconsole1,id=console1 \ --audiodev '{"id":"audio1","driver":"none"}' \ --device virtio-balloon-pci,id=balloon0,bus=pci.4,addr=0x0 \ --object rng-random,id=objrng0,filename=/dev/random \ --device virtio-rng-pci,rng=objrng0,id=rng0,bus=pci.5,addr=0x0 \ --sandbox on,obsolete=deny,elevateprivileges=deny,spawn=deny,resourcecontrol=deny \ --msg timestamp=on diff --git a/tests/qemuxml2argvdata/aarch64-virtio-pci-default.aarch64-latest.args b/tests/qemuxml2argvdata/aarch64-virtio-pci-default.aarch64-latest.args deleted file mode 100644 index 03dc8172cc..0000000000 --- a/tests/qemuxml2argvdata/aarch64-virtio-pci-default.aarch64-latest.args +++ /dev/null @@ -1,54 +0,0 @@ -LC_ALL=C \ -PATH=/bin \ -HOME=/var/lib/libvirt/qemu/domain--1-aarch64test \ -USER=test \ -LOGNAME=test \ -XDG_DATA_HOME=/var/lib/libvirt/qemu/domain--1-aarch64test/.local/share \ -XDG_CACHE_HOME=/var/lib/libvirt/qemu/domain--1-aarch64test/.cache \ -XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-aarch64test/.config \ -/usr/bin/qemu-system-aarch64 \ --name guest=aarch64test,debug-threads=on \ --S \ --object '{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/var/lib/libvirt/qemu/domain--1-aarch64test/master-key.aes"}' \ --machine virt,usb=off,gic-version=2,dump-guest-core=off,memory-backend=mach-virt.ram,acpi=off \ --accel tcg \ --cpu cortex-a53 \ --m size=1048576k \ --object '{"qom-type":"memory-backend-ram","id":"mach-virt.ram","size":1073741824}' \ --overcommit mem-lock=off \ --smp 1,sockets=1,cores=1,threads=1 \ --uuid 496d7ea8-9739-544b-4ebd-ef08be936e8b \ --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 \ --kernel /aarch64.kernel \ --initrd /aarch64.initrd \ --append 'earlyprintk console=ttyAMA0,115200n8 rw root=/dev/vda rootwait' \ --dtb /aarch64.dtb \ --device '{"driver":"pcie-root-port","port":8,"chassis":1,"id":"pci.1","bus":"pcie.0","multifunction":true,"addr":"0x1"}' \ --device '{"driver":"pcie-root-port","port":9,"chassis":2,"id":"pci.2","bus":"pcie.0","addr":"0x1.0x1"}' \ --device '{"driver":"pcie-root-port","port":10,"chassis":3,"id":"pci.3","bus":"pcie.0","addr":"0x1.0x2"}' \ --device '{"driver":"pcie-root-port","port":11,"chassis":4,"id":"pci.4","bus":"pcie.0","addr":"0x1.0x3"}' \ --device '{"driver":"pcie-root-port","port":12,"chassis":5,"id":"pci.5","bus":"pcie.0","addr":"0x1.0x4"}' \ --device '{"driver":"pcie-root-port","port":13,"chassis":6,"id":"pci.6","bus":"pcie.0","addr":"0x1.0x5"}' \ --device '{"driver":"virtio-serial-pci","id":"virtio-serial0","bus":"pci.2","addr":"0x0"}' \ --blockdev '{"driver":"file","filename":"/aarch64.raw","node-name":"libvirt-1-storage","auto-read-only":true,"discard":"unmap"}' \ --blockdev '{"node-name":"libvirt-1-format","read-only":false,"driver":"raw","file":"libvirt-1-storage"}' \ --device '{"driver":"virtio-blk-pci","bus":"pci.3","addr":"0x0","drive":"libvirt-1-format","id":"virtio-disk0","bootindex":1}' \ --netdev '{"type":"user","id":"hostnet0"}' \ --device '{"driver":"virtio-net-pci","netdev":"hostnet0","id":"net0","mac":"52:54:00:09:a4:37","bus":"pci.1","addr":"0x0"}' \ --chardev pty,id=charserial0 \ --serial chardev:charserial0 \ --chardev pty,id=charconsole1 \ --device '{"driver":"virtconsole","chardev":"charconsole1","id":"console1"}' \ --audiodev '{"id":"audio1","driver":"none"}' \ --device '{"driver":"virtio-balloon-pci","id":"balloon0","bus":"pci.4","addr":"0x0"}' \ --object '{"qom-type":"rng-random","id":"objrng0","filename":"/dev/random"}' \ --device '{"driver":"virtio-rng-pci","rng":"objrng0","id":"rng0","bus":"pci.5","addr":"0x0"}' \ --sandbox on,obsolete=deny,elevateprivileges=deny,spawn=deny,resourcecontrol=deny \ --msg timestamp=on diff --git a/tests/qemuxml2argvdata/aarch64-virtio-pci-default.xml b/tests/qemuxml2argvdata/aarch64-virtio-pci-default.xml deleted file mode 100644 index 72bf0c95c3..0000000000 --- a/tests/qemuxml2argvdata/aarch64-virtio-pci-default.xml +++ /dev/null @@ -1,44 +0,0 @@ -<domain type="qemu"> - <name>aarch64test</name> - <uuid>496d7ea8-9739-544b-4ebd-ef08be936e8b</uuid> - <memory>1048576</memory> - <currentMemory>1048576</currentMemory> - <vcpu placement='static'>1</vcpu> - <os> - <type arch="aarch64" machine="virt">hvm</type> - <kernel>/aarch64.kernel</kernel> - <initrd>/aarch64.initrd</initrd> - <dtb>/aarch64.dtb</dtb> - <cmdline>earlyprintk console=ttyAMA0,115200n8 rw root=/dev/vda rootwait</cmdline> - </os> - <features> - <apic/> - <pae/> - </features> - <cpu match='exact'> - <model>cortex-a53</model> - </cpu> - <clock offset="utc"/> - <on_poweroff>destroy</on_poweroff> - <on_reboot>restart</on_reboot> - <on_crash>restart</on_crash> - <devices> - <emulator>/usr/bin/qemu-system-aarch64</emulator> - <disk type='file' device='disk'> - <source file='/aarch64.raw'/> - <target dev='vda' bus='virtio'/> - </disk> - <interface type='user'> - <mac address='52:54:00:09:a4:37'/> - <model type='virtio'/> - </interface> - <console type='pty'/> - <console type='pty'> - <target type='virtio' port='0'/> - </console> - <memballoon model='virtio'/> - <rng model='virtio'> - <backend model='random'>/dev/random</backend> - </rng> - </devices> -</domain> diff --git a/tests/qemuxml2argvtest.c b/tests/qemuxml2argvtest.c index 354f47bea3..0987f4c78f 100644 --- a/tests/qemuxml2argvtest.c +++ b/tests/qemuxml2argvtest.c @@ -2268,12 +2268,6 @@ mymain(void) DO_TEST_CAPS_ARCH_VER("aarch64-virt-virtio", "aarch64", "4.2.0"); DO_TEST_CAPS_ARCH_LATEST("aarch64-virt-virtio", "aarch64"); - /* Demonstrates the virtio-pci default... namely that there isn't any! - q35 style PCI controllers will be added if the binary supports it, - but virtio-mmio is always used unless PCI addresses are manually - specified. */ - DO_TEST_CAPS_ARCH_VER("aarch64-virtio-pci-default", "aarch64", "4.2.0"); - DO_TEST_CAPS_ARCH_LATEST("aarch64-virtio-pci-default", "aarch64"); /* Example of using virtio-pci with no explicit PCI controller but with manual PCI addresses */ DO_TEST_CAPS_ARCH_LATEST("aarch64-virtio-pci-manual-addresses", "aarch64"); diff --git a/tests/qemuxml2xmloutdata/aarch64-virtio-pci-default.aarch64-latest.xml b/tests/qemuxml2xmloutdata/aarch64-virtio-pci-default.aarch64-latest.xml deleted file mode 100644 index 1ea25a01f5..0000000000 --- a/tests/qemuxml2xmloutdata/aarch64-virtio-pci-default.aarch64-latest.xml +++ /dev/null @@ -1,94 +0,0 @@ -<domain type='qemu'> - <name>aarch64test</name> - <uuid>496d7ea8-9739-544b-4ebd-ef08be936e8b</uuid> - <memory unit='KiB'>1048576</memory> - <currentMemory unit='KiB'>1048576</currentMemory> - <vcpu placement='static'>1</vcpu> - <os> - <type arch='aarch64' machine='virt'>hvm</type> - <kernel>/aarch64.kernel</kernel> - <initrd>/aarch64.initrd</initrd> - <cmdline>earlyprintk console=ttyAMA0,115200n8 rw root=/dev/vda rootwait</cmdline> - <dtb>/aarch64.dtb</dtb> - <boot dev='hd'/> - </os> - <features> - <apic/> - <pae/> - <gic version='2'/> - </features> - <cpu mode='custom' match='exact' check='none'> - <model fallback='allow'>cortex-a53</model> - </cpu> - <clock offset='utc'/> - <on_poweroff>destroy</on_poweroff> - <on_reboot>restart</on_reboot> - <on_crash>restart</on_crash> - <devices> - <emulator>/usr/bin/qemu-system-aarch64</emulator> - <disk type='file' device='disk'> - <driver name='qemu' type='raw'/> - <source file='/aarch64.raw'/> - <target dev='vda' bus='virtio'/> - <address type='pci' domain='0x0000' bus='0x03' slot='0x00' function='0x0'/> - </disk> - <controller type='pci' index='0' model='pcie-root'/> - <controller type='virtio-serial' index='0'> - <address type='pci' domain='0x0000' bus='0x02' slot='0x00' function='0x0'/> - </controller> - <controller type='pci' index='1' model='pcie-root-port'> - <model name='pcie-root-port'/> - <target chassis='1' port='0x8'/> - <address type='pci' domain='0x0000' bus='0x00' slot='0x01' function='0x0' multifunction='on'/> - </controller> - <controller type='pci' index='2' model='pcie-root-port'> - <model name='pcie-root-port'/> - <target chassis='2' port='0x9'/> - <address type='pci' domain='0x0000' bus='0x00' slot='0x01' function='0x1'/> - </controller> - <controller type='pci' index='3' model='pcie-root-port'> - <model name='pcie-root-port'/> - <target chassis='3' port='0xa'/> - <address type='pci' domain='0x0000' bus='0x00' slot='0x01' function='0x2'/> - </controller> - <controller type='pci' index='4' model='pcie-root-port'> - <model name='pcie-root-port'/> - <target chassis='4' port='0xb'/> - <address type='pci' domain='0x0000' bus='0x00' slot='0x01' function='0x3'/> - </controller> - <controller type='pci' index='5' model='pcie-root-port'> - <model name='pcie-root-port'/> - <target chassis='5' port='0xc'/> - <address type='pci' domain='0x0000' bus='0x00' slot='0x01' function='0x4'/> - </controller> - <controller type='pci' index='6' model='pcie-root-port'> - <model name='pcie-root-port'/> - <target chassis='6' port='0xd'/> - <address type='pci' domain='0x0000' bus='0x00' slot='0x01' function='0x5'/> - </controller> - <interface type='user'> - <mac address='52:54:00:09:a4:37'/> - <model type='virtio'/> - <address type='pci' domain='0x0000' bus='0x01' slot='0x00' function='0x0'/> - </interface> - <serial type='pty'> - <target type='system-serial' port='0'> - <model name='pl011'/> - </target> - </serial> - <console type='pty'> - <target type='serial' port='0'/> - </console> - <console type='pty'> - <target type='virtio' port='1'/> - </console> - <audio id='1' type='none'/> - <memballoon model='virtio'> - <address type='pci' domain='0x0000' bus='0x04' slot='0x00' function='0x0'/> - </memballoon> - <rng model='virtio'> - <backend model='random'>/dev/random</backend> - <address type='pci' domain='0x0000' bus='0x05' slot='0x00' function='0x0'/> - </rng> - </devices> -</domain> diff --git a/tests/qemuxml2xmltest.c b/tests/qemuxml2xmltest.c index b281d9970f..dff0241c53 100644 --- a/tests/qemuxml2xmltest.c +++ b/tests/qemuxml2xmltest.c @@ -766,7 +766,6 @@ mymain(void) DO_TEST_CAPS_LATEST("smbios-type-fwcfg"); DO_TEST_CAPS_ARCH_LATEST("aarch64-aavmf-virtio-mmio", "aarch64"); - DO_TEST_CAPS_ARCH_LATEST("aarch64-virtio-pci-default", "aarch64"); DO_TEST_CAPS_ARCH_LATEST("aarch64-virtio-pci-manual-addresses", "aarch64"); DO_TEST_CAPS_ARCH_LATEST("aarch64-video-virtio-gpu-pci", "aarch64"); DO_TEST_CAPS_ARCH_LATEST("aarch64-pci-serial", "aarch64"); -- 2.43.0

Even though virtio-mmio is no longer the default on either architecture, and likely nobody is using it at this point, we still provide a way to opt into virtio-mmio usage and want to keep existing guests working. Add explicit test suite coverage for this scenario. Signed-off-by: Andrea Bolognani <abologna@redhat.com> --- ...h64-virt-headless-mmio.aarch64-latest.args | 48 +++++++++++++ .../aarch64-virt-headless-mmio.xml | 48 +++++++++++++ ...v64-virt-headless-mmio.riscv64-latest.args | 43 +++++++++++ .../riscv64-virt-headless-mmio.xml | 43 +++++++++++ tests/qemuxml2argvtest.c | 2 + ...ch64-virt-headless-mmio.aarch64-latest.xml | 71 +++++++++++++++++++ ...cv64-virt-headless-mmio.riscv64-latest.xml | 58 +++++++++++++++ tests/qemuxml2xmltest.c | 2 + 8 files changed, 315 insertions(+) create mode 100644 tests/qemuxml2argvdata/aarch64-virt-headless-mmio.aarch64-latest.args create mode 100644 tests/qemuxml2argvdata/aarch64-virt-headless-mmio.xml create mode 100644 tests/qemuxml2argvdata/riscv64-virt-headless-mmio.riscv64-latest.args create mode 100644 tests/qemuxml2argvdata/riscv64-virt-headless-mmio.xml create mode 100644 tests/qemuxml2xmloutdata/aarch64-virt-headless-mmio.aarch64-latest.xml create mode 100644 tests/qemuxml2xmloutdata/riscv64-virt-headless-mmio.riscv64-latest.xml diff --git a/tests/qemuxml2argvdata/aarch64-virt-headless-mmio.aarch64-latest.args b/tests/qemuxml2argvdata/aarch64-virt-headless-mmio.aarch64-latest.args new file mode 100644 index 0000000000..f546cf33c7 --- /dev/null +++ b/tests/qemuxml2argvdata/aarch64-virt-headless-mmio.aarch64-latest.args @@ -0,0 +1,48 @@ +LC_ALL=C \ +PATH=/bin \ +HOME=/var/lib/libvirt/qemu/domain--1-guest \ +USER=test \ +LOGNAME=test \ +XDG_DATA_HOME=/var/lib/libvirt/qemu/domain--1-guest/.local/share \ +XDG_CACHE_HOME=/var/lib/libvirt/qemu/domain--1-guest/.cache \ +XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-guest/.config \ +/usr/bin/qemu-system-aarch64 \ +-name guest=guest,debug-threads=on \ +-S \ +-object '{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/var/lib/libvirt/qemu/domain--1-guest/master-key.aes"}' \ +-blockdev '{"driver":"file","filename":"/usr/share/edk2/aarch64/QEMU_EFI-silent-pflash.raw","node-name":"libvirt-pflash0-storage","auto-read-only":true,"discard":"unmap"}' \ +-blockdev '{"node-name":"libvirt-pflash0-format","read-only":true,"driver":"raw","file":"libvirt-pflash0-storage"}' \ +-blockdev '{"driver":"file","filename":"/path/to/guest_VARS.raw","node-name":"libvirt-pflash1-storage","auto-read-only":true,"discard":"unmap"}' \ +-blockdev '{"node-name":"libvirt-pflash1-format","read-only":false,"driver":"raw","file":"libvirt-pflash1-storage"}' \ +-machine virt-4.0,usb=off,gic-version=2,dump-guest-core=off,memory-backend=mach-virt.ram,pflash0=libvirt-pflash0-format,pflash1=libvirt-pflash1-format,acpi=on \ +-accel tcg \ +-cpu cortex-a15 \ +-m size=4194304k \ +-object '{"qom-type":"memory-backend-ram","id":"mach-virt.ram","size":4294967296}' \ +-overcommit mem-lock=off \ +-smp 4,sockets=4,cores=1,threads=1 \ +-uuid 1ccfd97d-5eb4-478a-bbe6-88d254c16db7 \ +-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":"virtio-serial-device","id":"virtio-serial0"}' \ +-blockdev '{"driver":"file","filename":"/var/lib/libvirt/images/guest.qcow2","node-name":"libvirt-1-storage","auto-read-only":true,"discard":"unmap"}' \ +-blockdev '{"node-name":"libvirt-1-format","read-only":false,"driver":"qcow2","file":"libvirt-1-storage"}' \ +-device '{"driver":"virtio-blk-device","drive":"libvirt-1-format","id":"virtio-disk0","bootindex":1}' \ +-netdev '{"type":"user","id":"hostnet0"}' \ +-device '{"driver":"virtio-net-device","netdev":"hostnet0","id":"net0","mac":"52:54:00:09:a4:37"}' \ +-chardev pty,id=charserial0 \ +-serial chardev:charserial0 \ +-chardev socket,id=charchannel0,fd=1729,server=on,wait=off \ +-device '{"driver":"virtserialport","bus":"virtio-serial0.0","nr":1,"chardev":"charchannel0","id":"channel0","name":"org.qemu.guest_agent.0"}' \ +-audiodev '{"id":"audio1","driver":"none"}' \ +-device '{"driver":"virtio-balloon-device","id":"balloon0"}' \ +-object '{"qom-type":"rng-random","id":"objrng0","filename":"/dev/urandom"}' \ +-device '{"driver":"virtio-rng-device","rng":"objrng0","id":"rng0"}' \ +-sandbox on,obsolete=deny,elevateprivileges=deny,spawn=deny,resourcecontrol=deny \ +-msg timestamp=on diff --git a/tests/qemuxml2argvdata/aarch64-virt-headless-mmio.xml b/tests/qemuxml2argvdata/aarch64-virt-headless-mmio.xml new file mode 100644 index 0000000000..4f2519bb1f --- /dev/null +++ b/tests/qemuxml2argvdata/aarch64-virt-headless-mmio.xml @@ -0,0 +1,48 @@ +<domain type='qemu'> + <name>guest</name> + <uuid>1ccfd97d-5eb4-478a-bbe6-88d254c16db7</uuid> + <metadata> + <libosinfo:libosinfo xmlns:libosinfo='http://libosinfo.org/xmlns/libvirt/domain/1.0'> + <libosinfo:os id='http://fedoraproject.org/fedora/29'/> + </libosinfo:libosinfo> + </metadata> + <memory>4194304</memory> + <currentMemory>4194304</currentMemory> + <vcpu>4</vcpu> + <os> + <type arch='aarch64' machine='virt-4.0'>hvm</type> + <loader readonly='yes' type='pflash'>/usr/share/edk2/aarch64/QEMU_EFI-silent-pflash.raw</loader> + <nvram>/path/to/guest_VARS.raw</nvram> + <boot dev='hd'/> + </os> + <features> + <acpi/> + </features> + <clock offset='utc'/> + <devices> + <emulator>/usr/bin/qemu-system-aarch64</emulator> + <disk type='file' device='disk'> + <driver name='qemu' type='qcow2'/> + <source file='/var/lib/libvirt/images/guest.qcow2'/> + <target dev='vda' bus='virtio'/> + <address type='virtio-mmio'/> + </disk> + <interface type='user'> + <mac address='52:54:00:09:a4:37'/> + <model type='virtio'/> + <address type='virtio-mmio'/> + </interface> + <console type='pty'/> + <channel type='unix'> + <source mode='bind'/> + <target type='virtio' name='org.qemu.guest_agent.0'/> + </channel> + <memballoon model='virtio'> + <address type='virtio-mmio'/> + </memballoon> + <rng model='virtio'> + <backend model='random'>/dev/urandom</backend> + <address type='virtio-mmio'/> + </rng> + </devices> +</domain> diff --git a/tests/qemuxml2argvdata/riscv64-virt-headless-mmio.riscv64-latest.args b/tests/qemuxml2argvdata/riscv64-virt-headless-mmio.riscv64-latest.args new file mode 100644 index 0000000000..bf7ce2cf9e --- /dev/null +++ b/tests/qemuxml2argvdata/riscv64-virt-headless-mmio.riscv64-latest.args @@ -0,0 +1,43 @@ +LC_ALL=C \ +PATH=/bin \ +HOME=/var/lib/libvirt/qemu/domain--1-guest \ +USER=test \ +LOGNAME=test \ +XDG_DATA_HOME=/var/lib/libvirt/qemu/domain--1-guest/.local/share \ +XDG_CACHE_HOME=/var/lib/libvirt/qemu/domain--1-guest/.cache \ +XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-guest/.config \ +/usr/bin/qemu-system-riscv64 \ +-name guest=guest,debug-threads=on \ +-S \ +-object '{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/var/lib/libvirt/qemu/domain--1-guest/master-key.aes"}' \ +-machine virt,usb=off,dump-guest-core=off,memory-backend=riscv_virt_board.ram \ +-accel tcg \ +-m size=4194304k \ +-object '{"qom-type":"memory-backend-ram","id":"riscv_virt_board.ram","size":4294967296}' \ +-overcommit mem-lock=off \ +-smp 4,sockets=4,cores=1,threads=1 \ +-uuid 1ccfd97d-5eb4-478a-bbe6-88d254c16db7 \ +-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":"virtio-serial-device","id":"virtio-serial0"}' \ +-blockdev '{"driver":"file","filename":"/var/lib/libvirt/images/guest.qcow2","node-name":"libvirt-1-storage","auto-read-only":true,"discard":"unmap"}' \ +-blockdev '{"node-name":"libvirt-1-format","read-only":false,"driver":"qcow2","file":"libvirt-1-storage"}' \ +-device '{"driver":"virtio-blk-device","drive":"libvirt-1-format","id":"virtio-disk0","bootindex":1}' \ +-netdev '{"type":"user","id":"hostnet0"}' \ +-device '{"driver":"virtio-net-device","netdev":"hostnet0","id":"net0","mac":"52:54:00:09:a4:37"}' \ +-chardev pty,id=charserial0 \ +-serial chardev:charserial0 \ +-chardev socket,id=charchannel0,fd=1729,server=on,wait=off \ +-device '{"driver":"virtserialport","bus":"virtio-serial0.0","nr":1,"chardev":"charchannel0","id":"channel0","name":"org.qemu.guest_agent.0"}' \ +-audiodev '{"id":"audio1","driver":"none"}' \ +-device '{"driver":"virtio-balloon-device","id":"balloon0"}' \ +-object '{"qom-type":"rng-random","id":"objrng0","filename":"/dev/urandom"}' \ +-device '{"driver":"virtio-rng-device","rng":"objrng0","id":"rng0"}' \ +-sandbox on,obsolete=deny,elevateprivileges=deny,spawn=deny,resourcecontrol=deny \ +-msg timestamp=on diff --git a/tests/qemuxml2argvdata/riscv64-virt-headless-mmio.xml b/tests/qemuxml2argvdata/riscv64-virt-headless-mmio.xml new file mode 100644 index 0000000000..bcba73e9f1 --- /dev/null +++ b/tests/qemuxml2argvdata/riscv64-virt-headless-mmio.xml @@ -0,0 +1,43 @@ +<domain type='qemu'> + <name>guest</name> + <uuid>1ccfd97d-5eb4-478a-bbe6-88d254c16db7</uuid> + <metadata> + <libosinfo:libosinfo xmlns:libosinfo='http://libosinfo.org/xmlns/libvirt/domain/1.0'> + <libosinfo:os id='http://fedoraproject.org/fedora/29'/> + </libosinfo:libosinfo> + </metadata> + <memory>4194304</memory> + <currentMemory>4194304</currentMemory> + <vcpu>4</vcpu> + <os> + <type arch='riscv64' machine='virt'>hvm</type> + <boot dev='hd'/> + </os> + <clock offset='utc'/> + <devices> + <emulator>/usr/bin/qemu-system-riscv64</emulator> + <disk type='file' device='disk'> + <driver name='qemu' type='qcow2'/> + <source file='/var/lib/libvirt/images/guest.qcow2'/> + <target dev='vda' bus='virtio'/> + <address type='virtio-mmio'/> + </disk> + <interface type='user'> + <mac address='52:54:00:09:a4:37'/> + <model type='virtio'/> + <address type='virtio-mmio'/> + </interface> + <console type='pty'/> + <channel type='unix'> + <source mode='bind'/> + <target type='virtio' name='org.qemu.guest_agent.0'/> + </channel> + <memballoon model='virtio'> + <address type='virtio-mmio'/> + </memballoon> + <rng model='virtio'> + <backend model='random'>/dev/urandom</backend> + <address type='virtio-mmio'/> + </rng> + </devices> +</domain> diff --git a/tests/qemuxml2argvtest.c b/tests/qemuxml2argvtest.c index 0987f4c78f..1bc3985aca 100644 --- a/tests/qemuxml2argvtest.c +++ b/tests/qemuxml2argvtest.c @@ -2539,8 +2539,10 @@ mymain(void) /* Simple headless guests for various architectures */ DO_TEST_CAPS_ARCH_LATEST("aarch64-virt-headless", "aarch64"); + DO_TEST_CAPS_ARCH_LATEST("aarch64-virt-headless-mmio", "aarch64"); DO_TEST_CAPS_ARCH_LATEST("ppc64-pseries-headless", "ppc64"); DO_TEST_CAPS_ARCH_LATEST("riscv64-virt-headless", "riscv64"); + DO_TEST_CAPS_ARCH_LATEST("riscv64-virt-headless-mmio", "riscv64"); DO_TEST_CAPS_ARCH_LATEST("s390x-ccw-headless", "s390x"); DO_TEST_CAPS_ARCH_LATEST("x86_64-pc-headless", "x86_64"); DO_TEST_CAPS_ARCH_LATEST("x86_64-q35-headless", "x86_64"); diff --git a/tests/qemuxml2xmloutdata/aarch64-virt-headless-mmio.aarch64-latest.xml b/tests/qemuxml2xmloutdata/aarch64-virt-headless-mmio.aarch64-latest.xml new file mode 100644 index 0000000000..1b2d6e70bd --- /dev/null +++ b/tests/qemuxml2xmloutdata/aarch64-virt-headless-mmio.aarch64-latest.xml @@ -0,0 +1,71 @@ +<domain type='qemu'> + <name>guest</name> + <uuid>1ccfd97d-5eb4-478a-bbe6-88d254c16db7</uuid> + <metadata> + <libosinfo:libosinfo xmlns:libosinfo="http://libosinfo.org/xmlns/libvirt/domain/1.0"> + <libosinfo:os id="http://fedoraproject.org/fedora/29"/> + </libosinfo:libosinfo> + </metadata> + <memory unit='KiB'>4194304</memory> + <currentMemory unit='KiB'>4194304</currentMemory> + <vcpu placement='static'>4</vcpu> + <os firmware='efi'> + <type arch='aarch64' machine='virt-4.0'>hvm</type> + <firmware> + <feature enabled='no' name='enrolled-keys'/> + <feature enabled='no' name='secure-boot'/> + </firmware> + <loader readonly='yes' type='pflash'>/usr/share/edk2/aarch64/QEMU_EFI-silent-pflash.raw</loader> + <nvram template='/usr/share/edk2/aarch64/vars-template-pflash.raw'>/path/to/guest_VARS.raw</nvram> + <boot dev='hd'/> + </os> + <features> + <acpi/> + <gic version='2'/> + </features> + <cpu mode='custom' match='exact' check='none'> + <model fallback='forbid'>cortex-a15</model> + </cpu> + <clock offset='utc'/> + <on_poweroff>destroy</on_poweroff> + <on_reboot>restart</on_reboot> + <on_crash>destroy</on_crash> + <devices> + <emulator>/usr/bin/qemu-system-aarch64</emulator> + <disk type='file' device='disk'> + <driver name='qemu' type='qcow2'/> + <source file='/var/lib/libvirt/images/guest.qcow2'/> + <target dev='vda' bus='virtio'/> + <address type='virtio-mmio'/> + </disk> + <controller type='pci' index='0' model='pcie-root'/> + <controller type='virtio-serial' index='0'> + <address type='virtio-mmio'/> + </controller> + <interface type='user'> + <mac address='52:54:00:09:a4:37'/> + <model type='virtio'/> + <address type='virtio-mmio'/> + </interface> + <serial type='pty'> + <target type='system-serial' port='0'> + <model name='pl011'/> + </target> + </serial> + <console type='pty'> + <target type='serial' port='0'/> + </console> + <channel type='unix'> + <target type='virtio' name='org.qemu.guest_agent.0'/> + <address type='virtio-serial' controller='0' bus='0' port='1'/> + </channel> + <audio id='1' type='none'/> + <memballoon model='virtio'> + <address type='virtio-mmio'/> + </memballoon> + <rng model='virtio'> + <backend model='random'>/dev/urandom</backend> + <address type='virtio-mmio'/> + </rng> + </devices> +</domain> diff --git a/tests/qemuxml2xmloutdata/riscv64-virt-headless-mmio.riscv64-latest.xml b/tests/qemuxml2xmloutdata/riscv64-virt-headless-mmio.riscv64-latest.xml new file mode 100644 index 0000000000..445029e82b --- /dev/null +++ b/tests/qemuxml2xmloutdata/riscv64-virt-headless-mmio.riscv64-latest.xml @@ -0,0 +1,58 @@ +<domain type='qemu'> + <name>guest</name> + <uuid>1ccfd97d-5eb4-478a-bbe6-88d254c16db7</uuid> + <metadata> + <libosinfo:libosinfo xmlns:libosinfo="http://libosinfo.org/xmlns/libvirt/domain/1.0"> + <libosinfo:os id="http://fedoraproject.org/fedora/29"/> + </libosinfo:libosinfo> + </metadata> + <memory unit='KiB'>4194304</memory> + <currentMemory unit='KiB'>4194304</currentMemory> + <vcpu placement='static'>4</vcpu> + <os> + <type arch='riscv64' machine='virt'>hvm</type> + <boot dev='hd'/> + </os> + <clock offset='utc'/> + <on_poweroff>destroy</on_poweroff> + <on_reboot>restart</on_reboot> + <on_crash>destroy</on_crash> + <devices> + <emulator>/usr/bin/qemu-system-riscv64</emulator> + <disk type='file' device='disk'> + <driver name='qemu' type='qcow2'/> + <source file='/var/lib/libvirt/images/guest.qcow2'/> + <target dev='vda' bus='virtio'/> + <address type='virtio-mmio'/> + </disk> + <controller type='pci' index='0' model='pcie-root'/> + <controller type='virtio-serial' index='0'> + <address type='virtio-mmio'/> + </controller> + <interface type='user'> + <mac address='52:54:00:09:a4:37'/> + <model type='virtio'/> + <address type='virtio-mmio'/> + </interface> + <serial type='pty'> + <target type='system-serial' port='0'> + <model name='16550a'/> + </target> + </serial> + <console type='pty'> + <target type='serial' port='0'/> + </console> + <channel type='unix'> + <target type='virtio' name='org.qemu.guest_agent.0'/> + <address type='virtio-serial' controller='0' bus='0' port='1'/> + </channel> + <audio id='1' type='none'/> + <memballoon model='virtio'> + <address type='virtio-mmio'/> + </memballoon> + <rng model='virtio'> + <backend model='random'>/dev/urandom</backend> + <address type='virtio-mmio'/> + </rng> + </devices> +</domain> diff --git a/tests/qemuxml2xmltest.c b/tests/qemuxml2xmltest.c index dff0241c53..c21e34b477 100644 --- a/tests/qemuxml2xmltest.c +++ b/tests/qemuxml2xmltest.c @@ -913,8 +913,10 @@ mymain(void) /* Simple headless guests for various architectures */ DO_TEST_CAPS_ARCH_LATEST("aarch64-virt-headless", "aarch64"); + DO_TEST_CAPS_ARCH_LATEST("aarch64-virt-headless-mmio", "aarch64"); DO_TEST_CAPS_ARCH_LATEST("ppc64-pseries-headless", "ppc64"); DO_TEST_CAPS_ARCH_LATEST("riscv64-virt-headless", "riscv64"); + DO_TEST_CAPS_ARCH_LATEST("riscv64-virt-headless-mmio", "riscv64"); DO_TEST_CAPS_ARCH_LATEST("s390x-ccw-headless", "s390x"); DO_TEST_CAPS_ARCH_LATEST("x86_64-pc-headless", "x86_64"); DO_TEST_CAPS_ARCH_LATEST("x86_64-q35-headless", "x86_64"); -- 2.43.0

All of these are either a subset of other tests, or provide coverage for scenarios that are not really possible: for all versions of QEMU that we support, the virt machine type has a hard dependency on the generic PCIe controller, which means that we will never need to fall back to virtio-mmio. Signed-off-by: Andrea Bolognani <abologna@redhat.com> --- ...ch64-aavmf-virtio-mmio.aarch64-latest.args | 46 --------------- .../aarch64-aavmf-virtio-mmio.xml | 49 ---------------- ...rch64-virt-virtio-MMIO.aarch64.latest.args | 48 ---------------- .../arm-virt-virtio.aarch64-latest.args | 54 ------------------ tests/qemuxml2argvdata/arm-virt-virtio.xml | 45 --------------- .../riscv64-virt-pci.riscv64-latest.args | 35 ------------ tests/qemuxml2argvdata/riscv64-virt-pci.xml | 24 -------- .../riscv64-virt.riscv64-latest.args | 38 ------------- tests/qemuxml2argvdata/riscv64-virt.xml | 19 ------- tests/qemuxml2argvtest.c | 18 ------ ...rch64-aavmf-virtio-mmio.aarch64-latest.xml | 56 ------------------- tests/qemuxml2xmltest.c | 4 -- 12 files changed, 436 deletions(-) delete mode 100644 tests/qemuxml2argvdata/aarch64-aavmf-virtio-mmio.aarch64-latest.args delete mode 100644 tests/qemuxml2argvdata/aarch64-aavmf-virtio-mmio.xml delete mode 100644 tests/qemuxml2argvdata/aarch64-virt-virtio-MMIO.aarch64.latest.args delete mode 100644 tests/qemuxml2argvdata/arm-virt-virtio.aarch64-latest.args delete mode 100644 tests/qemuxml2argvdata/arm-virt-virtio.xml delete mode 100644 tests/qemuxml2argvdata/riscv64-virt-pci.riscv64-latest.args delete mode 100644 tests/qemuxml2argvdata/riscv64-virt-pci.xml delete mode 100644 tests/qemuxml2argvdata/riscv64-virt.riscv64-latest.args delete mode 100644 tests/qemuxml2argvdata/riscv64-virt.xml delete mode 100644 tests/qemuxml2xmloutdata/aarch64-aavmf-virtio-mmio.aarch64-latest.xml diff --git a/tests/qemuxml2argvdata/aarch64-aavmf-virtio-mmio.aarch64-latest.args b/tests/qemuxml2argvdata/aarch64-aavmf-virtio-mmio.aarch64-latest.args deleted file mode 100644 index 5569ff3b57..0000000000 --- a/tests/qemuxml2argvdata/aarch64-aavmf-virtio-mmio.aarch64-latest.args +++ /dev/null @@ -1,46 +0,0 @@ -LC_ALL=C \ -PATH=/bin \ -HOME=/var/lib/libvirt/qemu/domain--1-aarch64test \ -USER=test \ -LOGNAME=test \ -XDG_DATA_HOME=/var/lib/libvirt/qemu/domain--1-aarch64test/.local/share \ -XDG_CACHE_HOME=/var/lib/libvirt/qemu/domain--1-aarch64test/.cache \ -XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-aarch64test/.config \ -/usr/bin/qemu-system-aarch64 \ --name guest=aarch64test,debug-threads=on \ --S \ --object '{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/var/lib/libvirt/qemu/domain--1-aarch64test/master-key.aes"}' \ --machine virt,usb=off,gic-version=2,dump-guest-core=off,memory-backend=mach-virt.ram,acpi=off \ --accel tcg \ --cpu cortex-a53 \ --m size=1048576k \ --object '{"qom-type":"memory-backend-ram","id":"mach-virt.ram","size":1073741824}' \ --overcommit mem-lock=off \ --smp 1,sockets=1,cores=1,threads=1 \ --uuid 496d7ea8-9739-544b-4ebd-ef08be936e8b \ --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 \ --kernel /aarch64.kernel \ --initrd /aarch64.initrd \ --append 'earlyprintk console=ttyAMA0,115200n8 rw root=/dev/vda rootwait' \ --dtb /aarch64.dtb \ --device '{"driver":"virtio-serial-device","id":"virtio-serial0"}' \ --blockdev '{"driver":"file","filename":"/aarch64.raw","node-name":"libvirt-1-storage","auto-read-only":true,"discard":"unmap"}' \ --blockdev '{"node-name":"libvirt-1-format","read-only":false,"driver":"raw","file":"libvirt-1-storage"}' \ --device '{"driver":"virtio-blk-device","drive":"libvirt-1-format","id":"virtio-disk0","bootindex":1}' \ --netdev '{"type":"user","id":"hostnet0"}' \ --device '{"driver":"virtio-net-device","netdev":"hostnet0","id":"net0","mac":"52:54:00:09:a4:37"}' \ --chardev pty,id=charconsole0 \ --device '{"driver":"virtconsole","chardev":"charconsole0","id":"console0"}' \ --audiodev '{"id":"audio1","driver":"none"}' \ --device '{"driver":"virtio-balloon-device","id":"balloon0"}' \ --object '{"qom-type":"rng-random","id":"objrng0","filename":"/dev/random"}' \ --device '{"driver":"virtio-rng-device","rng":"objrng0","id":"rng0"}' \ --sandbox on,obsolete=deny,elevateprivileges=deny,spawn=deny,resourcecontrol=deny \ --msg timestamp=on diff --git a/tests/qemuxml2argvdata/aarch64-aavmf-virtio-mmio.xml b/tests/qemuxml2argvdata/aarch64-aavmf-virtio-mmio.xml deleted file mode 100644 index 5d7217307b..0000000000 --- a/tests/qemuxml2argvdata/aarch64-aavmf-virtio-mmio.xml +++ /dev/null @@ -1,49 +0,0 @@ -<domain type='qemu'> - <name>aarch64test</name> - <uuid>496d7ea8-9739-544b-4ebd-ef08be936e8b</uuid> - <memory unit='KiB'>1048576</memory> - <currentMemory unit='KiB'>1048576</currentMemory> - <vcpu placement='static'>1</vcpu> - <os> - <type arch='aarch64' machine='virt'>hvm</type> - <kernel>/aarch64.kernel</kernel> - <initrd>/aarch64.initrd</initrd> - <cmdline>earlyprintk console=ttyAMA0,115200n8 rw root=/dev/vda rootwait</cmdline> - <dtb>/aarch64.dtb</dtb> - <boot dev='hd'/> - </os> - <features> - <apic/> - <pae/> - <gic version='2'/> - </features> - <cpu mode='custom' match='exact'> - <model fallback='allow'>cortex-a53</model> - </cpu> - <clock offset='utc'/> - <on_poweroff>destroy</on_poweroff> - <on_reboot>restart</on_reboot> - <on_crash>restart</on_crash> - <devices> - <emulator>/usr/bin/qemu-system-aarch64</emulator> - <disk type='file' device='disk'> - <source file='/aarch64.raw'/> - <target dev='vda' bus='virtio'/> - <address type='virtio-mmio'/> - </disk> - <controller type='virtio-serial' index='0'/> - <interface type='user'> - <mac address='52:54:00:09:a4:37'/> - <model type='virtio'/> - </interface> - <console type='pty'> - <target type='virtio' port='0'/> - </console> - <memballoon model='virtio'> - <address type='virtio-mmio'/> - </memballoon> - <rng model='virtio'> - <backend model='random'>/dev/random</backend> - </rng> - </devices> -</domain> diff --git a/tests/qemuxml2argvdata/aarch64-virt-virtio-MMIO.aarch64.latest.args b/tests/qemuxml2argvdata/aarch64-virt-virtio-MMIO.aarch64.latest.args deleted file mode 100644 index 68eccb441d..0000000000 --- a/tests/qemuxml2argvdata/aarch64-virt-virtio-MMIO.aarch64.latest.args +++ /dev/null @@ -1,48 +0,0 @@ -LC_ALL=C \ -PATH=/bin \ -HOME=/var/lib/libvirt/qemu/domain--1-aarch64test \ -USER=test \ -LOGNAME=test \ -XDG_DATA_HOME=/var/lib/libvirt/qemu/domain--1-aarch64test/.local/share \ -XDG_CACHE_HOME=/var/lib/libvirt/qemu/domain--1-aarch64test/.cache \ -XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-aarch64test/.config \ -/usr/bin/qemu-system-aarch64 \ --name guest=aarch64test,debug-threads=on \ --S \ --object '{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/var/lib/libvirt/qemu/domain--1-aarch64test/master-key.aes"}' \ --machine virt,usb=off,gic-version=2,dump-guest-core=off,memory-backend=mach-virt.ram,acpi=off \ --accel tcg \ --cpu cortex-a53 \ --m size=1048576k \ --object '{"qom-type":"memory-backend-ram","id":"mach-virt.ram","size":1073741824}' \ --overcommit mem-lock=off \ --smp 1,sockets=1,cores=1,threads=1 \ --uuid 496d7ea8-9739-544b-4ebd-ef08be936e8b \ --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 \ --kernel /aarch64.kernel \ --initrd /aarch64.initrd \ --append 'earlyprintk console=ttyAMA0,115200n8 rw root=/dev/vda rootwait' \ --dtb /aarch64.dtb \ --device '{"driver":"virtio-serial-device","id":"virtio-serial0"}' \ --blockdev '{"driver":"file","filename":"/aarch64.raw","node-name":"libvirt-1-storage","auto-read-only":true,"discard":"unmap"}' \ --blockdev '{"node-name":"libvirt-1-format","read-only":false,"driver":"raw","file":"libvirt-1-storage"}' \ --device '{"driver":"virtio-blk-device","drive":"libvirt-1-format","id":"virtio-disk0","bootindex":1}' \ --netdev '{"type":"user","id":"hostnet0"}' \ --device '{"driver":"virtio-net-device","netdev":"hostnet0","id":"net0","mac":"52:54:00:09:a4:37"}' \ --chardev pty,id=charserial0 \ --serial chardev:charserial0 \ --chardev pty,id=charconsole1 \ --device '{"driver":"virtconsole","chardev":"charconsole1","id":"console1"}' \ --audiodev '{"id":"audio1","driver":"none"}' \ --device '{"driver":"virtio-balloon-device","id":"balloon0"}' \ --object '{"qom-type":"rng-random","id":"objrng0","filename":"/dev/random"}' \ --device '{"driver":"virtio-rng-device","rng":"objrng0","id":"rng0"}' \ --sandbox on,obsolete=deny,elevateprivileges=deny,spawn=deny,resourcecontrol=deny \ --msg timestamp=on diff --git a/tests/qemuxml2argvdata/arm-virt-virtio.aarch64-latest.args b/tests/qemuxml2argvdata/arm-virt-virtio.aarch64-latest.args deleted file mode 100644 index b2266bc9bc..0000000000 --- a/tests/qemuxml2argvdata/arm-virt-virtio.aarch64-latest.args +++ /dev/null @@ -1,54 +0,0 @@ -LC_ALL=C \ -PATH=/bin \ -HOME=/var/lib/libvirt/qemu/domain--1-armtest \ -USER=test \ -LOGNAME=test \ -XDG_DATA_HOME=/var/lib/libvirt/qemu/domain--1-armtest/.local/share \ -XDG_CACHE_HOME=/var/lib/libvirt/qemu/domain--1-armtest/.cache \ -XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-armtest/.config \ -/usr/bin/qemu-system-aarch64 \ --name guest=armtest,debug-threads=on \ --S \ --object '{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/var/lib/libvirt/qemu/domain--1-armtest/master-key.aes"}' \ --machine virt,usb=off,gic-version=2,dump-guest-core=off,memory-backend=mach-virt.ram,acpi=on \ --accel tcg \ --cpu cortex-a15 \ --m size=1048576k \ --object '{"qom-type":"memory-backend-ram","id":"mach-virt.ram","size":1073741824}' \ --overcommit mem-lock=off \ --smp 1,sockets=1,cores=1,threads=1 \ --uuid 496d7ea8-9739-544b-4ebd-ef08be936e6a \ --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 \ --kernel /arm.kernel \ --initrd /arm.initrd \ --append 'console=ttyAMA0,115200n8 rw root=/dev/vda rootwait physmap.enabled=0' \ --dtb /arm.dtb \ --device '{"driver":"pcie-root-port","port":8,"chassis":1,"id":"pci.1","bus":"pcie.0","multifunction":true,"addr":"0x1"}' \ --device '{"driver":"pcie-root-port","port":9,"chassis":2,"id":"pci.2","bus":"pcie.0","addr":"0x1.0x1"}' \ --device '{"driver":"pcie-root-port","port":10,"chassis":3,"id":"pci.3","bus":"pcie.0","addr":"0x1.0x2"}' \ --device '{"driver":"pcie-root-port","port":11,"chassis":4,"id":"pci.4","bus":"pcie.0","addr":"0x1.0x3"}' \ --device '{"driver":"pcie-root-port","port":12,"chassis":5,"id":"pci.5","bus":"pcie.0","addr":"0x1.0x4"}' \ --device '{"driver":"pcie-root-port","port":13,"chassis":6,"id":"pci.6","bus":"pcie.0","addr":"0x1.0x5"}' \ --device '{"driver":"virtio-serial-pci","id":"virtio-serial0","bus":"pci.2","addr":"0x0"}' \ --blockdev '{"driver":"file","filename":"/arm.raw","node-name":"libvirt-1-storage","auto-read-only":true,"discard":"unmap"}' \ --blockdev '{"node-name":"libvirt-1-format","read-only":false,"driver":"raw","file":"libvirt-1-storage"}' \ --device '{"driver":"virtio-blk-pci","bus":"pci.3","addr":"0x0","drive":"libvirt-1-format","id":"virtio-disk0","bootindex":1}' \ --netdev '{"type":"user","id":"hostnet0"}' \ --device '{"driver":"virtio-net-pci","netdev":"hostnet0","id":"net0","mac":"52:54:00:09:a4:37","bus":"pci.1","addr":"0x0"}' \ --chardev pty,id=charserial0 \ --serial chardev:charserial0 \ --chardev pty,id=charconsole1 \ --device '{"driver":"virtconsole","chardev":"charconsole1","id":"console1"}' \ --audiodev '{"id":"audio1","driver":"none"}' \ --device '{"driver":"virtio-balloon-pci","id":"balloon0","bus":"pci.4","addr":"0x0"}' \ --object '{"qom-type":"rng-random","id":"objrng0","filename":"/dev/random"}' \ --device '{"driver":"virtio-rng-pci","rng":"objrng0","id":"rng0","bus":"pci.5","addr":"0x0"}' \ --sandbox on,obsolete=deny,elevateprivileges=deny,spawn=deny,resourcecontrol=deny \ --msg timestamp=on diff --git a/tests/qemuxml2argvdata/arm-virt-virtio.xml b/tests/qemuxml2argvdata/arm-virt-virtio.xml deleted file mode 100644 index 39620070bd..0000000000 --- a/tests/qemuxml2argvdata/arm-virt-virtio.xml +++ /dev/null @@ -1,45 +0,0 @@ -<domain type="qemu"> - <name>armtest</name> - <uuid>496d7ea8-9739-544b-4ebd-ef08be936e6a</uuid> - <memory>1048576</memory> - <currentMemory>1048576</currentMemory> - <vcpu>1</vcpu> - <os> - <type arch="armv7l" machine="virt">hvm</type> - <kernel>/arm.kernel</kernel> - <initrd>/arm.initrd</initrd> - <dtb>/arm.dtb</dtb> - <cmdline>console=ttyAMA0,115200n8 rw root=/dev/vda rootwait physmap.enabled=0</cmdline> - </os> - <features> - <acpi/> - <apic/> - <pae/> - </features> - <clock offset="utc"/> - <on_poweroff>destroy</on_poweroff> - <on_reboot>restart</on_reboot> - <on_crash>restart</on_crash> - <devices> - <emulator>/usr/bin/qemu-system-aarch64</emulator> - <disk type='file' device='disk'> - <source file='/arm.raw'/> - <target dev='vda' bus='virtio'/> - </disk> - <interface type='user'> - <mac address='52:54:00:09:a4:37'/> - <model type='virtio'/> - </interface> - <console type='pty'/> - <console type='pty'> - <target type='virtio' port='0'/> - </console> - <memballoon model='virtio'/> - <!-- - This actually doesn't work in practice because vexpress only has - 4 virtio slots available, rng makes 5 --> - <rng model='virtio'> - <backend model='random'>/dev/random</backend> - </rng> - </devices> -</domain> diff --git a/tests/qemuxml2argvdata/riscv64-virt-pci.riscv64-latest.args b/tests/qemuxml2argvdata/riscv64-virt-pci.riscv64-latest.args deleted file mode 100644 index ff52cba889..0000000000 --- a/tests/qemuxml2argvdata/riscv64-virt-pci.riscv64-latest.args +++ /dev/null @@ -1,35 +0,0 @@ -LC_ALL=C \ -PATH=/bin \ -HOME=/var/lib/libvirt/qemu/domain--1-riscv64 \ -USER=test \ -LOGNAME=test \ -XDG_DATA_HOME=/var/lib/libvirt/qemu/domain--1-riscv64/.local/share \ -XDG_CACHE_HOME=/var/lib/libvirt/qemu/domain--1-riscv64/.cache \ -XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-riscv64/.config \ -/usr/bin/qemu-system-riscv64 \ --name guest=riscv64,debug-threads=on \ --S \ --object '{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/var/lib/libvirt/qemu/domain--1-riscv64/master-key.aes"}' \ --machine virt,usb=off,dump-guest-core=off,memory-backend=riscv_virt_board.ram \ --accel tcg \ --m size=2097152k \ --object '{"qom-type":"memory-backend-ram","id":"riscv_virt_board.ram","size":2147483648}' \ --overcommit mem-lock=off \ --smp 1,sockets=1,cores=1,threads=1 \ --uuid fd65fc03-8838-4c4d-9d8d-395802488790 \ --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 \ --kernel /var/lib/libvirt/images/riscv64.bbl \ --append root=/dev/vda \ --blockdev '{"driver":"file","filename":"/var/lib/libvirt/images/riscv64.qcow2","node-name":"libvirt-1-storage","auto-read-only":true,"discard":"unmap"}' \ --blockdev '{"node-name":"libvirt-1-format","read-only":false,"driver":"qcow2","file":"libvirt-1-storage"}' \ --device '{"driver":"virtio-blk-pci","bus":"pcie.0","addr":"0x1","drive":"libvirt-1-format","id":"virtio-disk0","bootindex":1}' \ --audiodev '{"id":"audio1","driver":"none"}' \ --sandbox on,obsolete=deny,elevateprivileges=deny,spawn=deny,resourcecontrol=deny \ --msg timestamp=on diff --git a/tests/qemuxml2argvdata/riscv64-virt-pci.xml b/tests/qemuxml2argvdata/riscv64-virt-pci.xml deleted file mode 100644 index c72cd58086..0000000000 --- a/tests/qemuxml2argvdata/riscv64-virt-pci.xml +++ /dev/null @@ -1,24 +0,0 @@ -<domain type='qemu'> - <name>riscv64</name> - <uuid>fd65fc03-8838-4c4d-9d8d-395802488790</uuid> - <memory unit='KiB'>2097152</memory> - <vcpu placement='static'>1</vcpu> - <os> - <type arch='riscv64' machine='virt'>hvm</type> - <kernel>/var/lib/libvirt/images/riscv64.bbl</kernel> - <cmdline>root=/dev/vda</cmdline> - </os> - <devices> - <emulator>/usr/bin/qemu-system-riscv64</emulator> - <disk type='file'> - <driver name='qemu' type='qcow2'/> - <source file='/var/lib/libvirt/images/riscv64.qcow2'/> - <target dev='vda' bus='virtio'/> - <!-- We need to manually pick an address on pcie.0 because otherwise - libvirt would try to add pcie-root-ports, and QEMU doesn't support - PCIe controllers for RISC-V guests yet --> - <address type='pci' domain='0x0000' bus='0x00' slot='0x01' function='0x0'/> - </disk> - <memballoon model='none'/> - </devices> -</domain> diff --git a/tests/qemuxml2argvdata/riscv64-virt.riscv64-latest.args b/tests/qemuxml2argvdata/riscv64-virt.riscv64-latest.args deleted file mode 100644 index b3a34272fe..0000000000 --- a/tests/qemuxml2argvdata/riscv64-virt.riscv64-latest.args +++ /dev/null @@ -1,38 +0,0 @@ -LC_ALL=C \ -PATH=/bin \ -HOME=/var/lib/libvirt/qemu/domain--1-riscv64 \ -USER=test \ -LOGNAME=test \ -XDG_DATA_HOME=/var/lib/libvirt/qemu/domain--1-riscv64/.local/share \ -XDG_CACHE_HOME=/var/lib/libvirt/qemu/domain--1-riscv64/.cache \ -XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-riscv64/.config \ -/usr/bin/qemu-system-riscv64 \ --name guest=riscv64,debug-threads=on \ --S \ --object '{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/var/lib/libvirt/qemu/domain--1-riscv64/master-key.aes"}' \ --machine virt,usb=off,dump-guest-core=off,memory-backend=riscv_virt_board.ram \ --accel tcg \ --m size=2097152k \ --object '{"qom-type":"memory-backend-ram","id":"riscv_virt_board.ram","size":2147483648}' \ --overcommit mem-lock=off \ --smp 1,sockets=1,cores=1,threads=1 \ --uuid fd65fc03-8838-4c4d-9d8d-395802488790 \ --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 \ --kernel /var/lib/libvirt/images/bbl \ --append 'console=ttyS0 ro root=/dev/vda' \ --blockdev '{"driver":"file","filename":"/var/lib/libvirt/images/stage4-disk.img","node-name":"libvirt-1-storage","auto-read-only":true,"discard":"unmap"}' \ --blockdev '{"node-name":"libvirt-1-format","read-only":false,"driver":"raw","file":"libvirt-1-storage"}' \ --device '{"driver":"virtio-blk-device","drive":"libvirt-1-format","id":"virtio-disk0","bootindex":1}' \ --chardev pty,id=charserial0 \ --serial chardev:charserial0 \ --audiodev '{"id":"audio1","driver":"none"}' \ --device '{"driver":"virtio-balloon-device","id":"balloon0"}' \ --sandbox on,obsolete=deny,elevateprivileges=deny,spawn=deny,resourcecontrol=deny \ --msg timestamp=on diff --git a/tests/qemuxml2argvdata/riscv64-virt.xml b/tests/qemuxml2argvdata/riscv64-virt.xml deleted file mode 100644 index 3a672bdea5..0000000000 --- a/tests/qemuxml2argvdata/riscv64-virt.xml +++ /dev/null @@ -1,19 +0,0 @@ -<domain type='qemu'> - <name>riscv64</name> - <uuid>fd65fc03-8838-4c4d-9d8d-395802488790</uuid> - <memory unit='KiB'>2097152</memory> - <vcpu placement='static'>1</vcpu> - <os> - <type arch='riscv64' machine='virt'>hvm</type> - <kernel>/var/lib/libvirt/images/bbl</kernel> - <cmdline>console=ttyS0 ro root=/dev/vda</cmdline> - </os> - <devices> - <emulator>/usr/bin/qemu-system-riscv64</emulator> - <disk type='file'> - <source file='/var/lib/libvirt/images/stage4-disk.img'/> - <target dev='vda' bus='virtio'/> - </disk> - <serial type='pty'/> - </devices> -</domain> diff --git a/tests/qemuxml2argvtest.c b/tests/qemuxml2argvtest.c index 1bc3985aca..fd89dbe649 100644 --- a/tests/qemuxml2argvtest.c +++ b/tests/qemuxml2argvtest.c @@ -2254,16 +2254,6 @@ mymain(void) DO_TEST_CAPS_ARCH_LATEST("arm-vexpressa9-nodevs", "aarch64"); DO_TEST_CAPS_ARCH_LATEST("arm-vexpressa9-basic", "aarch64"); DO_TEST_CAPS_ARCH_LATEST("arm-vexpressa9-virtio", "aarch64"); - DO_TEST_CAPS_ARCH_LATEST("arm-virt-virtio", "aarch64"); - - /* test default config if pcie bus is not available */ - DO_TEST_FULL("aarch64-virt-virtio", "-MMIO.aarch64.latest", - ARG_CAPS_ARCH, "aarch64", - ARG_CAPS_VER, "latest", - ARG_QEMU_CAPS_DEL, - QEMU_CAPS_OBJECT_GPEX, QEMU_CAPS_DEVICE_PCI_BRIDGE, - QEMU_CAPS_DEVICE_DMI_TO_PCI_BRIDGE, QEMU_CAPS_DEVICE_IOH3420, - QEMU_CAPS_LAST, ARG_END); DO_TEST_CAPS_ARCH_VER("aarch64-virt-virtio", "aarch64", "4.2.0"); DO_TEST_CAPS_ARCH_LATEST("aarch64-virt-virtio", "aarch64"); @@ -2273,7 +2263,6 @@ mymain(void) DO_TEST_CAPS_ARCH_LATEST("aarch64-virtio-pci-manual-addresses", "aarch64"); DO_TEST_CAPS_ARCH_LATEST("aarch64-video-virtio-gpu-pci", "aarch64"); DO_TEST_CAPS_ARCH_LATEST("aarch64-video-default", "aarch64"); - DO_TEST_CAPS_ARCH_LATEST("aarch64-aavmf-virtio-mmio", "aarch64"); DO_TEST_CAPS_ARCH_LATEST("aarch64-virt-default-nic", "aarch64"); DO_TEST_CAPS_ARCH_LATEST("aarch64-cpu-passthrough", "aarch64"); DO_TEST_GIC("aarch64-gic-none", "4.2.0", GIC_NONE); @@ -2526,13 +2515,6 @@ mymain(void) DO_TEST_CAPS_LATEST("vhost-user-fs-hugepages"); DO_TEST_CAPS_LATEST_PARSE_ERROR("vhost-user-fs-readonly"); - /* The generic pcie bridge emulation device can be compiled out of qemu. */ - DO_TEST_CAPS_ARCH_LATEST_FULL("riscv64-virt", "riscv64", - ARG_QEMU_CAPS_DEL, - QEMU_CAPS_OBJECT_GPEX, - QEMU_CAPS_LAST); - DO_TEST_CAPS_ARCH_LATEST("riscv64-virt-pci", "riscv64"); - DO_TEST_CAPS_LATEST("virtio-transitional"); DO_TEST_CAPS_LATEST("virtio-non-transitional"); DO_TEST_CAPS_LATEST_PARSE_ERROR("virtio-transitional-not-supported"); diff --git a/tests/qemuxml2xmloutdata/aarch64-aavmf-virtio-mmio.aarch64-latest.xml b/tests/qemuxml2xmloutdata/aarch64-aavmf-virtio-mmio.aarch64-latest.xml deleted file mode 100644 index 634d8ee683..0000000000 --- a/tests/qemuxml2xmloutdata/aarch64-aavmf-virtio-mmio.aarch64-latest.xml +++ /dev/null @@ -1,56 +0,0 @@ -<domain type='qemu'> - <name>aarch64test</name> - <uuid>496d7ea8-9739-544b-4ebd-ef08be936e8b</uuid> - <memory unit='KiB'>1048576</memory> - <currentMemory unit='KiB'>1048576</currentMemory> - <vcpu placement='static'>1</vcpu> - <os> - <type arch='aarch64' machine='virt'>hvm</type> - <kernel>/aarch64.kernel</kernel> - <initrd>/aarch64.initrd</initrd> - <cmdline>earlyprintk console=ttyAMA0,115200n8 rw root=/dev/vda rootwait</cmdline> - <dtb>/aarch64.dtb</dtb> - <boot dev='hd'/> - </os> - <features> - <apic/> - <pae/> - <gic version='2'/> - </features> - <cpu mode='custom' match='exact' check='none'> - <model fallback='allow'>cortex-a53</model> - </cpu> - <clock offset='utc'/> - <on_poweroff>destroy</on_poweroff> - <on_reboot>restart</on_reboot> - <on_crash>restart</on_crash> - <devices> - <emulator>/usr/bin/qemu-system-aarch64</emulator> - <disk type='file' device='disk'> - <driver name='qemu' type='raw'/> - <source file='/aarch64.raw'/> - <target dev='vda' bus='virtio'/> - <address type='virtio-mmio'/> - </disk> - <controller type='virtio-serial' index='0'> - <address type='virtio-mmio'/> - </controller> - <controller type='pci' index='0' model='pcie-root'/> - <interface type='user'> - <mac address='52:54:00:09:a4:37'/> - <model type='virtio'/> - <address type='virtio-mmio'/> - </interface> - <console type='pty'> - <target type='virtio' port='0'/> - </console> - <audio id='1' type='none'/> - <memballoon model='virtio'> - <address type='virtio-mmio'/> - </memballoon> - <rng model='virtio'> - <backend model='random'>/dev/random</backend> - <address type='virtio-mmio'/> - </rng> - </devices> -</domain> diff --git a/tests/qemuxml2xmltest.c b/tests/qemuxml2xmltest.c index c21e34b477..a443f1e87e 100644 --- a/tests/qemuxml2xmltest.c +++ b/tests/qemuxml2xmltest.c @@ -765,7 +765,6 @@ mymain(void) DO_TEST_CAPS_LATEST("smbios"); DO_TEST_CAPS_LATEST("smbios-type-fwcfg"); - DO_TEST_CAPS_ARCH_LATEST("aarch64-aavmf-virtio-mmio", "aarch64"); DO_TEST_CAPS_ARCH_LATEST("aarch64-virtio-pci-manual-addresses", "aarch64"); DO_TEST_CAPS_ARCH_LATEST("aarch64-video-virtio-gpu-pci", "aarch64"); DO_TEST_CAPS_ARCH_LATEST("aarch64-pci-serial", "aarch64"); @@ -903,9 +902,6 @@ mymain(void) DO_TEST_CAPS_LATEST("vhost-user-fs-hugepages"); DO_TEST_CAPS_LATEST("vhost-user-fs-sock"); - DO_TEST_CAPS_ARCH_LATEST("riscv64-virt", "riscv64"); - DO_TEST_CAPS_ARCH_LATEST("riscv64-virt-pci", "riscv64"); - DO_TEST_CAPS_LATEST("x86-kvm-32-on-64"); DO_TEST_CAPS_LATEST("virtio-transitional"); -- 2.43.0

Drop everything that's not directly related to the scenario being tested. Signed-off-by: Andrea Bolognani <abologna@redhat.com> --- .../balloon-mmio-deflate.aarch64-latest.args | 4 ---- tests/qemuxml2argvdata/balloon-mmio-deflate.xml | 13 ------------- 2 files changed, 17 deletions(-) diff --git a/tests/qemuxml2argvdata/balloon-mmio-deflate.aarch64-latest.args b/tests/qemuxml2argvdata/balloon-mmio-deflate.aarch64-latest.args index 376182a856..89089c9d6b 100644 --- a/tests/qemuxml2argvdata/balloon-mmio-deflate.aarch64-latest.args +++ b/tests/qemuxml2argvdata/balloon-mmio-deflate.aarch64-latest.args @@ -26,10 +26,6 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-aarch64test/.config \ -rtc base=utc \ -no-shutdown \ -boot strict=on \ --kernel /aarch64.kernel \ --initrd /aarch64.initrd \ --append 'earlyprintk console=ttyAMA0,115200n8 rw root=/dev/vda rootwait' \ --dtb /aarch64.dtb \ -audiodev '{"id":"audio1","driver":"none"}' \ -device '{"driver":"virtio-balloon-device","id":"balloon0","deflate-on-oom":true}' \ -sandbox on,obsolete=deny,elevateprivileges=deny,spawn=deny,resourcecontrol=deny \ diff --git a/tests/qemuxml2argvdata/balloon-mmio-deflate.xml b/tests/qemuxml2argvdata/balloon-mmio-deflate.xml index 49b7d2c605..a749bf31a2 100644 --- a/tests/qemuxml2argvdata/balloon-mmio-deflate.xml +++ b/tests/qemuxml2argvdata/balloon-mmio-deflate.xml @@ -2,26 +2,13 @@ <name>aarch64test</name> <uuid>496d7ea8-9739-544b-4ebd-ef08be936e8b</uuid> <memory>1048576</memory> - <currentMemory>1048576</currentMemory> <vcpu placement='static'>1</vcpu> <os> <type arch="aarch64" machine="virt">hvm</type> - <kernel>/aarch64.kernel</kernel> - <initrd>/aarch64.initrd</initrd> - <dtb>/aarch64.dtb</dtb> - <cmdline>earlyprintk console=ttyAMA0,115200n8 rw root=/dev/vda rootwait</cmdline> </os> - <features> - <apic/> - <pae/> - </features> <cpu match='exact'> <model>cortex-a53</model> </cpu> - <clock offset="utc"/> - <on_poweroff>destroy</on_poweroff> - <on_reboot>restart</on_reboot> - <on_crash>restart</on_crash> <devices> <emulator>/usr/bin/qemu-system-aarch64</emulator> <memballoon model='virtio' autodeflate='on'/> -- 2.43.0

It's impossible to compile out PCI support on aarch64, so if we want to test virtio-balloon together with virtio-mmio we have to either request that explicitly or trick libvirt by masking capabilities. Do the former instead of the latter. Signed-off-by: Andrea Bolognani <abologna@redhat.com> --- tests/qemuxml2argvdata/balloon-mmio-deflate.xml | 4 +++- tests/qemuxml2argvtest.c | 8 +------- 2 files changed, 4 insertions(+), 8 deletions(-) diff --git a/tests/qemuxml2argvdata/balloon-mmio-deflate.xml b/tests/qemuxml2argvdata/balloon-mmio-deflate.xml index a749bf31a2..cb4ad0d347 100644 --- a/tests/qemuxml2argvdata/balloon-mmio-deflate.xml +++ b/tests/qemuxml2argvdata/balloon-mmio-deflate.xml @@ -11,6 +11,8 @@ </cpu> <devices> <emulator>/usr/bin/qemu-system-aarch64</emulator> - <memballoon model='virtio' autodeflate='on'/> + <memballoon model='virtio' autodeflate='on'> + <address type='virtio-mmio'/> + </memballoon> </devices> </domain> diff --git a/tests/qemuxml2argvtest.c b/tests/qemuxml2argvtest.c index fd89dbe649..5b36a297e0 100644 --- a/tests/qemuxml2argvtest.c +++ b/tests/qemuxml2argvtest.c @@ -1719,13 +1719,7 @@ mymain(void) DO_TEST_CAPS_LATEST("balloon-device"); DO_TEST_CAPS_LATEST("balloon-device-deflate"); DO_TEST_CAPS_ARCH_LATEST("balloon-ccw-deflate", "s390x"); - DO_TEST_FULL("balloon-mmio-deflate", ".aarch64-latest", - ARG_CAPS_ARCH, "aarch64", - ARG_CAPS_VER, "latest", - ARG_QEMU_CAPS_DEL, - QEMU_CAPS_OBJECT_GPEX, QEMU_CAPS_DEVICE_PCI_BRIDGE, - QEMU_CAPS_DEVICE_DMI_TO_PCI_BRIDGE, QEMU_CAPS_DEVICE_IOH3420, - QEMU_CAPS_LAST, ARG_END); + DO_TEST_CAPS_ARCH_LATEST("balloon-mmio-deflate", "aarch64"); DO_TEST_CAPS_LATEST("balloon-device-deflate-off"); DO_TEST_CAPS_LATEST("balloon-device-auto"); DO_TEST_CAPS_LATEST("balloon-device-period"); -- 2.43.0

For all versions of QEMU that we support, this is guaranteed to be compiled in both on aarch64 and on riscv64, so we can stop checking whether the capability is present and just use the device unconditionally. Signed-off-by: Andrea Bolognani <abologna@redhat.com> --- src/qemu/qemu_domain.c | 12 +++++------- src/qemu/qemu_domain.h | 3 +-- src/qemu/qemu_domain_address.c | 2 +- 3 files changed, 7 insertions(+), 10 deletions(-) diff --git a/src/qemu/qemu_domain.c b/src/qemu/qemu_domain.c index e2a1bf2c13..7c87cd6453 100644 --- a/src/qemu/qemu_domain.c +++ b/src/qemu/qemu_domain.c @@ -4168,7 +4168,7 @@ qemuDomainDefAddDefaultDevices(virQEMUDriver *driver, addDefaultUSB = false; addDefaultMemballoon = false; if (qemuDomainIsARMVirt(def)) - addPCIeRoot = virQEMUCapsGet(qemuCaps, QEMU_CAPS_OBJECT_GPEX); + addPCIeRoot = true; break; case VIR_ARCH_PPC64: @@ -4195,7 +4195,7 @@ qemuDomainDefAddDefaultDevices(virQEMUDriver *driver, case VIR_ARCH_RISCV64: addDefaultUSB = false; if (qemuDomainIsRISCVVirt(def)) - addPCIeRoot = virQEMUCapsGet(qemuCaps, QEMU_CAPS_OBJECT_GPEX); + addPCIeRoot = true; break; case VIR_ARCH_S390: @@ -9059,8 +9059,7 @@ qemuDomainNeedsFDC(const virDomainDef *def) bool -qemuDomainSupportsPCI(virDomainDef *def, - virQEMUCaps *qemuCaps) +qemuDomainSupportsPCI(virDomainDef *def) { if (def->os.arch != VIR_ARCH_ARMV6L && def->os.arch != VIR_ARCH_ARMV7L && @@ -9072,9 +9071,8 @@ qemuDomainSupportsPCI(virDomainDef *def, if (STREQ(def->os.machine, "versatilepb")) return true; - if ((qemuDomainIsARMVirt(def) || - qemuDomainIsRISCVVirt(def)) && - virQEMUCapsGet(qemuCaps, QEMU_CAPS_OBJECT_GPEX)) { + if (qemuDomainIsARMVirt(def) || + qemuDomainIsRISCVVirt(def)) { return true; } diff --git a/src/qemu/qemu_domain.h b/src/qemu/qemu_domain.h index fa566dded6..b0f1587f58 100644 --- a/src/qemu/qemu_domain.h +++ b/src/qemu/qemu_domain.h @@ -834,8 +834,7 @@ bool qemuDomainHasPCIeRoot(const virDomainDef *def); bool qemuDomainHasBuiltinIDE(const virDomainDef *def); bool qemuDomainHasBuiltinESP(const virDomainDef *def); bool qemuDomainNeedsFDC(const virDomainDef *def); -bool qemuDomainSupportsPCI(virDomainDef *def, - virQEMUCaps *qemuCaps); +bool qemuDomainSupportsPCI(virDomainDef *def); void qemuDomainUpdateCurrentMemorySize(virDomainObj *vm); diff --git a/src/qemu/qemu_domain_address.c b/src/qemu/qemu_domain_address.c index 099778b2a8..888ae70d95 100644 --- a/src/qemu/qemu_domain_address.c +++ b/src/qemu/qemu_domain_address.c @@ -2843,7 +2843,7 @@ qemuDomainAssignPCIAddresses(virDomainDef *def, if (!(addrs = qemuDomainPCIAddressSetCreate(def, qemuCaps, nbuses, false))) goto cleanup; - if (qemuDomainSupportsPCI(def, qemuCaps)) { + if (qemuDomainSupportsPCI(def)) { if (qemuDomainValidateDevicePCISlotsChipsets(def, addrs) < 0) goto cleanup; -- 2.43.0

This verifies that, for each architecture, libvirt will pick a reasonable default model for network interface where the user hasn't provided the information themselves. Note that pSeries guests currently get rtl8139 network cards by default, which makes little sense for the architecture. We're going to improve the situation in an upcoming commit. Signed-off-by: Andrea Bolognani <abologna@redhat.com> --- .../aarch64-default-net.aarch64-latest.args | 35 +++++++++++++++ .../qemuxml2argvdata/aarch64-default-net.xml | 17 ++++++++ .../ppc64-default-net.ppc64-latest.args | 33 ++++++++++++++ tests/qemuxml2argvdata/ppc64-default-net.xml | 17 ++++++++ .../riscv64-default-net.riscv64-latest.args | 34 +++++++++++++++ .../qemuxml2argvdata/riscv64-default-net.xml | 17 ++++++++ .../s390x-default-net.s390x-latest.args | 33 ++++++++++++++ tests/qemuxml2argvdata/s390x-default-net.xml | 17 ++++++++ .../x86_64-default-net.x86_64-latest.args | 33 ++++++++++++++ tests/qemuxml2argvdata/x86_64-default-net.xml | 17 ++++++++ tests/qemuxml2argvtest.c | 6 +++ .../aarch64-default-net.aarch64-latest.xml | 43 +++++++++++++++++++ .../ppc64-default-net.ppc64-latest.xml | 34 +++++++++++++++ .../riscv64-default-net.riscv64-latest.xml | 37 ++++++++++++++++ .../s390x-default-net.s390x-latest.xml | 31 +++++++++++++ .../x86_64-default-net.x86_64-latest.xml | 32 ++++++++++++++ tests/qemuxml2xmltest.c | 7 +++ 17 files changed, 443 insertions(+) create mode 100644 tests/qemuxml2argvdata/aarch64-default-net.aarch64-latest.args create mode 100644 tests/qemuxml2argvdata/aarch64-default-net.xml create mode 100644 tests/qemuxml2argvdata/ppc64-default-net.ppc64-latest.args create mode 100644 tests/qemuxml2argvdata/ppc64-default-net.xml create mode 100644 tests/qemuxml2argvdata/riscv64-default-net.riscv64-latest.args create mode 100644 tests/qemuxml2argvdata/riscv64-default-net.xml create mode 100644 tests/qemuxml2argvdata/s390x-default-net.s390x-latest.args create mode 100644 tests/qemuxml2argvdata/s390x-default-net.xml create mode 100644 tests/qemuxml2argvdata/x86_64-default-net.x86_64-latest.args create mode 100644 tests/qemuxml2argvdata/x86_64-default-net.xml create mode 100644 tests/qemuxml2xmloutdata/aarch64-default-net.aarch64-latest.xml create mode 100644 tests/qemuxml2xmloutdata/ppc64-default-net.ppc64-latest.xml create mode 100644 tests/qemuxml2xmloutdata/riscv64-default-net.riscv64-latest.xml create mode 100644 tests/qemuxml2xmloutdata/s390x-default-net.s390x-latest.xml create mode 100644 tests/qemuxml2xmloutdata/x86_64-default-net.x86_64-latest.xml diff --git a/tests/qemuxml2argvdata/aarch64-default-net.aarch64-latest.args b/tests/qemuxml2argvdata/aarch64-default-net.aarch64-latest.args new file mode 100644 index 0000000000..3df9155252 --- /dev/null +++ b/tests/qemuxml2argvdata/aarch64-default-net.aarch64-latest.args @@ -0,0 +1,35 @@ +LC_ALL=C \ +PATH=/bin \ +HOME=/var/lib/libvirt/qemu/domain--1-guest \ +USER=test \ +LOGNAME=test \ +XDG_DATA_HOME=/var/lib/libvirt/qemu/domain--1-guest/.local/share \ +XDG_CACHE_HOME=/var/lib/libvirt/qemu/domain--1-guest/.cache \ +XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-guest/.config \ +/usr/bin/qemu-system-aarch64 \ +-name guest=guest,debug-threads=on \ +-S \ +-object '{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/var/lib/libvirt/qemu/domain--1-guest/master-key.aes"}' \ +-machine virt,usb=off,gic-version=2,dump-guest-core=off,memory-backend=mach-virt.ram,acpi=off \ +-accel tcg \ +-cpu cortex-a15 \ +-m size=4194304k \ +-object '{"qom-type":"memory-backend-ram","id":"mach-virt.ram","size":4294967296}' \ +-overcommit mem-lock=off \ +-smp 4,sockets=4,cores=1,threads=1 \ +-uuid 1ccfd97d-5eb4-478a-bbe6-88d254c16db7 \ +-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":"pcie-root-port","port":8,"chassis":1,"id":"pci.1","bus":"pcie.0","multifunction":true,"addr":"0x1"}' \ +-device '{"driver":"pcie-root-port","port":9,"chassis":2,"id":"pci.2","bus":"pcie.0","addr":"0x1.0x1"}' \ +-netdev '{"type":"user","id":"hostnet0"}' \ +-device '{"driver":"virtio-net-pci","netdev":"hostnet0","id":"net0","mac":"52:54:00:09:a4:37","bus":"pci.1","addr":"0x0"}' \ +-audiodev '{"id":"audio1","driver":"none"}' \ +-sandbox on,obsolete=deny,elevateprivileges=deny,spawn=deny,resourcecontrol=deny \ +-msg timestamp=on diff --git a/tests/qemuxml2argvdata/aarch64-default-net.xml b/tests/qemuxml2argvdata/aarch64-default-net.xml new file mode 100644 index 0000000000..12dbf47fb0 --- /dev/null +++ b/tests/qemuxml2argvdata/aarch64-default-net.xml @@ -0,0 +1,17 @@ +<domain type='qemu'> + <name>guest</name> + <uuid>1ccfd97d-5eb4-478a-bbe6-88d254c16db7</uuid> + <memory>4194304</memory> + <vcpu>4</vcpu> + <os> + <type arch='aarch64' machine='virt'>hvm</type> + </os> + <devices> + <emulator>/usr/bin/qemu-system-aarch64</emulator> + <controller type='usb' model='none'/> + <interface type='user'> + <mac address='52:54:00:09:a4:37'/> + </interface> + <memballoon model='none'/> + </devices> +</domain> diff --git a/tests/qemuxml2argvdata/ppc64-default-net.ppc64-latest.args b/tests/qemuxml2argvdata/ppc64-default-net.ppc64-latest.args new file mode 100644 index 0000000000..4180c247d4 --- /dev/null +++ b/tests/qemuxml2argvdata/ppc64-default-net.ppc64-latest.args @@ -0,0 +1,33 @@ +LC_ALL=C \ +PATH=/bin \ +HOME=/var/lib/libvirt/qemu/domain--1-guest \ +USER=test \ +LOGNAME=test \ +XDG_DATA_HOME=/var/lib/libvirt/qemu/domain--1-guest/.local/share \ +XDG_CACHE_HOME=/var/lib/libvirt/qemu/domain--1-guest/.cache \ +XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-guest/.config \ +/usr/bin/qemu-system-ppc64 \ +-name guest=guest,debug-threads=on \ +-S \ +-object '{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/var/lib/libvirt/qemu/domain--1-guest/master-key.aes"}' \ +-machine pseries,usb=off,dump-guest-core=off,memory-backend=ppc_spapr.ram \ +-accel tcg \ +-cpu POWER9 \ +-m size=4194304k \ +-object '{"qom-type":"memory-backend-ram","id":"ppc_spapr.ram","size":4294967296}' \ +-overcommit mem-lock=off \ +-smp 4,sockets=4,cores=1,threads=1 \ +-uuid 1ccfd97d-5eb4-478a-bbe6-88d254c16db7 \ +-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 \ +-netdev user,id=hostnet0 \ +-device '{"driver":"rtl8139","netdev":"hostnet0","id":"net0","mac":"52:54:00:09:a4:37","bus":"pci.0","addr":"0x1"}' \ +-audiodev '{"id":"audio1","driver":"none"}' \ +-sandbox on,obsolete=deny,elevateprivileges=deny,spawn=deny,resourcecontrol=deny \ +-msg timestamp=on diff --git a/tests/qemuxml2argvdata/ppc64-default-net.xml b/tests/qemuxml2argvdata/ppc64-default-net.xml new file mode 100644 index 0000000000..208a5d48a3 --- /dev/null +++ b/tests/qemuxml2argvdata/ppc64-default-net.xml @@ -0,0 +1,17 @@ +<domain type='qemu'> + <name>guest</name> + <uuid>1ccfd97d-5eb4-478a-bbe6-88d254c16db7</uuid> + <memory>4194304</memory> + <vcpu>4</vcpu> + <os> + <type arch='ppc64' machine='pseries'>hvm</type> + </os> + <devices> + <emulator>/usr/bin/qemu-system-ppc64</emulator> + <controller type='usb' model='none'/> + <interface type='user'> + <mac address='52:54:00:09:a4:37'/> + </interface> + <memballoon model='none'/> + </devices> +</domain> diff --git a/tests/qemuxml2argvdata/riscv64-default-net.riscv64-latest.args b/tests/qemuxml2argvdata/riscv64-default-net.riscv64-latest.args new file mode 100644 index 0000000000..fb6d4b781f --- /dev/null +++ b/tests/qemuxml2argvdata/riscv64-default-net.riscv64-latest.args @@ -0,0 +1,34 @@ +LC_ALL=C \ +PATH=/bin \ +HOME=/var/lib/libvirt/qemu/domain--1-guest \ +USER=test \ +LOGNAME=test \ +XDG_DATA_HOME=/var/lib/libvirt/qemu/domain--1-guest/.local/share \ +XDG_CACHE_HOME=/var/lib/libvirt/qemu/domain--1-guest/.cache \ +XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-guest/.config \ +/usr/bin/qemu-system-riscv64 \ +-name guest=guest,debug-threads=on \ +-S \ +-object '{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/var/lib/libvirt/qemu/domain--1-guest/master-key.aes"}' \ +-machine virt,usb=off,dump-guest-core=off,memory-backend=riscv_virt_board.ram \ +-accel tcg \ +-m size=4194304k \ +-object '{"qom-type":"memory-backend-ram","id":"riscv_virt_board.ram","size":4294967296}' \ +-overcommit mem-lock=off \ +-smp 4,sockets=4,cores=1,threads=1 \ +-uuid 1ccfd97d-5eb4-478a-bbe6-88d254c16db7 \ +-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":"pcie-root-port","port":8,"chassis":1,"id":"pci.1","bus":"pcie.0","multifunction":true,"addr":"0x1"}' \ +-device '{"driver":"pcie-root-port","port":9,"chassis":2,"id":"pci.2","bus":"pcie.0","addr":"0x1.0x1"}' \ +-netdev '{"type":"user","id":"hostnet0"}' \ +-device '{"driver":"virtio-net-pci","netdev":"hostnet0","id":"net0","mac":"52:54:00:09:a4:37","bus":"pci.1","addr":"0x0"}' \ +-audiodev '{"id":"audio1","driver":"none"}' \ +-sandbox on,obsolete=deny,elevateprivileges=deny,spawn=deny,resourcecontrol=deny \ +-msg timestamp=on diff --git a/tests/qemuxml2argvdata/riscv64-default-net.xml b/tests/qemuxml2argvdata/riscv64-default-net.xml new file mode 100644 index 0000000000..8d1bd4807c --- /dev/null +++ b/tests/qemuxml2argvdata/riscv64-default-net.xml @@ -0,0 +1,17 @@ +<domain type='qemu'> + <name>guest</name> + <uuid>1ccfd97d-5eb4-478a-bbe6-88d254c16db7</uuid> + <memory>4194304</memory> + <vcpu>4</vcpu> + <os> + <type arch='riscv64' machine='virt'>hvm</type> + </os> + <devices> + <emulator>/usr/bin/qemu-system-riscv64</emulator> + <controller type='usb' model='none'/> + <interface type='user'> + <mac address='52:54:00:09:a4:37'/> + </interface> + <memballoon model='none'/> + </devices> +</domain> diff --git a/tests/qemuxml2argvdata/s390x-default-net.s390x-latest.args b/tests/qemuxml2argvdata/s390x-default-net.s390x-latest.args new file mode 100644 index 0000000000..1809a5a645 --- /dev/null +++ b/tests/qemuxml2argvdata/s390x-default-net.s390x-latest.args @@ -0,0 +1,33 @@ +LC_ALL=C \ +PATH=/bin \ +HOME=/var/lib/libvirt/qemu/domain--1-guest \ +USER=test \ +LOGNAME=test \ +XDG_DATA_HOME=/var/lib/libvirt/qemu/domain--1-guest/.local/share \ +XDG_CACHE_HOME=/var/lib/libvirt/qemu/domain--1-guest/.cache \ +XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-guest/.config \ +/usr/bin/qemu-system-s390x \ +-name guest=guest,debug-threads=on \ +-S \ +-object '{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/var/lib/libvirt/qemu/domain--1-guest/master-key.aes"}' \ +-machine s390-ccw-virtio,usb=off,dump-guest-core=off,memory-backend=s390.ram \ +-accel tcg \ +-cpu qemu \ +-m size=4194304k \ +-object '{"qom-type":"memory-backend-ram","id":"s390.ram","size":4294967296}' \ +-overcommit mem-lock=off \ +-smp 4,sockets=4,cores=1,threads=1 \ +-uuid 1ccfd97d-5eb4-478a-bbe6-88d254c16db7 \ +-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 \ +-netdev '{"type":"user","id":"hostnet0"}' \ +-device '{"driver":"virtio-net-ccw","netdev":"hostnet0","id":"net0","mac":"52:54:00:09:a4:37","devno":"fe.0.0000"}' \ +-audiodev '{"id":"audio1","driver":"none"}' \ +-sandbox on,obsolete=deny,elevateprivileges=deny,spawn=deny,resourcecontrol=deny \ +-msg timestamp=on diff --git a/tests/qemuxml2argvdata/s390x-default-net.xml b/tests/qemuxml2argvdata/s390x-default-net.xml new file mode 100644 index 0000000000..0ae2f2ede7 --- /dev/null +++ b/tests/qemuxml2argvdata/s390x-default-net.xml @@ -0,0 +1,17 @@ +<domain type='qemu'> + <name>guest</name> + <uuid>1ccfd97d-5eb4-478a-bbe6-88d254c16db7</uuid> + <memory>4194304</memory> + <vcpu>4</vcpu> + <os> + <type arch='s390x' machine='s390-ccw-virtio'>hvm</type> + </os> + <devices> + <emulator>/usr/bin/qemu-system-s390x</emulator> + <controller type='usb' model='none'/> + <interface type='user'> + <mac address='52:54:00:09:a4:37'/> + </interface> + <memballoon model='none'/> + </devices> +</domain> diff --git a/tests/qemuxml2argvdata/x86_64-default-net.x86_64-latest.args b/tests/qemuxml2argvdata/x86_64-default-net.x86_64-latest.args new file mode 100644 index 0000000000..7f9a558cf8 --- /dev/null +++ b/tests/qemuxml2argvdata/x86_64-default-net.x86_64-latest.args @@ -0,0 +1,33 @@ +LC_ALL=C \ +PATH=/bin \ +HOME=/var/lib/libvirt/qemu/domain--1-guest \ +USER=test \ +LOGNAME=test \ +XDG_DATA_HOME=/var/lib/libvirt/qemu/domain--1-guest/.local/share \ +XDG_CACHE_HOME=/var/lib/libvirt/qemu/domain--1-guest/.cache \ +XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-guest/.config \ +/usr/bin/qemu-system-x86_64 \ +-name guest=guest,debug-threads=on \ +-S \ +-object '{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/var/lib/libvirt/qemu/domain--1-guest/master-key.aes"}' \ +-machine pc,usb=off,dump-guest-core=off,memory-backend=pc.ram,acpi=off \ +-accel tcg \ +-cpu qemu64 \ +-m size=4194304k \ +-object '{"qom-type":"memory-backend-ram","id":"pc.ram","size":4294967296}' \ +-overcommit mem-lock=off \ +-smp 4,sockets=4,cores=1,threads=1 \ +-uuid 1ccfd97d-5eb4-478a-bbe6-88d254c16db7 \ +-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 \ +-netdev '{"type":"user","id":"hostnet0"}' \ +-device '{"driver":"rtl8139","netdev":"hostnet0","id":"net0","mac":"52:54:00:09:a4:37","bus":"pci.0","addr":"0x2"}' \ +-audiodev '{"id":"audio1","driver":"none"}' \ +-sandbox on,obsolete=deny,elevateprivileges=deny,spawn=deny,resourcecontrol=deny \ +-msg timestamp=on diff --git a/tests/qemuxml2argvdata/x86_64-default-net.xml b/tests/qemuxml2argvdata/x86_64-default-net.xml new file mode 100644 index 0000000000..2513f75a10 --- /dev/null +++ b/tests/qemuxml2argvdata/x86_64-default-net.xml @@ -0,0 +1,17 @@ +<domain type='qemu'> + <name>guest</name> + <uuid>1ccfd97d-5eb4-478a-bbe6-88d254c16db7</uuid> + <memory>4194304</memory> + <vcpu>4</vcpu> + <os> + <type arch='x86_64' machine='pc'>hvm</type> + </os> + <devices> + <emulator>/usr/bin/qemu-system-x86_64</emulator> + <controller type='usb' model='none'/> + <interface type='user'> + <mac address='52:54:00:09:a4:37'/> + </interface> + <memballoon model='none'/> + </devices> +</domain> diff --git a/tests/qemuxml2argvtest.c b/tests/qemuxml2argvtest.c index 5b36a297e0..9bd228e4fa 100644 --- a/tests/qemuxml2argvtest.c +++ b/tests/qemuxml2argvtest.c @@ -1531,6 +1531,12 @@ mymain(void) DO_TEST_CAPS_LATEST_PARSE_ERROR("vhost_queues-invalid"); + DO_TEST_CAPS_LATEST("x86_64-default-net"); + DO_TEST_CAPS_ARCH_LATEST("aarch64-default-net", "aarch64"); + DO_TEST_CAPS_ARCH_LATEST("riscv64-default-net", "riscv64"); + DO_TEST_CAPS_ARCH_LATEST("ppc64-default-net", "ppc64"); + DO_TEST_CAPS_ARCH_LATEST("s390x-default-net", "s390x"); + DO_TEST_CAPS_LATEST("net-vhostuser"); DO_TEST_CAPS_LATEST("net-vhostuser-multiq"); DO_TEST_CAPS_LATEST_FAILURE("net-vhostuser-fail"); diff --git a/tests/qemuxml2xmloutdata/aarch64-default-net.aarch64-latest.xml b/tests/qemuxml2xmloutdata/aarch64-default-net.aarch64-latest.xml new file mode 100644 index 0000000000..c67277a181 --- /dev/null +++ b/tests/qemuxml2xmloutdata/aarch64-default-net.aarch64-latest.xml @@ -0,0 +1,43 @@ +<domain type='qemu'> + <name>guest</name> + <uuid>1ccfd97d-5eb4-478a-bbe6-88d254c16db7</uuid> + <memory unit='KiB'>4194304</memory> + <currentMemory unit='KiB'>4194304</currentMemory> + <vcpu placement='static'>4</vcpu> + <os> + <type arch='aarch64' machine='virt'>hvm</type> + <boot dev='hd'/> + </os> + <features> + <gic version='2'/> + </features> + <cpu mode='custom' match='exact' check='none'> + <model fallback='forbid'>cortex-a15</model> + </cpu> + <clock offset='utc'/> + <on_poweroff>destroy</on_poweroff> + <on_reboot>restart</on_reboot> + <on_crash>destroy</on_crash> + <devices> + <emulator>/usr/bin/qemu-system-aarch64</emulator> + <controller type='usb' index='0' model='none'/> + <controller type='pci' index='0' model='pcie-root'/> + <controller type='pci' index='1' model='pcie-root-port'> + <model name='pcie-root-port'/> + <target chassis='1' port='0x8'/> + <address type='pci' domain='0x0000' bus='0x00' slot='0x01' function='0x0' multifunction='on'/> + </controller> + <controller type='pci' index='2' model='pcie-root-port'> + <model name='pcie-root-port'/> + <target chassis='2' port='0x9'/> + <address type='pci' domain='0x0000' bus='0x00' slot='0x01' function='0x1'/> + </controller> + <interface type='user'> + <mac address='52:54:00:09:a4:37'/> + <model type='virtio'/> + <address type='pci' domain='0x0000' bus='0x01' slot='0x00' function='0x0'/> + </interface> + <audio id='1' type='none'/> + <memballoon model='none'/> + </devices> +</domain> diff --git a/tests/qemuxml2xmloutdata/ppc64-default-net.ppc64-latest.xml b/tests/qemuxml2xmloutdata/ppc64-default-net.ppc64-latest.xml new file mode 100644 index 0000000000..fa83b6e290 --- /dev/null +++ b/tests/qemuxml2xmloutdata/ppc64-default-net.ppc64-latest.xml @@ -0,0 +1,34 @@ +<domain type='qemu'> + <name>guest</name> + <uuid>1ccfd97d-5eb4-478a-bbe6-88d254c16db7</uuid> + <memory unit='KiB'>4194304</memory> + <currentMemory unit='KiB'>4194304</currentMemory> + <vcpu placement='static'>4</vcpu> + <os> + <type arch='ppc64' machine='pseries'>hvm</type> + <boot dev='hd'/> + </os> + <cpu mode='custom' match='exact' check='none'> + <model fallback='forbid'>POWER9</model> + </cpu> + <clock offset='utc'/> + <on_poweroff>destroy</on_poweroff> + <on_reboot>restart</on_reboot> + <on_crash>destroy</on_crash> + <devices> + <emulator>/usr/bin/qemu-system-ppc64</emulator> + <controller type='usb' index='0' model='none'/> + <controller type='pci' index='0' model='pci-root'> + <model name='spapr-pci-host-bridge'/> + <target index='0'/> + </controller> + <interface type='user'> + <mac address='52:54:00:09:a4:37'/> + <model type='rtl8139'/> + <address type='pci' domain='0x0000' bus='0x00' slot='0x01' function='0x0'/> + </interface> + <audio id='1' type='none'/> + <memballoon model='none'/> + <panic model='pseries'/> + </devices> +</domain> diff --git a/tests/qemuxml2xmloutdata/riscv64-default-net.riscv64-latest.xml b/tests/qemuxml2xmloutdata/riscv64-default-net.riscv64-latest.xml new file mode 100644 index 0000000000..b8c881722c --- /dev/null +++ b/tests/qemuxml2xmloutdata/riscv64-default-net.riscv64-latest.xml @@ -0,0 +1,37 @@ +<domain type='qemu'> + <name>guest</name> + <uuid>1ccfd97d-5eb4-478a-bbe6-88d254c16db7</uuid> + <memory unit='KiB'>4194304</memory> + <currentMemory unit='KiB'>4194304</currentMemory> + <vcpu placement='static'>4</vcpu> + <os> + <type arch='riscv64' machine='virt'>hvm</type> + <boot dev='hd'/> + </os> + <clock offset='utc'/> + <on_poweroff>destroy</on_poweroff> + <on_reboot>restart</on_reboot> + <on_crash>destroy</on_crash> + <devices> + <emulator>/usr/bin/qemu-system-riscv64</emulator> + <controller type='usb' index='0' model='none'/> + <controller type='pci' index='0' model='pcie-root'/> + <controller type='pci' index='1' model='pcie-root-port'> + <model name='pcie-root-port'/> + <target chassis='1' port='0x8'/> + <address type='pci' domain='0x0000' bus='0x00' slot='0x01' function='0x0' multifunction='on'/> + </controller> + <controller type='pci' index='2' model='pcie-root-port'> + <model name='pcie-root-port'/> + <target chassis='2' port='0x9'/> + <address type='pci' domain='0x0000' bus='0x00' slot='0x01' function='0x1'/> + </controller> + <interface type='user'> + <mac address='52:54:00:09:a4:37'/> + <model type='virtio'/> + <address type='pci' domain='0x0000' bus='0x01' slot='0x00' function='0x0'/> + </interface> + <audio id='1' type='none'/> + <memballoon model='none'/> + </devices> +</domain> diff --git a/tests/qemuxml2xmloutdata/s390x-default-net.s390x-latest.xml b/tests/qemuxml2xmloutdata/s390x-default-net.s390x-latest.xml new file mode 100644 index 0000000000..fd60d0bbf3 --- /dev/null +++ b/tests/qemuxml2xmloutdata/s390x-default-net.s390x-latest.xml @@ -0,0 +1,31 @@ +<domain type='qemu'> + <name>guest</name> + <uuid>1ccfd97d-5eb4-478a-bbe6-88d254c16db7</uuid> + <memory unit='KiB'>4194304</memory> + <currentMemory unit='KiB'>4194304</currentMemory> + <vcpu placement='static'>4</vcpu> + <os> + <type arch='s390x' machine='s390-ccw-virtio'>hvm</type> + <boot dev='hd'/> + </os> + <cpu mode='custom' match='exact' check='none'> + <model fallback='forbid'>qemu</model> + </cpu> + <clock offset='utc'/> + <on_poweroff>destroy</on_poweroff> + <on_reboot>restart</on_reboot> + <on_crash>destroy</on_crash> + <devices> + <emulator>/usr/bin/qemu-system-s390x</emulator> + <controller type='usb' index='0' model='none'/> + <controller type='pci' index='0' model='pci-root'/> + <interface type='user'> + <mac address='52:54:00:09:a4:37'/> + <model type='virtio'/> + <address type='ccw' cssid='0xfe' ssid='0x0' devno='0x0000'/> + </interface> + <audio id='1' type='none'/> + <memballoon model='none'/> + <panic model='s390'/> + </devices> +</domain> diff --git a/tests/qemuxml2xmloutdata/x86_64-default-net.x86_64-latest.xml b/tests/qemuxml2xmloutdata/x86_64-default-net.x86_64-latest.xml new file mode 100644 index 0000000000..9d393f7aa9 --- /dev/null +++ b/tests/qemuxml2xmloutdata/x86_64-default-net.x86_64-latest.xml @@ -0,0 +1,32 @@ +<domain type='qemu'> + <name>guest</name> + <uuid>1ccfd97d-5eb4-478a-bbe6-88d254c16db7</uuid> + <memory unit='KiB'>4194304</memory> + <currentMemory unit='KiB'>4194304</currentMemory> + <vcpu placement='static'>4</vcpu> + <os> + <type arch='x86_64' machine='pc'>hvm</type> + <boot dev='hd'/> + </os> + <cpu mode='custom' match='exact' check='none'> + <model fallback='forbid'>qemu64</model> + </cpu> + <clock offset='utc'/> + <on_poweroff>destroy</on_poweroff> + <on_reboot>restart</on_reboot> + <on_crash>destroy</on_crash> + <devices> + <emulator>/usr/bin/qemu-system-x86_64</emulator> + <controller type='usb' index='0' model='none'/> + <controller type='pci' index='0' model='pci-root'/> + <interface type='user'> + <mac address='52:54:00:09:a4:37'/> + <model type='rtl8139'/> + <address type='pci' domain='0x0000' bus='0x00' slot='0x02' function='0x0'/> + </interface> + <input type='mouse' bus='ps2'/> + <input type='keyboard' bus='ps2'/> + <audio id='1' type='none'/> + <memballoon model='none'/> + </devices> +</domain> diff --git a/tests/qemuxml2xmltest.c b/tests/qemuxml2xmltest.c index a443f1e87e..5a635444f8 100644 --- a/tests/qemuxml2xmltest.c +++ b/tests/qemuxml2xmltest.c @@ -376,6 +376,13 @@ mymain(void) DO_TEST_CAPS_LATEST("misc-enable-s4"); DO_TEST_CAPS_LATEST("misc-no-reboot"); DO_TEST_CAPS_LATEST("misc-uuid"); + + DO_TEST_CAPS_LATEST("x86_64-default-net"); + DO_TEST_CAPS_ARCH_LATEST("aarch64-default-net", "aarch64"); + DO_TEST_CAPS_ARCH_LATEST("riscv64-default-net", "riscv64"); + DO_TEST_CAPS_ARCH_LATEST("ppc64-default-net", "ppc64"); + DO_TEST_CAPS_ARCH_LATEST("s390x-default-net", "s390x"); + DO_TEST_CAPS_LATEST("net-vhostuser"); DO_TEST_CAPS_LATEST("net-user"); DO_TEST_CAPS_LATEST("net-user-addr"); -- 2.43.0

Outside of x86, where we need to try pretty hard to pick hardware that obsolete operating systems might be able to use, and Arm, where some of the less virtualization-friendly machine types have their own specific default, the sensible choice is virtio-net. This is even more true for any architecture that's going to be introduced in the future, as recent experience has shown that they will be developed with virtualization in mind and use virtio as extensively as possible. Note that the default for ppc64 is changed as part of this. That's technically a breaking change, but it should be safe to apply since * it doesn't affect existing guests; * virt-manager already prefers virtio-net anyway. rtl8139 was a pretty bad default for the architecture in the first place, which was only applied accidentally due to its existing status as default for x86. Signed-off-by: Andrea Bolognani <abologna@redhat.com> --- src/qemu/qemu_domain.c | 12 ++++-------- .../ppc64-default-net.ppc64-latest.args | 2 +- .../ppc64-default-net.ppc64-latest.xml | 2 +- 3 files changed, 6 insertions(+), 10 deletions(-) diff --git a/src/qemu/qemu_domain.c b/src/qemu/qemu_domain.c index de36641137..fac83e8bb7 100644 --- a/src/qemu/qemu_domain.c +++ b/src/qemu/qemu_domain.c @@ -5392,12 +5392,7 @@ static int qemuDomainDefaultNetModel(const virDomainDef *def, virQEMUCaps *qemuCaps) { - if (ARCH_IS_S390(def->os.arch)) - return VIR_DOMAIN_NET_MODEL_VIRTIO; - - if (def->os.arch == VIR_ARCH_ARMV6L || - def->os.arch == VIR_ARCH_ARMV7L || - def->os.arch == VIR_ARCH_AARCH64) { + if (ARCH_IS_ARM(def->os.arch)) { if (STREQ(def->os.machine, "versatilepb")) return VIR_DOMAIN_NET_MODEL_SMC91C111; @@ -5409,8 +5404,9 @@ qemuDomainDefaultNetModel(const virDomainDef *def, return VIR_DOMAIN_NET_MODEL_LAN9118; } - /* virtio is a sensible default for RISC-V virt guests */ - if (qemuDomainIsRISCVVirt(def)) + /* For all remaining non-x86 architectures, virtio-net is a good + * default */ + if (!ARCH_IS_X86(def->os.arch)) return VIR_DOMAIN_NET_MODEL_VIRTIO; /* In all other cases the model depends on the capabilities. If they were diff --git a/tests/qemuxml2argvdata/ppc64-default-net.ppc64-latest.args b/tests/qemuxml2argvdata/ppc64-default-net.ppc64-latest.args index 4180c247d4..d1716817fb 100644 --- a/tests/qemuxml2argvdata/ppc64-default-net.ppc64-latest.args +++ b/tests/qemuxml2argvdata/ppc64-default-net.ppc64-latest.args @@ -27,7 +27,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-guest/.config \ -no-shutdown \ -boot strict=on \ -netdev user,id=hostnet0 \ --device '{"driver":"rtl8139","netdev":"hostnet0","id":"net0","mac":"52:54:00:09:a4:37","bus":"pci.0","addr":"0x1"}' \ +-device '{"driver":"virtio-net-pci","netdev":"hostnet0","id":"net0","mac":"52:54:00:09:a4:37","bus":"pci.0","addr":"0x1"}' \ -audiodev '{"id":"audio1","driver":"none"}' \ -sandbox on,obsolete=deny,elevateprivileges=deny,spawn=deny,resourcecontrol=deny \ -msg timestamp=on diff --git a/tests/qemuxml2xmloutdata/ppc64-default-net.ppc64-latest.xml b/tests/qemuxml2xmloutdata/ppc64-default-net.ppc64-latest.xml index fa83b6e290..8b59dcaafd 100644 --- a/tests/qemuxml2xmloutdata/ppc64-default-net.ppc64-latest.xml +++ b/tests/qemuxml2xmloutdata/ppc64-default-net.ppc64-latest.xml @@ -24,7 +24,7 @@ </controller> <interface type='user'> <mac address='52:54:00:09:a4:37'/> - <model type='rtl8139'/> + <model type='virtio'/> <address type='pci' domain='0x0000' bus='0x00' slot='0x01' function='0x0'/> </interface> <audio id='1' type='none'/> -- 2.43.0