External/libvirt
1
0
Fork 0
mirror of https://gitlab.com/libvirt/libvirt.git synced 2025-01-10 14:57:42 +00:00
Code Issues Packages Projects Releases Wiki Activity

qemu: Fix mis-merge of qemuBuildSmartcardCommandLine

Browse Source 
Commit id '858bafeb' misapplied a merge of commit id '019244751'
to place the "-chardev" command after formatting the character
backend value.
This commit is contained in:
John Ferlan 2016-04-04 15:19:57 -04:00
parent 17a94ba70f
commit 344bcd89eb
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/qemu/qemu_command.c
View File

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