106 lines
4.0 KiB
Diff
106 lines
4.0 KiB
Diff
From 5026bff75d5f489281c7f8ae3fe2c20e7679d5d6 Mon Sep 17 00:00:00 2001
|
|
Message-Id: <5026bff75d5f489281c7f8ae3fe2c20e7679d5d6@dist-git>
|
|
From: Erik Skultety <eskultet@redhat.com>
|
|
Date: Thu, 19 Jul 2018 15:03:49 +0200
|
|
Subject: [PATCH] qemu: command: Move graphics iteration to its own function
|
|
MIME-Version: 1.0
|
|
Content-Type: text/plain; charset=UTF-8
|
|
Content-Transfer-Encoding: 8bit
|
|
|
|
It should be the command line helper who takes care of the iteration
|
|
rather than the caller.
|
|
|
|
Signed-off-by: Erik Skultety <eskultet@redhat.com>
|
|
Reviewed-by: John Ferlan <jferlan@redhat.com>
|
|
(cherry picked from commit afc107c20f6dc40529154a361222f9eca0cec94c)
|
|
|
|
https://bugzilla.redhat.com/show_bug.cgi?id=1475770
|
|
Signed-off-by: Erik Skultety <eskultet@redhat.com>
|
|
Reviewed-by: Ján Tomko <jtomko@redhat.com>
|
|
---
|
|
src/qemu/qemu_command.c | 57 ++++++++++++++++++++++++++---------------
|
|
1 file changed, 36 insertions(+), 21 deletions(-)
|
|
|
|
diff --git a/src/qemu/qemu_command.c b/src/qemu/qemu_command.c
|
|
index f38ae668a7..8a8cbfd7f6 100644
|
|
--- a/src/qemu/qemu_command.c
|
|
+++ b/src/qemu/qemu_command.c
|
|
@@ -8212,26 +8212,44 @@ qemuBuildGraphicsSPICECommandLine(virQEMUDriverConfigPtr cfg,
|
|
static int
|
|
qemuBuildGraphicsCommandLine(virQEMUDriverConfigPtr cfg,
|
|
virCommandPtr cmd,
|
|
- virQEMUCapsPtr qemuCaps,
|
|
- virDomainGraphicsDefPtr graphics)
|
|
+ virDomainDefPtr def,
|
|
+ virQEMUCapsPtr qemuCaps)
|
|
{
|
|
- switch (graphics->type) {
|
|
- case VIR_DOMAIN_GRAPHICS_TYPE_SDL:
|
|
- return qemuBuildGraphicsSDLCommandLine(cfg, cmd, qemuCaps, graphics);
|
|
+ size_t i;
|
|
|
|
- case VIR_DOMAIN_GRAPHICS_TYPE_VNC:
|
|
- return qemuBuildGraphicsVNCCommandLine(cfg, cmd, qemuCaps, graphics);
|
|
+ for (i = 0; i < def->ngraphics; i++) {
|
|
+ virDomainGraphicsDefPtr graphics = def->graphics[i];
|
|
|
|
- case VIR_DOMAIN_GRAPHICS_TYPE_SPICE:
|
|
- return qemuBuildGraphicsSPICECommandLine(cfg, cmd, qemuCaps, graphics);
|
|
+ switch (graphics->type) {
|
|
+ case VIR_DOMAIN_GRAPHICS_TYPE_SDL:
|
|
+ if (qemuBuildGraphicsSDLCommandLine(cfg, cmd,
|
|
+ qemuCaps, graphics) < 0)
|
|
+ return -1;
|
|
|
|
- case VIR_DOMAIN_GRAPHICS_TYPE_RDP:
|
|
- case VIR_DOMAIN_GRAPHICS_TYPE_DESKTOP:
|
|
- case VIR_DOMAIN_GRAPHICS_TYPE_LAST:
|
|
- virReportError(VIR_ERR_CONFIG_UNSUPPORTED,
|
|
- _("unsupported graphics type '%s'"),
|
|
- virDomainGraphicsTypeToString(graphics->type));
|
|
- return -1;
|
|
+ break;
|
|
+ case VIR_DOMAIN_GRAPHICS_TYPE_VNC:
|
|
+ if (qemuBuildGraphicsVNCCommandLine(cfg, cmd,
|
|
+ qemuCaps, graphics) < 0)
|
|
+ return -1;
|
|
+
|
|
+ break;
|
|
+ case VIR_DOMAIN_GRAPHICS_TYPE_SPICE:
|
|
+ if (qemuBuildGraphicsSPICECommandLine(cfg, cmd,
|
|
+ qemuCaps, graphics) < 0)
|
|
+ return -1;
|
|
+
|
|
+ break;
|
|
+ case VIR_DOMAIN_GRAPHICS_TYPE_RDP:
|
|
+ case VIR_DOMAIN_GRAPHICS_TYPE_DESKTOP:
|
|
+ virReportError(VIR_ERR_CONFIG_UNSUPPORTED,
|
|
+ _("unsupported graphics type '%s'"),
|
|
+ virDomainGraphicsTypeToString(graphics->type));
|
|
+ return -1;
|
|
+ case VIR_DOMAIN_GRAPHICS_TYPE_LAST:
|
|
+ default:
|
|
+ virReportEnumRangeError(virDomainGraphicsType, graphics->type);
|
|
+ return -1;
|
|
+ }
|
|
}
|
|
|
|
return 0;
|
|
@@ -10382,11 +10400,8 @@ qemuBuildCommandLine(virQEMUDriverPtr driver,
|
|
if (qemuBuildInputCommandLine(cmd, def, qemuCaps) < 0)
|
|
goto error;
|
|
|
|
- for (i = 0; i < def->ngraphics; ++i) {
|
|
- if (qemuBuildGraphicsCommandLine(cfg, cmd, qemuCaps,
|
|
- def->graphics[i]) < 0)
|
|
- goto error;
|
|
- }
|
|
+ if (qemuBuildGraphicsCommandLine(cfg, cmd, def, qemuCaps) < 0)
|
|
+ goto error;
|
|
|
|
if (qemuBuildVideoCommandLine(cmd, def, qemuCaps) < 0)
|
|
goto error;
|
|
--
|
|
2.18.0
|
|
|