[libvirt] [PATCH for 1.3.3 0/6] Fix a mis-merge
Details in each patch... Depending on whether I get a review before I close my eyes for the night I can push or if reviewed after than and before a release is made - I'm sure someone else can grab and push too... John Ferlan (6): qemu: Fix mis-merge of qemuBuildSmartcardCommandLine qemu: Fix mis-merge of qemuBuildSerialCommandLine qemu: Fix mis-merge of qemuBuildParallelsCommandLine qemu: Fix mis-merge of qemuBuildChannelsCommandLine qemu: Fix mis-merge of qemuBuildConsoleCommandLine qemu: Fix mis-merge of qemuBuildRedirdevCommandLine src/qemu/qemu_command.c | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) -- 2.5.5
Commit id '858bafeb' misapplied a merge of commit id '019244751' to place the "-chardev" command after formatting the character backend value. Signed-off-by: John Ferlan <jferlan@redhat.com> --- 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 2d0ca97..8236c9a 100644 --- a/src/qemu/qemu_command.c +++ b/src/qemu/qemu_command.c @@ -8198,7 +8198,6 @@ qemuBuildSmartcardCommandLine(virLogManagerPtr logManager, return -1; } - virCommandAddArg(cmd, "-chardev"); if (!(devstr = qemuBuildChrChardevStr(logManager, cmd, def, &smartcard->data.passthru, smartcard->info.alias, @@ -8206,6 +8205,7 @@ qemuBuildSmartcardCommandLine(virLogManagerPtr logManager, virBufferFreeAndReset(&opt); return -1; } + virCommandAddArg(cmd, "-chardev"); virCommandAddArg(cmd, devstr); VIR_FREE(devstr); -- 2.5.5
Commit id '5ab8640' misapplied a merge of commit id '019244751' to place the "-chardev" command after formatting the character backend value. Signed-off-by: John Ferlan <jferlan@redhat.com> --- 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 8236c9a..774ca37 100644 --- a/src/qemu/qemu_command.c +++ b/src/qemu/qemu_command.c @@ -8388,12 +8388,12 @@ qemuBuildSerialCommandLine(virLogManagerPtr logManager, /* Use -chardev with -device if they are available */ if (virQEMUCapsSupportsChardev(def, qemuCaps, serial)) { - virCommandAddArg(cmd, "-chardev"); if (!(devstr = qemuBuildChrChardevStr(logManager, cmd, def, &serial->source, serial->info.alias, qemuCaps))) return -1; + virCommandAddArg(cmd, "-chardev"); virCommandAddArg(cmd, devstr); VIR_FREE(devstr); -- 2.5.5
Commit id '0e1e7ade' misapplied a merge of commit id '019244751' to place the "-chardev" command after formatting the character backend value. Signed-off-by: John Ferlan <jferlan@redhat.com> --- 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 774ca37..d176526 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); -- 2.5.5
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@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
Commit id 'e6944a52' misapplied a merge of commit id '019244751' to place the "-chardev" command after formatting the character backend value. Signed-off-by: John Ferlan <jferlan@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 9754693..42eeef7 100644 --- a/src/qemu/qemu_command.c +++ b/src/qemu/qemu_command.c @@ -8575,12 +8575,12 @@ qemuBuildConsoleCommandLine(virLogManagerPtr logManager, return -1; } - virCommandAddArg(cmd, "-chardev"); if (!(devstr = qemuBuildChrChardevStr(logManager, cmd, def, &console->source, console->info.alias, qemuCaps))) return -1; + virCommandAddArg(cmd, "-chardev"); virCommandAddArg(cmd, devstr); VIR_FREE(devstr); @@ -8595,12 +8595,12 @@ qemuBuildConsoleCommandLine(virLogManagerPtr logManager, return -1; } - virCommandAddArg(cmd, "-chardev"); if (!(devstr = qemuBuildChrChardevStr(logManager, cmd, def, &console->source, console->info.alias, qemuCaps))) return -1; + virCommandAddArg(cmd, "-chardev"); virCommandAddArg(cmd, devstr); VIR_FREE(devstr); -- 2.5.5
Commit id '59e7ef3c' misapplied a merge of commit id '019244751' to place the "-chardev" command after formatting the character backend value. Signed-off-by: John Ferlan <jferlan@redhat.com> --- 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 42eeef7..9001d06 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); -- 2.5.5
On 04/04/2016 03:36 PM, John Ferlan wrote:
Details in each patch...
Depending on whether I get a review before I close my eyes for the night I can push or if reviewed after than and before a release is made - I'm sure someone else can grab and push too...
John Ferlan (6): qemu: Fix mis-merge of qemuBuildSmartcardCommandLine qemu: Fix mis-merge of qemuBuildSerialCommandLine qemu: Fix mis-merge of qemuBuildParallelsCommandLine qemu: Fix mis-merge of qemuBuildChannelsCommandLine qemu: Fix mis-merge of qemuBuildConsoleCommandLine qemu: Fix mis-merge of qemuBuildRedirdevCommandLine
src/qemu/qemu_command.c | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-)
ACK series. Future todo item to find a way to test the logManager/-add-fd path which would have caught this - Cole
On 04/04/2016 03:47 PM, Cole Robinson wrote:
On 04/04/2016 03:36 PM, John Ferlan wrote:
Details in each patch...
Depending on whether I get a review before I close my eyes for the night I can push or if reviewed after than and before a release is made - I'm sure someone else can grab and push too...
John Ferlan (6): qemu: Fix mis-merge of qemuBuildSmartcardCommandLine qemu: Fix mis-merge of qemuBuildSerialCommandLine qemu: Fix mis-merge of qemuBuildParallelsCommandLine qemu: Fix mis-merge of qemuBuildChannelsCommandLine qemu: Fix mis-merge of qemuBuildConsoleCommandLine qemu: Fix mis-merge of qemuBuildRedirdevCommandLine
src/qemu/qemu_command.c | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-)
ACK series. Future todo item to find a way to test the logManager/-add-fd path which would have caught this
Thanks - I just pushed, so hopefully there's nothing else that pops up to stop 1.3.3... and yes, I agree need a way to test this better. John
participants (2)
-
Cole Robinson -
John Ferlan