From 2cc91ddd2d3043593172927e49762d3bab28f399 Mon Sep 17 00:00:00 2001 From: John Ferlan Date: Mon, 4 Apr 2016 15:27:58 -0400 Subject: [PATCH] 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. --- 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 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); -- GitLab