]> xenbits.xensource.com Git - libvirt.git/commitdiff
smartcard: spell ccid-card-emulated qemu property correctly
authorEric Blake <eblake@redhat.com>
Mon, 1 Apr 2013 22:54:31 +0000 (16:54 -0600)
committerEric Blake <eblake@redhat.com>
Tue, 2 Apr 2013 12:23:33 +0000 (06:23 -0600)
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.

src/qemu/qemu_command.c
tests/qemuxml2argvdata/qemuxml2argv-smartcard-host-certificates.args

index 0f6a5a1e5141f1ce28abf4b328fc3e1586790931..c80218d0110c67226af213949febede3d203c67f 100644 (file)
@@ -6846,7 +6846,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:
index 8b4be3a6c0d120f6a9472b110ea89523dc4b9eac..b7b14c700e73340728b5167ecfc55114b5aa1326 100644 (file)
@@ -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