External/libvirt
1
0
Fork 0
mirror of https://gitlab.com/libvirt/libvirt.git synced 2024-12-24 14:45:24 +00:00
Code Issues Packages Projects Releases Wiki Activity

qemu_command: refactor spice channel code

Browse Source 
This prepares the code for other listen types.

Signed-off-by: Pavel Hrdina <phrdina@redhat.com>
This commit is contained in:
Pavel Hrdina 2016-05-18 12:39:34 +02:00
parent 0f6db3a44d
commit 2c8e75554b
1 changed files with 30 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

61
src/qemu/qemu_command.c
View File

@ -7474,10 +7474,11 @@ qemuBuildGraphicsSPICECommandLine(virQEMUDriverConfigPtr cfg,
{ {
virBuffer opt = VIR_BUFFER_INITIALIZER; virBuffer opt = VIR_BUFFER_INITIALIZER;
virDomainGraphicsListenDefPtr glisten = NULL; virDomainGraphicsListenDefPtr glisten = NULL;
int defaultMode = graphics->data.spice.defaultMode;
int port = graphics->data.spice.port; int port = graphics->data.spice.port;
int tlsPort = graphics->data.spice.tlsPort; int tlsPort = graphics->data.spice.tlsPort;
size_t i; size_t i;
bool hasSecure = false;
bool hasInsecure = false;
if (!virQEMUCapsGet(qemuCaps, QEMU_CAPS_SPICE)) { if (!virQEMUCapsGet(qemuCaps, QEMU_CAPS_SPICE)) {
virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s", virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s",
@ -7487,8 +7488,10 @@ qemuBuildGraphicsSPICECommandLine(virQEMUDriverConfigPtr cfg,
glisten = virDomainGraphicsGetListen(graphics, 0); glisten = virDomainGraphicsGetListen(graphics, 0);
if (port > 0) if (port > 0) {
virBufferAsprintf(&opt, "port=%u,", port); virBufferAsprintf(&opt, "port=%u,", port);
hasInsecure = true;
}
if (tlsPort > 0) { if (tlsPort > 0) {
if (!cfg->spiceTLS) { if (!cfg->spiceTLS) {
@ -7498,6 +7501,7 @@ qemuBuildGraphicsSPICECommandLine(virQEMUDriverConfigPtr cfg,
goto error; goto error;
} }
virBufferAsprintf(&opt, "tls-port=%u,", tlsPort); virBufferAsprintf(&opt, "tls-port=%u,", tlsPort);
hasSecure = true;
} }
if (port > 0 || tlsPort > 0) { if (port > 0 || tlsPort > 0) {
@ -7535,17 +7539,32 @@ qemuBuildGraphicsSPICECommandLine(virQEMUDriverConfigPtr cfg,
!cfg->spicePassword) !cfg->spicePassword)
virBufferAddLit(&opt, "disable-ticketing,"); virBufferAddLit(&opt, "disable-ticketing,");
if (tlsPort > 0) if (hasSecure)
virBufferAsprintf(&opt, "x509-dir=%s,", cfg->spiceTLSx509certdir); virBufferAsprintf(&opt, "x509-dir=%s,", cfg->spiceTLSx509certdir);
switch (defaultMode) { switch (graphics->data.spice.defaultMode) {
case VIR_DOMAIN_GRAPHICS_SPICE_CHANNEL_MODE_SECURE: case VIR_DOMAIN_GRAPHICS_SPICE_CHANNEL_MODE_SECURE:
if (!hasSecure) {
virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s",
_("spice defaultMode secure requested in XML "
"configuration, but TLS connection is not "
"available"));
goto error;
}
virBufferAddLit(&opt, "tls-channel=default,"); virBufferAddLit(&opt, "tls-channel=default,");
break; break;
case VIR_DOMAIN_GRAPHICS_SPICE_CHANNEL_MODE_INSECURE: case VIR_DOMAIN_GRAPHICS_SPICE_CHANNEL_MODE_INSECURE:
if (!hasInsecure) {
virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s",
_("spice defaultMode insecure requested in XML "
"configuration, but plaintext connection is not "
"available"));
goto error;
}
virBufferAddLit(&opt, "plaintext-channel=default,"); virBufferAddLit(&opt, "plaintext-channel=default,");
break; break;
case VIR_DOMAIN_GRAPHICS_SPICE_CHANNEL_MODE_ANY: case VIR_DOMAIN_GRAPHICS_SPICE_CHANNEL_MODE_ANY:
case VIR_DOMAIN_GRAPHICS_SPICE_CHANNEL_MODE_LAST:
/* nothing */ /* nothing */
break; break;
} }
@ -7553,10 +7572,11 @@ qemuBuildGraphicsSPICECommandLine(virQEMUDriverConfigPtr cfg,
for (i = 0; i < VIR_DOMAIN_GRAPHICS_SPICE_CHANNEL_LAST; i++) { for (i = 0; i < VIR_DOMAIN_GRAPHICS_SPICE_CHANNEL_LAST; i++) {
switch (graphics->data.spice.channels[i]) { switch (graphics->data.spice.channels[i]) {
case VIR_DOMAIN_GRAPHICS_SPICE_CHANNEL_MODE_SECURE: case VIR_DOMAIN_GRAPHICS_SPICE_CHANNEL_MODE_SECURE:
if (tlsPort <= 0) { if (!hasSecure) {
virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s", virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s",
_("spice secure channels set in XML configuration, " _("spice secure channels set in XML "
"but TLS port is not provided")); "configuration, but TLS connection is not "
"available"));
goto error; goto error;
} }
virBufferAsprintf(&opt, "tls-channel=%s,", virBufferAsprintf(&opt, "tls-channel=%s,",
@ -7564,10 +7584,11 @@ qemuBuildGraphicsSPICECommandLine(virQEMUDriverConfigPtr cfg,
break; break;
case VIR_DOMAIN_GRAPHICS_SPICE_CHANNEL_MODE_INSECURE: case VIR_DOMAIN_GRAPHICS_SPICE_CHANNEL_MODE_INSECURE:
if (port <= 0) { if (!hasInsecure) {
virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s", virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s",
_("spice insecure channels set in XML " _("spice insecure channels set in XML "
"configuration, but plain port is not provided")); "configuration, but plaintext connection "
"is not available"));
goto error; goto error;
} }
virBufferAsprintf(&opt, "plaintext-channel=%s,", virBufferAsprintf(&opt, "plaintext-channel=%s,",
@ -7575,29 +7596,7 @@ qemuBuildGraphicsSPICECommandLine(virQEMUDriverConfigPtr cfg,
break; break;
case VIR_DOMAIN_GRAPHICS_SPICE_CHANNEL_MODE_ANY: case VIR_DOMAIN_GRAPHICS_SPICE_CHANNEL_MODE_ANY:
switch (defaultMode) {
case VIR_DOMAIN_GRAPHICS_SPICE_CHANNEL_MODE_SECURE:
if (tlsPort <= 0) {
virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s",
_("spice defaultMode secure requested in XML "
"configuration but TLS port not provided"));
goto error;
}
break;
case VIR_DOMAIN_GRAPHICS_SPICE_CHANNEL_MODE_INSECURE:
if (port <= 0) {
virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s",
_("spice defaultMode insecure requested in XML "
"configuration but plain port not provided"));
goto error;
}
break;
case VIR_DOMAIN_GRAPHICS_SPICE_CHANNEL_MODE_ANY:
/* don't care */
break; break;
}
} }
} }