提交 344bcd89 编写于 作者: J John Ferlan

qemu: Fix mis-merge of qemuBuildSmartcardCommandLine

Commit id '858bafeb' misapplied a merge of commit id '01924475'
to place the "-chardev" command after formatting the character
backend value.
上级 17a94ba7
...@@ -8198,7 +8198,6 @@ qemuBuildSmartcardCommandLine(virLogManagerPtr logManager, ...@@ -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, ...@@ -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);
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册