External/libvirt
1
0
Fork 0
mirror of https://gitlab.com/libvirt/libvirt.git synced 2024-07-30 13:37:17 +00:00
Code Issues Packages Projects Releases Wiki Activity

tests: Fix aliases for pSeries buses

Browse Source 
virQEMUCapsHasPCIMultiBus() performs a version check on
the QEMU binary to figure out whether multiple buses are
supported, so to get the correct aliases assigned when
dealing with pSeries guests we need to spoof the version
accordingly in the test suite.
This commit is contained in:
Andrea Bolognani 2017-03-02 15:51:44 +01:00
parent 5b78337992
commit 3a37af1e41
11 changed files with 27 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/qemu/qemu_capabilities.c
View File

@ -2341,6 +2341,14 @@ virArch virQEMUCapsGetArch(virQEMUCapsPtr qemuCaps)
}
void
virQEMUCapsSetVersion(virQEMUCapsPtr qemuCaps,
unsigned int version)
{
qemuCaps->version = version;
}
unsigned int virQEMUCapsGetVersion(virQEMUCapsPtr qemuCaps)
{
return qemuCaps->version;

4
src/qemu/qemu_capspriv.h
View File

@ -69,6 +69,10 @@ void
virQEMUCapsSetArch(virQEMUCapsPtr qemuCaps,
virArch arch);
void
virQEMUCapsSetVersion(virQEMUCapsPtr qemuCaps,
unsigned int version);
void
virQEMUCapsInitHostCPUModel(virQEMUCapsPtr qemuCaps,
virCapsPtr caps);

2
tests/qemuxml2argvdata/qemuxml2argv-memory-hotplug-ppc64-nonuma.args
View File

@ -25,4 +25,4 @@ QEMU_AUDIO_DRV=none \
-append 'root=/dev/ram rw console=ttyS0,115200' \
-usb \
-serial pty \
-device virtio-balloon-pci,id=balloon0,bus=pci,addr=0x2
-device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x2

2
tests/qemuxml2argvdata/qemuxml2argv-ppc-dtb.args
View File

@ -22,4 +22,4 @@ QEMU_AUDIO_DRV=none \
-dtb /media/ram/test.dtb \
-usb \
-serial pty \
-device virtio-balloon-pci,id=balloon0,bus=pci,addr=0x2
-device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x2

2
tests/qemuxml2argvdata/qemuxml2argv-ppc64-usb-controller-legacy.args
View File

@ -16,4 +16,4 @@ QEMU_AUDIO_DRV=none \
-monitor unix:/tmp/lib/domain--1-QEMUGuest1/monitor.sock,server,nowait \
-boot c \
-usb \
-device virtio-balloon-pci,id=balloon0,bus=pci,addr=0x6
-device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x6

4
tests/qemuxml2argvdata/qemuxml2argv-ppc64-usb-controller.args
View File

@ -15,5 +15,5 @@ QEMU_AUDIO_DRV=none \
-nodefaults \
-monitor unix:/tmp/lib/domain--1-QEMUGuest1/monitor.sock,server,nowait \
-boot c \
-device pci-ohci,id=usb,bus=pci,addr=0x1 \
-device virtio-balloon-pci,id=balloon0,bus=pci,addr=0x6
-device pci-ohci,id=usb,bus=pci.0,addr=0x1 \
-device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x6

2
tests/qemuxml2argvdata/qemuxml2argv-ppce500-serial.args
View File

@ -23,4 +23,4 @@ server,nowait \
-append 'root=/dev/ram rw console=ttyS0,115200' \
-usb \
-serial pty \
-device virtio-balloon-pci,id=balloon0,bus=pci,addr=0x2
-device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x2

2
tests/qemuxml2argvdata/qemuxml2argv-pseries-usb-default.args
View File

@ -19,6 +19,6 @@ server,nowait \
-mon chardev=charmonitor,id=monitor,mode=readline \
-no-acpi \
-boot c \
-device pci-ohci,id=usb,bus=pci,addr=0x1 \
-device pci-ohci,id=usb,bus=pci.0,addr=0x1 \
-chardev pty,id=charserial0 \
-device spapr-vty,chardev=charserial0,reg=0x30000000

2
tests/qemuxml2argvdata/qemuxml2argv-pseries-usb-kbd.args
View File

@ -19,7 +19,7 @@ server,nowait \
-mon chardev=charmonitor,id=monitor,mode=readline \
-no-acpi \
-boot c \
-device pci-ohci,id=usb,bus=pci,addr=0x1 \
-device pci-ohci,id=usb,bus=pci.0,addr=0x1 \
-chardev pty,id=charserial0 \
-device spapr-vty,chardev=charserial0,reg=0x30000000 \
-device usb-kbd,id=input0,bus=usb.0,port=1

4
tests/qemuxml2argvdata/qemuxml2argv-pseries-usb-multi.args
View File

@ -19,7 +19,7 @@ server,nowait \
-mon chardev=charmonitor,id=monitor,mode=readline \
-no-acpi \
-boot c \
-device piix3-usb-uhci,id=usb,bus=pci,addr=0x1 \
-device pci-ohci,id=usb1,bus=pci,addr=0x2 \
-device piix3-usb-uhci,id=usb,bus=pci.0,addr=0x1 \
-device pci-ohci,id=usb1,bus=pci.0,addr=0x2 \
-chardev pty,id=charserial0 \
-device spapr-vty,chardev=charserial0,reg=0x30000000

5
tests/qemuxml2argvtest.c
View File

@ -381,6 +381,11 @@ testUpdateQEMUCaps(const struct testInfo *info,
virQEMUCapsSetArch(info->qemuCaps, vm->def->os.arch);
/* We need to pretend QEMU 2.0.0 is in use so that pSeries guests
* will get the correct alias assigned to their buses.
* See virQEMUCapsHasPCIMultiBus() */
virQEMUCapsSetVersion(info->qemuCaps, 2000000);
if (testAddCPUModels(info->qemuCaps, info->skipLegacyCPUs) < 0)
goto cleanup;