[libvirt] [PATCH 4/6] qemu: Fix mis-merge of qemuBuildChannelsCommandLine
Commit id '3cdcc910' misapplied a merge of commit id '019244751'
to place the "-chardev" command after formatting the character
backend value.
Signed-off-by: John Ferlan <jferlan(a)redhat.com>
---
src/qemu/qemu_command.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/src/qemu/qemu_command.c b/src/qemu/qemu_command.c
index d176526..9754693 100644
--- a/src/qemu/qemu_command.c
+++ b/src/qemu/qemu_command.c
@@ -8483,12 +8483,12 @@ qemuBuildChannelsCommandLine(virLogManagerPtr logManager,
return -1;
}
- virCommandAddArg(cmd, "-chardev");
if (!(devstr = qemuBuildChrChardevStr(logManager, cmd, def,
&channel->source,
channel->info.alias,
qemuCaps)))
return -1;
+ virCommandAddArg(cmd, "-chardev");
virCommandAddArg(cmd, devstr);
VIR_FREE(devstr);
@@ -8528,12 +8528,12 @@ qemuBuildChannelsCommandLine(virLogManagerPtr logManager,
* the newer -chardev interface. */
;
} else {
- virCommandAddArg(cmd, "-chardev");
if (!(devstr = qemuBuildChrChardevStr(logManager, cmd, def,
&channel->source,
channel->info.alias,
qemuCaps)))
return -1;
+ virCommandAddArg(cmd, "-chardev");
virCommandAddArg(cmd, devstr);
VIR_FREE(devstr);
}
--
2.5.5