shaba/libvirt
1
0
Fork 0
mirror of https://gitlab.com/libvirt/libvirt.git synced 2024-12-23 21:34:54 +03:00
Code Releases Activity

qemu: format CCID controllers after USB hubs

Browse Source 
Since they go on the USB bus, format them after USB hubs.

https://bugzilla.redhat.com/show_bug.cgi?id=1375402

Signed-off-by: Ján Tomko <jtomko@redhat.com>
Reviewed-by: Cole Robinson <crobinso@redhat.com>
This commit is contained in:
Ján Tomko 2019-01-15 16:50:22 +01:00
parent 421e0eeec7
commit c7e03df8c0
11 changed files with 17 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/qemu/qemu_command.c
View File

@ -3225,6 +3225,9 @@ qemuBuildControllerDevCommandLine(virCommandPtr cmd,
* one. Likewise, we don't do anything for the primary IDE
* controller on an i440fx machine or primary SATA on q35, but
* we do add those beyond these two exceptions.
*
* CCID controllers are formatted separately after USB hubs,
* because they go on the USB bus.
*/
VIR_DOMAIN_CONTROLLER_TYPE_PCI,
VIR_DOMAIN_CONTROLLER_TYPE_USB,
@ -3232,7 +3235,6 @@ qemuBuildControllerDevCommandLine(virCommandPtr cmd,
VIR_DOMAIN_CONTROLLER_TYPE_IDE,
VIR_DOMAIN_CONTROLLER_TYPE_SATA,
VIR_DOMAIN_CONTROLLER_TYPE_VIRTIO_SERIAL,
VIR_DOMAIN_CONTROLLER_TYPE_CCID,
};
int ret = -1;
@ -10629,6 +10631,10 @@ qemuBuildCommandLine(virQEMUDriverPtr driver,
if (qemuBuildHubCommandLine(cmd, def, qemuCaps) < 0)
goto error;
if (qemuBuildControllersByTypeCommandLine(cmd, def, qemuCaps,
VIR_DOMAIN_CONTROLLER_TYPE_CCID) < 0)
goto error;
if (qemuBuildDisksCommandLine(cmd, def, qemuCaps) < 0)
goto error;

2
tests/qemuxml2argvdata/chardev-reconnect.args
View File

@ -22,8 +22,8 @@ server,nowait \
-no-acpi \
-device virtio-serial-pci,id=virtio-serial1,bus=pci.0,addr=0xa \
-device virtio-serial-pci,id=virtio-serial0,bus=pci.0,addr=0x3 \
-device usb-ccid,id=ccid0,bus=usb.0,port=1 \
-usb \
-device usb-ccid,id=ccid0,bus=usb.0,port=1 \
-chardev socket,id=charsmartcard0,path=/tmp/channel/asdf,reconnect=20 \
-device ccid-card-passthru,chardev=charsmartcard0,id=smartcard0,bus=ccid0.0 \
-chardev socket,id=charchannel0,host=localhost,port=1234,reconnect=10 \

2
tests/qemuxml2argvdata/controller-order.args
View File

@ -21,8 +21,8 @@ nowait \
-boot menu=off \
-device piix3-usb-uhci,id=usb,bus=pci.0,addr=0x1.0x2 \
-device virtio-serial-pci,id=virtio-serial0,bus=pci.0,addr=0x7 \
-device usb-ccid,id=ccid0,bus=usb.0,port=1.1 \
-device usb-hub,id=hub0,bus=usb.0,port=1 \
-device usb-ccid,id=ccid0,bus=usb.0,port=1.1 \
-drive file=/tmp/fdr.img,format=raw,if=none,id=drive-virtio-disk0,cache=none,\
aio=native \
-device virtio-blk-pci,bus=pci.0,addr=0x5,drive=drive-virtio-disk0,\

2
tests/qemuxml2argvdata/name-escape.args
View File

@ -22,8 +22,8 @@ bar=2/monitor.sock,server,nowait \
-no-shutdown \
-no-acpi \
-device virtio-scsi-pci,id=scsi0,bus=pci.0,addr=0x3 \
-device usb-ccid,id=ccid0,bus=usb.0,port=1 \
-usb \
-device usb-ccid,id=ccid0,bus=usb.0,port=1 \
-drive file=/dev/HostVG/QEMUGuest1,format=qcow2,if=none,id=drive-ide0-0-0,\
cache=none,throttling.bps-total=5000,throttling.iops-total=6000,\
throttling.bps-total-max=10000,throttling.iops-total-max=11000,\

2
tests/qemuxml2argvdata/smartcard-controller.args
View File

@ -20,7 +20,7 @@ server,nowait \
-rtc base=utc \
-no-shutdown \
-no-acpi \
-device usb-ccid,id=ccid0,bus=usb.0,port=1 \
-usb \
-device usb-ccid,id=ccid0,bus=usb.0,port=1 \
-device ccid-card-emulated,backend=nss-emulated,id=smartcard0,bus=ccid0.0 \
-device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x3

2
tests/qemuxml2argvdata/smartcard-host-certificates-database.args
View File

@ -20,8 +20,8 @@ server,nowait \
-rtc base=utc \
-no-shutdown \
-no-acpi \
-device usb-ccid,id=ccid0,bus=usb.0,port=1 \
-usb \
-device usb-ccid,id=ccid0,bus=usb.0,port=1 \
-device ccid-card-emulated,backend=certificates,cert1=cert1,cert2=cert2,\
cert3=cert3,db=/tmp/foo,id=smartcard0,bus=ccid0.0 \
-device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x3

2
tests/qemuxml2argvdata/smartcard-host-certificates.args
View File

@ -20,8 +20,8 @@ server,nowait \
-rtc base=utc \
-no-shutdown \
-no-acpi \
-device usb-ccid,id=ccid0,bus=usb.0,port=1 \
-usb \
-device usb-ccid,id=ccid0,bus=usb.0,port=1 \
-device ccid-card-emulated,backend=certificates,cert1=cert1,cert2=cert2,\
cert3=cert3,db=/etc/pki/nssdb,id=smartcard0,bus=ccid0.0 \
-device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x3

2
tests/qemuxml2argvdata/smartcard-host.args
View File

@ -20,7 +20,7 @@ server,nowait \
-rtc base=utc \
-no-shutdown \
-no-acpi \
-device usb-ccid,id=ccid0,bus=usb.0,port=1 \
-usb \
-device usb-ccid,id=ccid0,bus=usb.0,port=1 \
-device ccid-card-emulated,backend=nss-emulated,id=smartcard0,bus=ccid0.0 \
-device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x3

2
tests/qemuxml2argvdata/smartcard-passthrough-spicevmc.args
View File

@ -20,8 +20,8 @@ server,nowait \
-rtc base=utc \
-no-shutdown \
-no-acpi \
-device usb-ccid,id=ccid0,bus=usb.0,port=1 \
-usb \
-device usb-ccid,id=ccid0,bus=usb.0,port=1 \
-chardev spicevmc,id=charsmartcard0,name=smartcard \
-device ccid-card-passthru,chardev=charsmartcard0,id=smartcard0,bus=ccid0.0 \
-device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x3

2
tests/qemuxml2argvdata/smartcard-passthrough-tcp.args
View File

@ -20,8 +20,8 @@ server,nowait \
-rtc base=utc \
-no-shutdown \
-no-acpi \
-device usb-ccid,id=ccid0,bus=usb.0,port=1 \
-usb \
-device usb-ccid,id=ccid0,bus=usb.0,port=1 \
-chardev socket,id=charsmartcard0,host=127.0.0.1,port=2001,server,nowait \
-device ccid-card-passthru,chardev=charsmartcard0,id=smartcard0,bus=ccid0.0 \
-device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x3

2
tests/qemuxml2argvdata/user-aliases.args
View File

@ -35,9 +35,9 @@ server,nowait \
-global PIIX4_PM.disable_s3=0 \
-global PIIX4_PM.disable_s4=0 \
-device virtio-serial-pci,id=virtio-serial0,bus=pci.0,addr=0x8 \
-usb \
-device usb-ccid,id=ua-myCCID,bus=ua-SomeWeirdController.0,port=1 \
-device usb-ccid,id=ua-myCCID2,bus=ua-SomeWeirdController.0,port=2 \
-usb \
-drive file=/var/lib/libvirt/images/fd.img,format=raw,if=none,\
id=drive-ua-myDisk1,cache=none \
-drive file=/var/lib/libvirt/images/gentoo.qcow2,format=qcow2,if=none,\