]> xenbits.xensource.com Git - libvirt.git/commitdiff
qemu: Fix mis-merge of qemuBuildSmartcardCommandLine
authorJohn Ferlan <jferlan@redhat.com>
Mon, 4 Apr 2016 19:19:57 +0000 (15:19 -0400)
committerJohn Ferlan <jferlan@redhat.com>
Mon, 4 Apr 2016 19:19:57 +0000 (15:19 -0400)
Commit id '858bafeb' misapplied a merge of commit id '019244751'
to place the "-chardev" command after formatting the character
backend value.

src/qemu/qemu_command.c

index 2d0ca97caf9ebe3b908f1b3c147b7efd67e68d75..8236c9a32aef046d38f42a4b21aa7cdf4aac617a 100644 (file)
@@ -8198,7 +8198,6 @@ qemuBuildSmartcardCommandLine(virLogManagerPtr logManager,
             return -1;
         }
 
-        virCommandAddArg(cmd, "-chardev");
         if (!(devstr = qemuBuildChrChardevStr(logManager, cmd, def,
                                               &smartcard->data.passthru,
                                               smartcard->info.alias,
@@ -8206,6 +8205,7 @@ qemuBuildSmartcardCommandLine(virLogManagerPtr logManager,
             virBufferFreeAndReset(&opt);
             return -1;
         }
+        virCommandAddArg(cmd, "-chardev");
         virCommandAddArg(cmd, devstr);
         VIR_FREE(devstr);