External/libvirt
1
0
Fork 0
mirror of https://gitlab.com/libvirt/libvirt.git synced 2025-02-12 14:41:29 +00:00
Code Issues Packages Projects Releases Wiki Activity

don't mention disk controllers in generic controller errors

Browse Source 
The controller element supports non-disk controller types too.

https://bugzilla.redhat.com/show_bug.cgi?id=960958
(cherry picked from commit c075f89fa291478e5244d64cf528ca3e80705d26)
This commit is contained in:
Ján Tomko 2013-05-09 11:39:21 +02:00
parent ebd29c6b1b
commit 107ca3631c
3 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/conf/domain_conf.c
View File

@ -12026,7 +12026,7 @@ virDomainDefCheckABIStability(virDomainDefPtr src,
if (src->ncontrollers != dst->ncontrollers) { if (src->ncontrollers != dst->ncontrollers) {
virReportError(VIR_ERR_CONFIG_UNSUPPORTED, virReportError(VIR_ERR_CONFIG_UNSUPPORTED,
_("Target domain disk controller count %zu " _("Target domain controller count %zu "
"does not match source %zu"), "does not match source %zu"),
dst->ncontrollers, src->ncontrollers); dst->ncontrollers, src->ncontrollers);
return false; return false;

4
src/qemu/qemu_driver.c
View File

@ -5861,7 +5861,7 @@ qemuDomainAttachDeviceControllerLive(virQEMUDriverPtr driver,
break; break;
default: default:
virReportError(VIR_ERR_CONFIG_UNSUPPORTED, virReportError(VIR_ERR_CONFIG_UNSUPPORTED,
_("disk controller bus '%s' cannot be hotplugged."), _("'%s' controller cannot be hotplugged."),
virDomainControllerTypeToString(cont->type)); virDomainControllerTypeToString(cont->type));
break; break;
} }
@ -5976,7 +5976,7 @@ qemuDomainDetachDeviceControllerLive(virQEMUDriverPtr driver,
break; break;
default : default :
virReportError(VIR_ERR_CONFIG_UNSUPPORTED, virReportError(VIR_ERR_CONFIG_UNSUPPORTED,
_("disk controller bus '%s' cannot be hotunplugged."), _("'%s' controller cannot be hotunplugged."),
virDomainControllerTypeToString(cont->type)); virDomainControllerTypeToString(cont->type));
} }
return ret; return ret;

2
src/qemu/qemu_hotplug.c
View File

@ -2301,7 +2301,7 @@ int qemuDomainDetachPciControllerDevice(virQEMUDriverPtr driver,
dev->data.controller->type, dev->data.controller->type,
dev->data.controller->idx)) < 0) { dev->data.controller->idx)) < 0) {
virReportError(VIR_ERR_OPERATION_FAILED, virReportError(VIR_ERR_OPERATION_FAILED,
_("disk controller %s:%d not found"), _("controller %s:%d not found"),
virDomainControllerTypeToString(dev->data.controller->type), virDomainControllerTypeToString(dev->data.controller->type),
dev->data.controller->idx); dev->data.controller->idx);
goto cleanup; goto cleanup;