[libvirt] [PATCHv2] conf: Reword error message to be more universal
The error message that warns user when a request to chagne/get persistent configuration of a transient domain is requested suggests that changes are being made. Reword it to be more universal and allow it to be used for getter APIs too. Before: $ virsh vcpucount transient-domain --config error: Requested operation is not valid: cannot change persistent config of a transient domain After: $ virsh vcpucount transient-domain --config error: Requested operation is not valid: transient domains do not have any persistent config --- src/conf/domain_conf.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c index 1643f30..758f416 100644 --- a/src/conf/domain_conf.c +++ b/src/conf/domain_conf.c @@ -2251,8 +2251,8 @@ virDomainLiveConfigHelperMethod(virCapsPtr caps, if (*flags & VIR_DOMAIN_AFFECT_CONFIG) { if (!dom->persistent) { virReportError(VIR_ERR_OPERATION_INVALID, "%s", - _("cannot change persistent config of a " - "transient domain")); + _("transient domains do not have any " + "persistent config")); goto cleanup; } if (!(*persistentDef = virDomainObjGetPersistentDef(caps, xmlopt, dom))) { -- 1.8.2.1
On 19/04/13 20:25, Peter Krempa wrote:
The error message that warns user when a request to chagne/get
s/a request to chagne\/get/changing\/getting/,
persistent configuration of a transient domain is requested suggests
Otherwise, "a request ... is requested" looks a bit awkward. :-)
that changes are being made. Reword it to be more universal and allow it to be used for getter APIs too.
Before: $ virsh vcpucount transient-domain --config error: Requested operation is not valid: cannot change persistent config of a transient domain
After: $ virsh vcpucount transient-domain --config error: Requested operation is not valid: transient domains do not have any persistent config --- src/conf/domain_conf.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c index 1643f30..758f416 100644 --- a/src/conf/domain_conf.c +++ b/src/conf/domain_conf.c @@ -2251,8 +2251,8 @@ virDomainLiveConfigHelperMethod(virCapsPtr caps, if (*flags & VIR_DOMAIN_AFFECT_CONFIG) { if (!dom->persistent) { virReportError(VIR_ERR_OPERATION_INVALID, "%s", - _("cannot change persistent config of a " - "transient domain")); + _("transient domains do not have any " + "persistent config")); goto cleanup; } if (!(*persistentDef = virDomainObjGetPersistentDef(caps, xmlopt, dom))) { ACK.
On 04/19/13 16:27, Osier Yang wrote:
On 19/04/13 20:25, Peter Krempa wrote:
The error message that warns user when a request to chagne/get
s/a request to chagne\/get/changing\/getting/,
persistent configuration of a transient domain is requested suggests
Otherwise, "a request ... is requested" looks a bit awkward. :-)
that changes are being made. Reword it to be more universal and allow it to be used for getter APIs too.
Before: $ virsh vcpucount transient-domain --config error: Requested operation is not valid: cannot change persistent config of a transient domain
After: $ virsh vcpucount transient-domain --config error: Requested operation is not valid: transient domains do not have any persistent config --- src/conf/domain_conf.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c index 1643f30..758f416 100644 --- a/src/conf/domain_conf.c +++ b/src/conf/domain_conf.c @@ -2251,8 +2251,8 @@ virDomainLiveConfigHelperMethod(virCapsPtr caps, if (*flags & VIR_DOMAIN_AFFECT_CONFIG) { if (!dom->persistent) { virReportError(VIR_ERR_OPERATION_INVALID, "%s", - _("cannot change persistent config of a " - "transient domain")); + _("transient domains do not have any " + "persistent config")); goto cleanup; } if (!(*persistentDef = virDomainObjGetPersistentDef(caps, xmlopt, dom))) { ACK.
I reworded the commit message and pushed. Thanks Peter
participants (2)
-
Osier Yang -
Peter Krempa