smartcard: spell ccid-card-emulated qemu property correctly

Reported by Anthony Messina in
https://bugzilla.redhat.com/show_bug.cgi?id=904692
Present since introduction of smartcard support in commit f5fd9baa

* src/qemu/qemu_command.c (qemuBuildCommandLine): Match qemu spelling.
* tests/qemuxml2argvdata/qemuxml2argv-smartcard-host-certificates.args:
Fix broken test.
(cherry picked from commit 6f7e4ea359323f9bc413dfb738a5c544d4f9c4f8)

diff --git a/src/qemu/qemu_command.c b/src/qemu/qemu_command.c
index af1ff3ea136d279d8d77b62b7c352ee5427099e2..d45b76431f2e9bfe4232896a685d9e8e189838b9 100644 (file)
--- a/src/qemu/qemu_command.c
+++ b/src/qemu/qemu_command.c
@@ -5648,7 +5648,7 @@ qemuBuildCommandLine(virConnectPtr conn,
             } else {
                 database = VIR_DOMAIN_SMARTCARD_DEFAULT_DATABASE;
             }
-            virBufferAsprintf(&opt, ",database=%s", database);
+            virBufferAsprintf(&opt, ",db=%s", database);
             break;
 
         case VIR_DOMAIN_SMARTCARD_TYPE_PASSTHROUGH:

diff --git a/tests/qemuxml2argvdata/qemuxml2argv-smartcard-host-certificates.args b/tests/qemuxml2argvdata/qemuxml2argv-smartcard-host-certificates.args
index 8b4be3a6c0d120f6a9472b110ea89523dc4b9eac..b7b14c700e73340728b5167ecfc55114b5aa1326 100644 (file)
--- a/tests/qemuxml2argvdata/qemuxml2argv-smartcard-host-certificates.args
+++ b/tests/qemuxml2argvdata/qemuxml2argv-smartcard-host-certificates.args
@@ -4,5 +4,5 @@ socket,id=charmonitor,path=/tmp/test-monitor,server,nowait -mon \
 chardev=charmonitor,id=monitor,mode=readline -no-acpi -boot c -device \
 usb-ccid,id=ccid0 -usb -device \
 ccid-card-emulated,backend=certificates,cert1=cert1,cert2=cert2,cert3=cert3\
-,database=/etc/pki/nssdb,id=smartcard0,bus=ccid0.0 -device \
+,db=/etc/pki/nssdb,id=smartcard0,bus=ccid0.0 -device \
 virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x3