External/libvirt
1
0
Fork 0
mirror of https://gitlab.com/libvirt/libvirt.git synced 2024-12-25 07:05:28 +00:00
Code Issues Packages Projects Releases Wiki Activity

qemu_hotplug: cleanup error messages in qemuDomainChangeGraphics

Browse Source 
Signed-off-by: Pavel Hrdina <phrdina@redhat.com>
This commit is contained in:
Pavel Hrdina 2016-04-25 15:36:28 +02:00
parent 39f78671ce
commit 351ee40643
1 changed files with 17 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
src/qemu/qemu_hotplug.c
View File

@ -2607,9 +2607,10 @@ qemuDomainChangeGraphics(virQEMUDriverPtr driver,
virDomainGraphicsDefPtr dev) virDomainGraphicsDefPtr dev)
{ {
virDomainGraphicsDefPtr olddev = qemuDomainFindGraphics(vm, dev); virDomainGraphicsDefPtr olddev = qemuDomainFindGraphics(vm, dev);
int ret = -1;
virQEMUDriverConfigPtr cfg = virQEMUDriverGetConfig(driver); virQEMUDriverConfigPtr cfg = virQEMUDriverGetConfig(driver);
const char *type = virDomainGraphicsTypeToString(dev->type);
size_t i; size_t i;
int ret = -1;
if (!olddev) { if (!olddev) {
virReportError(VIR_ERR_INTERNAL_ERROR, "%s", virReportError(VIR_ERR_INTERNAL_ERROR, "%s",
@ -2618,8 +2619,9 @@ qemuDomainChangeGraphics(virQEMUDriverPtr driver,
} }
if (dev->nListens != olddev->nListens) { if (dev->nListens != olddev->nListens) {
virReportError(VIR_ERR_OPERATION_UNSUPPORTED, "%s", virReportError(VIR_ERR_OPERATION_UNSUPPORTED,
_("cannot change the number of listen addresses")); _("cannot change the number of listen addresses "
"on '%s' graphics"), type);
goto cleanup; goto cleanup;
} }
@ -2628,30 +2630,31 @@ qemuDomainChangeGraphics(virQEMUDriverPtr driver,
virDomainGraphicsListenDefPtr oldlisten = &olddev->listens[i]; virDomainGraphicsListenDefPtr oldlisten = &olddev->listens[i];
if (newlisten->type != oldlisten->type) { if (newlisten->type != oldlisten->type) {
virReportError(VIR_ERR_OPERATION_UNSUPPORTED, "%s", virReportError(VIR_ERR_OPERATION_UNSUPPORTED,
_("cannot change the type of listen address")); _("cannot change the type of listen address "
"on '%s' graphics"), type);
goto cleanup; goto cleanup;
} }
switch (newlisten->type) { switch (newlisten->type) {
case VIR_DOMAIN_GRAPHICS_LISTEN_TYPE_ADDRESS: case VIR_DOMAIN_GRAPHICS_LISTEN_TYPE_ADDRESS:
if (STRNEQ_NULLABLE(newlisten->address, oldlisten->address)) { if (STRNEQ_NULLABLE(newlisten->address, oldlisten->address)) {
virReportError(VIR_ERR_OPERATION_UNSUPPORTED, "%s", virReportError(VIR_ERR_OPERATION_UNSUPPORTED,
dev->type == VIR_DOMAIN_GRAPHICS_TYPE_VNC ? _("cannot change listen address setting "
_("cannot change listen address setting on vnc graphics") : "on '%s' graphics"), type);
_("cannot change listen address setting on spice graphics"));
goto cleanup; goto cleanup;
} }
break; break;
case VIR_DOMAIN_GRAPHICS_LISTEN_TYPE_NETWORK: case VIR_DOMAIN_GRAPHICS_LISTEN_TYPE_NETWORK:
if (STRNEQ_NULLABLE(newlisten->network, oldlisten->network)) { if (STRNEQ_NULLABLE(newlisten->network, oldlisten->network)) {
virReportError(VIR_ERR_OPERATION_UNSUPPORTED, "%s", virReportError(VIR_ERR_OPERATION_UNSUPPORTED,
dev->type == VIR_DOMAIN_GRAPHICS_TYPE_VNC ? _("cannot change listen address setting "
_("cannot change listen network setting on vnc graphics") : "on '%s' graphics"), type);
_("cannot change listen network setting on spice graphics"));
goto cleanup; goto cleanup;
} }
break; break;
case VIR_DOMAIN_GRAPHICS_LISTEN_TYPE_NONE: case VIR_DOMAIN_GRAPHICS_LISTEN_TYPE_NONE:
@ -2761,8 +2764,7 @@ qemuDomainChangeGraphics(virQEMUDriverPtr driver,
default: default:
virReportError(VIR_ERR_INTERNAL_ERROR, virReportError(VIR_ERR_INTERNAL_ERROR,
_("unable to change config on '%s' graphics type"), _("unable to change config on '%s' graphics type"), type);
virDomainGraphicsTypeToString(dev->type));
break; break;
} }