From a7a2b06702c5e04533a7c1edef02cbdc09d68835 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=A1n=20Tomko?= Date: Thu, 4 Oct 2018 18:24:53 +0200 Subject: [PATCH] tests: add smartcard-passthrough-unix MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Test CCID smartcard passthrough from a unix listen socket. Use the capabilities of QEMU 2.5.0 which did not support chardev FD passing and the latest one, which (at the time of this commit) it does. Signed-off-by: Ján Tomko --- ...artcard-passthrough-unix.x86_64-2.5.0.args | 30 +++++++++++++++++ ...rtcard-passthrough-unix.x86_64-latest.args | 33 +++++++++++++++++++ .../smartcard-passthrough-unix.xml | 19 +++++++++++ tests/qemuxml2argvtest.c | 2 ++ 4 files changed, 84 insertions(+) create mode 100644 tests/qemuxml2argvdata/smartcard-passthrough-unix.x86_64-2.5.0.args create mode 100644 tests/qemuxml2argvdata/smartcard-passthrough-unix.x86_64-latest.args create mode 100644 tests/qemuxml2argvdata/smartcard-passthrough-unix.xml diff --git a/tests/qemuxml2argvdata/smartcard-passthrough-unix.x86_64-2.5.0.args b/tests/qemuxml2argvdata/smartcard-passthrough-unix.x86_64-2.5.0.args new file mode 100644 index 0000000000..19ec438392 --- /dev/null +++ b/tests/qemuxml2argvdata/smartcard-passthrough-unix.x86_64-2.5.0.args @@ -0,0 +1,30 @@ +LC_ALL=C \ +PATH=/bin \ +HOME=/home/test \ +USER=test \ +LOGNAME=test \ +QEMU_AUDIO_DRV=none \ +/usr/bin/qemu-system-x86_64 \ +-name guest=QEMUGuest1,debug-threads=on \ +-S \ +-machine pc-i440fx-2.5,accel=kvm,usb=off,dump-guest-core=off \ +-m 214 \ +-realtime mlock=off \ +-smp 1,sockets=1,cores=1,threads=1 \ +-uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ +-display none \ +-no-user-config \ +-nodefaults \ +-chardev socket,id=charmonitor,path=/tmp/lib/domain--1-QEMUGuest1/monitor.sock,\ +server,nowait \ +-mon chardev=charmonitor,id=monitor,mode=control \ +-rtc base=utc \ +-no-shutdown \ +-no-acpi \ +-boot strict=on \ +-device piix3-usb-uhci,id=usb,bus=pci.0,addr=0x1.0x2 \ +-device usb-ccid,id=ccid0,bus=usb.0,port=1 \ +-chardev socket,id=charsmartcard0,path=/tmp/smartcard.sock,server,nowait \ +-device ccid-card-passthru,chardev=charsmartcard0,id=smartcard0,bus=ccid0.0 \ +-device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x2 \ +-msg timestamp=on diff --git a/tests/qemuxml2argvdata/smartcard-passthrough-unix.x86_64-latest.args b/tests/qemuxml2argvdata/smartcard-passthrough-unix.x86_64-latest.args new file mode 100644 index 0000000000..eaa3e0b71d --- /dev/null +++ b/tests/qemuxml2argvdata/smartcard-passthrough-unix.x86_64-latest.args @@ -0,0 +1,33 @@ +LC_ALL=C \ +PATH=/bin \ +HOME=/home/test \ +USER=test \ +LOGNAME=test \ +QEMU_AUDIO_DRV=none \ +/usr/bin/qemu-system-x86_64 \ +-name guest=QEMUGuest1,debug-threads=on \ +-S \ +-object secret,id=masterKey0,format=raw,\ +file=/tmp/lib/domain--1-QEMUGuest1/master-key.aes \ +-machine pc,accel=kvm,usb=off,dump-guest-core=off \ +-m 214 \ +-realtime mlock=off \ +-smp 1,sockets=1,cores=1,threads=1 \ +-uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ +-display none \ +-no-user-config \ +-nodefaults \ +-chardev socket,id=charmonitor,fd=1729,server,nowait \ +-mon chardev=charmonitor,id=monitor,mode=control \ +-rtc base=utc \ +-no-shutdown \ +-no-acpi \ +-boot strict=on \ +-device piix3-usb-uhci,id=usb,bus=pci.0,addr=0x1.0x2 \ +-device usb-ccid,id=ccid0,bus=usb.0,port=1 \ +-chardev socket,id=charsmartcard0,fd=1729,server,nowait \ +-device ccid-card-passthru,chardev=charsmartcard0,id=smartcard0,bus=ccid0.0 \ +-device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x2 \ +-sandbox on,obsolete=deny,elevateprivileges=deny,spawn=deny,\ +resourcecontrol=deny \ +-msg timestamp=on diff --git a/tests/qemuxml2argvdata/smartcard-passthrough-unix.xml b/tests/qemuxml2argvdata/smartcard-passthrough-unix.xml new file mode 100644 index 0000000000..054ae9128e --- /dev/null +++ b/tests/qemuxml2argvdata/smartcard-passthrough-unix.xml @@ -0,0 +1,19 @@ + + QEMUGuest1 + c7a5fdbd-edaf-9455-926a-d65c16db1809 + 219136 + 219136 + 1 + + hvm + + + + /usr/bin/qemu-system-x86_64 + + + + + + + diff --git a/tests/qemuxml2argvtest.c b/tests/qemuxml2argvtest.c index a7cde3ed7e..13a1092e10 100644 --- a/tests/qemuxml2argvtest.c +++ b/tests/qemuxml2argvtest.c @@ -1504,6 +1504,8 @@ mymain(void) QEMU_CAPS_CCID_PASSTHRU); DO_TEST("smartcard-controller", QEMU_CAPS_CCID_EMULATED); + DO_TEST_CAPS_VER("smartcard-passthrough-unix", "2.5.0"); + DO_TEST_CAPS_LATEST("smartcard-passthrough-unix"); DO_TEST("chardev-reconnect", QEMU_CAPS_CHARDEV_RECONNECT,