[libvirt] [PATCH] qemuDomainUndefineFlags: Fix error message
Jiri Denemark
jdenemar at redhat.com
Mon Dec 11 09:43:33 UTC 2017
On Mon, Dec 11, 2017 at 07:35:26 +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 at redhat.com>
> ---
> src/qemu/qemu_driver.c | 6 ++++--
> 1 file changed, 4 insertions(+), 2 deletions(-)
>
> diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c
> index aa30b119a..f2e8f3edc 100644
> --- a/src/qemu/qemu_driver.c
> +++ b/src/qemu/qemu_driver.c
> @@ -7537,8 +7537,10 @@ qemuDomainUndefineFlags(virDomainPtr dom,
> goto endjob;
> }
> } else if (!(flags & VIR_DOMAIN_UNDEFINE_KEEP_NVRAM)) {
> - virReportError(VIR_ERR_OPERATION_INVALID, "%s",
> - _("cannot delete inactive domain with nvram"));
> + virReportError(VIR_ERR_OPERATION_INVALID,
> + _("cannot delete %s domain with nvram"),
> + virDomainObjIsActive(vm) ?
> + _("active") : _("inactive"));
Very unfriendly to translations, use
if (virDomainObjIsActive(vm))
virReportError(...);
else
virReportError(...);
Jirka
More information about the libvir-list
mailing list