[PATCH 12/24] qemuBuildConsoleCommandLine: Remove identical code

Peter Krempa pkrempa at redhat.com
Thu Dec 9 12:30:47 UTC 2021


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

Signed-off-by: Peter Krempa <pkrempa at redhat.com>
---
 src/qemu/qemu_command.c | 28 ----------------------------
 1 file changed, 28 deletions(-)

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,
-- 
2.31.1




More information about the libvir-list mailing list