[libvirt] [PATCH v3] qemuDomainUndefineFlags: Fix error message

https://bugzilla.redhat.com/show_bug.cgi?id=1522706 If domain is active, but the undefine API was called without the VIR_DOMAIN_UNDEFINE_KEEP_NVRAM flag set, the following incorrect error message is produced: error: Requested operation is not valid: cannot delete inactive domain with nvram Signed-off-by: Michal Privoznik <mprivozn@redhat.com> --- Diff to v2: - Drop state from the message completely src/qemu/qemu_driver.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c index aa30b119a..d18cea4d0 100644 --- a/src/qemu/qemu_driver.c +++ b/src/qemu/qemu_driver.c @@ -7538,7 +7538,7 @@ qemuDomainUndefineFlags(virDomainPtr dom, } } else if (!(flags & VIR_DOMAIN_UNDEFINE_KEEP_NVRAM)) { virReportError(VIR_ERR_OPERATION_INVALID, "%s", - _("cannot delete inactive domain with nvram")); + _("cannot delete domain with nvram")); goto endjob; } } -- 2.13.6

On Mon, Dec 11, 2017 at 12:55:32 +0100, Michal Privoznik wrote:
https://bugzilla.redhat.com/show_bug.cgi?id=1522706
If domain is active, but the undefine API was called without the VIR_DOMAIN_UNDEFINE_KEEP_NVRAM flag set, the following incorrect error message is produced:
error: Requested operation is not valid: cannot delete inactive domain with nvram
Signed-off-by: Michal Privoznik <mprivozn@redhat.com> ---
Diff to v2: - Drop state from the message completely
src/qemu/qemu_driver.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c index aa30b119a..d18cea4d0 100644 --- a/src/qemu/qemu_driver.c +++ b/src/qemu/qemu_driver.c @@ -7538,7 +7538,7 @@ qemuDomainUndefineFlags(virDomainPtr dom, } } else if (!(flags & VIR_DOMAIN_UNDEFINE_KEEP_NVRAM)) { virReportError(VIR_ERR_OPERATION_INVALID, "%s", - _("cannot delete inactive domain with nvram")); + _("cannot delete domain with nvram")); goto endjob; } }
ACK if s/delete/undefine/ as suggested in my reply to v2. Jirka
participants (2)
-
Jiri Denemark
-
Michal Privoznik