From a1f7faa40216284d9d53dcbd9a18e36a8764d4a0 Mon Sep 17 00:00:00 2001 From: Peter Krempa Date: Tue, 21 Nov 2023 09:42:16 +0100 Subject: [PATCH] qemu: validate: Reword error message when CCW addresses are not supported for a machine MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit Reword the error message to clearly state that the machine type doesn't support the address type. It doesn't matter which device it's for. Additionally the alias may be still NULL at the point when the error is being reported misleading users that they have something wrong with a specific device. Resolves: https://issues.redhat.com/browse/RHEL-16878 Signed-off-by: Peter Krempa Reviewed-by: Ján Tomko Reviewed-by: Boris Fiuczynski --- src/qemu/qemu_validate.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/qemu/qemu_validate.c b/src/qemu/qemu_validate.c index 93df9e4c8e..2afd7e128a 100644 --- a/src/qemu/qemu_validate.c +++ b/src/qemu/qemu_validate.c @@ -1512,8 +1512,8 @@ qemuValidateDomainDeviceDefAddress(const virDomainDeviceDef *dev, case VIR_DOMAIN_DEVICE_ADDRESS_TYPE_CCW: if (!qemuDomainIsS390CCW(def)) { virReportError(VIR_ERR_CONFIG_UNSUPPORTED, - _("cannot use CCW address type for device '%1$s' using machine type '%2$s'"), - NULLSTR(info->alias), def->os.machine); + _("CCW addresses are not supported by machine type '%1$s'"), + def->os.machine); return -1; } -- 2.39.5