[libvirt] [PATCH] don't mention disk controllers in generic controller errors

The controller element supports non-disk controller types too. https://bugzilla.redhat.com/show_bug.cgi?id=960958 --- src/conf/domain_conf.c | 2 +- src/qemu/qemu_driver.c | 4 ++-- src/qemu/qemu_hotplug.c | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c index d55ce6b..6b71727 100644 --- a/src/conf/domain_conf.c +++ b/src/conf/domain_conf.c @@ -12667,7 +12667,7 @@ virDomainDefCheckABIStability(virDomainDefPtr src, if (src->ncontrollers != dst->ncontrollers) { virReportError(VIR_ERR_CONFIG_UNSUPPORTED, - _("Target domain disk controller count %zu " + _("Target domain controller count %zu " "does not match source %zu"), dst->ncontrollers, src->ncontrollers); return false; diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c index 5005afa..6a23573 100644 --- a/src/qemu/qemu_driver.c +++ b/src/qemu/qemu_driver.c @@ -5808,7 +5808,7 @@ qemuDomainAttachDeviceControllerLive(virQEMUDriverPtr driver, break; default: virReportError(VIR_ERR_CONFIG_UNSUPPORTED, - _("disk controller bus '%s' cannot be hotplugged."), + _("'%s' controller cannot be hotplugged."), virDomainControllerTypeToString(cont->type)); break; } @@ -5923,7 +5923,7 @@ qemuDomainDetachDeviceControllerLive(virQEMUDriverPtr driver, break; default : virReportError(VIR_ERR_CONFIG_UNSUPPORTED, - _("disk controller bus '%s' cannot be hotunplugged."), + _("'%s' controller cannot be hotunplugged."), virDomainControllerTypeToString(cont->type)); } return ret; diff --git a/src/qemu/qemu_hotplug.c b/src/qemu/qemu_hotplug.c index a4f48b0..4d8ac52 100644 --- a/src/qemu/qemu_hotplug.c +++ b/src/qemu/qemu_hotplug.c @@ -2273,7 +2273,7 @@ int qemuDomainDetachPciControllerDevice(virQEMUDriverPtr driver, dev->data.controller->type, dev->data.controller->idx)) < 0) { virReportError(VIR_ERR_OPERATION_FAILED, - _("disk controller %s:%d not found"), + _("controller %s:%d not found"), virDomainControllerTypeToString(dev->data.controller->type), dev->data.controller->idx); goto cleanup; -- 1.8.1.5