From 6a97e35f827031daecd3258d72fa1d26a9c945e5 Mon Sep 17 00:00:00 2001 From: John Ferlan Date: Mon, 4 Apr 2016 15:23:07 -0400 Subject: [PATCH] qemu: Fix mis-merge of qemuBuildParallelsCommandLine Commit id '0e1e7ade' misapplied a merge of commit id '019244751' to place the "-chardev" command after formatting the character backend value. --- src/qemu/qemu_command.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/qemu/qemu_command.c b/src/qemu/qemu_command.c index 774ca37dc5..d176526031 100644 --- a/src/qemu/qemu_command.c +++ b/src/qemu/qemu_command.c @@ -8436,12 +8436,12 @@ qemuBuildParallelsCommandLine(virLogManagerPtr logManager, /* Use -chardev with -device if they are available */ if (virQEMUCapsGet(qemuCaps, QEMU_CAPS_CHARDEV) && virQEMUCapsGet(qemuCaps, QEMU_CAPS_DEVICE)) { - virCommandAddArg(cmd, "-chardev"); if (!(devstr = qemuBuildChrChardevStr(logManager, cmd, def, ¶llel->source, parallel->info.alias, qemuCaps))) return -1; + virCommandAddArg(cmd, "-chardev"); virCommandAddArg(cmd, devstr); VIR_FREE(devstr); -- GitLab