From: Peter Krempa <pkrempa@redhat.com>
Date: Thu, 4 Nov 2021 13:12:05 +0000 (+0100)
Subject: qemuBuildConsoleCommandLine: Remove identical code
X-Git-Tag: v8.0.0-rc1~281
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=dc3f02561713eebc58d2ee138308683f9d3248e9;p=thirdparty%2Flibvirt.git

qemuBuildConsoleCommandLine: Remove identical code

Unify the cases for SCLP/SCLPLM/VIRTIO consoles as the code is
identical.

Signed-off-by: Peter Krempa <pkrempa@redhat.com>
Reviewed-by: Ján Tomko <jtomko@redhat.com>
---

diff --git a/src/qemu/qemu_command.c b/src/qemu/qemu_command.c
index 5c2b8d65fd..fb4535e889 100644
--- a/src/qemu/qemu_command.c
+++ b/src/qemu/qemu_command.c
@@ -9513,35 +9513,7 @@ qemuBuildConsoleCommandLine(virCommand *cmd,
 
         switch (console->targetType) {
         case VIR_DOMAIN_CHR_CONSOLE_TARGET_TYPE_SCLP:
-            if (!(devstr = qemuBuildChrChardevStr(cmd,
-                                                  cfg,
-                                                  console->source,
-                                                  console->info.alias,
-                                                  qemuCaps)))
-                return -1;
-            virCommandAddArg(cmd, "-chardev");
-            virCommandAddArg(cmd, devstr);
-            VIR_FREE(devstr);
-
-            if (qemuBuildChrDeviceCommandLine(cmd, def, console, qemuCaps) < 0)
-                return -1;
-            break;
-
         case VIR_DOMAIN_CHR_CONSOLE_TARGET_TYPE_SCLPLM:
-            if (!(devstr = qemuBuildChrChardevStr(cmd,
-                                                  cfg,
-                                                  console->source,
-                                                  console->info.alias,
-                                                  qemuCaps)))
-                return -1;
-            virCommandAddArg(cmd, "-chardev");
-            virCommandAddArg(cmd, devstr);
-            VIR_FREE(devstr);
-
-            if (qemuBuildChrDeviceCommandLine(cmd, def, console, qemuCaps) < 0)
-                return -1;
-            break;
-
         case VIR_DOMAIN_CHR_CONSOLE_TARGET_TYPE_VIRTIO:
             if (!(devstr = qemuBuildChrChardevStr(cmd,
                                                   cfg,