From: John Ferlan <jferlan@redhat.com>
Date: Mon, 4 Apr 2016 19:27:58 +0000 (-0400)
Subject: qemu: Fix mis-merge of qemuBuildRedirdevCommandLine
X-Git-Tag: v1.3.3~3
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=2cc91ddd2d3043593172927e49762d3bab28f399;p=thirdparty%2Flibvirt.git

qemu: Fix mis-merge of qemuBuildRedirdevCommandLine

Commit id '59e7ef3c' misapplied a merge of commit id '019244751'
to place the "-chardev" command after formatting the character
backend value.
---

diff --git a/src/qemu/qemu_command.c b/src/qemu/qemu_command.c
index 42eeef767a..9001d064ca 100644
--- a/src/qemu/qemu_command.c
+++ b/src/qemu/qemu_command.c
@@ -8723,7 +8723,6 @@ qemuBuildRedirdevCommandLine(virLogManagerPtr logManager,
         virDomainRedirdevDefPtr redirdev = def->redirdevs[i];
         char *devstr;
 
-        virCommandAddArg(cmd, "-chardev");
         if (!(devstr = qemuBuildChrChardevStr(logManager, cmd, def,
                                               &redirdev->source.chr,
                                               redirdev->info.alias,
@@ -8731,6 +8730,7 @@ qemuBuildRedirdevCommandLine(virLogManagerPtr logManager,
             return -1;
         }
 
+        virCommandAddArg(cmd, "-chardev");
         virCommandAddArg(cmd, devstr);
         VIR_FREE(devstr);