[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH 07/20] qdev: Stop using error_set_from_qdev_prop_error() for css
From: |
Eduardo Habkost |
Subject: |
[PATCH 07/20] qdev: Stop using error_set_from_qdev_prop_error() for css devno property |
Date: |
Fri, 30 Oct 2020 16:21:18 -0400 |
Just setting a reasonable error string using error_setg() is
simpler and makes error messages clearer.
Before:
$ qemu-system-s390x -device x-terminal3270,devno=x
qemu-system-s390x: -device x-terminal3270,devno=x: Property
'x-terminal3270.devno' doesn't take value 'x'
After:
$ qemu-system-s390x -device x-terminal3270,devno=x
qemu-system-s390x: -device x-terminal3270,devno=x: Property
'x-terminal3270.devno' can't take value 'x': invalid devno
Signed-off-by: Eduardo Habkost <ehabkost@redhat.com>
---
Cc: Cornelia Huck <cohuck@redhat.com>
Cc: Thomas Huth <thuth@redhat.com>
Cc: Richard Henderson <rth@twiddle.net>
Cc: David Hildenbrand <david@redhat.com>
Cc: Halil Pasic <pasic@linux.ibm.com>
Cc: Christian Borntraeger <borntraeger@de.ibm.com>
Cc: qemu-s390x@nongnu.org
Cc: qemu-devel@nongnu.org
---
hw/s390x/css.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/hw/s390x/css.c b/hw/s390x/css.c
index c8e7ce232a..ad631bad29 100644
--- a/hw/s390x/css.c
+++ b/hw/s390x/css.c
@@ -2384,7 +2384,7 @@ static void set_css_devid(Object *obj, Visitor *v, const
char *name,
num = sscanf(str, "%2x.%1x%n.%4x%n", &cssid, &ssid, &n1, &devid, &n2);
if (num != 3 || (n2 - n1) != 5 || strlen(str) != n2) {
- error_set_from_qdev_prop_error(errp, EINVAL, obj, prop, str);
+ error_setg(errp, "invalid devno");
goto out;
}
if ((cssid > MAX_CSSID) || (ssid > MAX_SSID)) {
--
2.28.0
- [PATCH 00/20] qdev/qom: Remove explicit type names from error_setg() calls, Eduardo Habkost, 2020/10/30
- [PATCH 01/20] qom: Add prefix to error message inside object_property_parse(), Eduardo Habkost, 2020/10/30
- [PATCH 03/20] qdev: Stop using error_set_from_qdev_prop_error() for audiodev property, Eduardo Habkost, 2020/10/30
- [PATCH 02/20] qdev: Stop using error_set_from_qdev_prop_error() for netdev property, Eduardo Habkost, 2020/10/30
- [PATCH 04/20] qdev: Stop using error_set_from_qdev_prop_error() for mac property, Eduardo Habkost, 2020/10/30
- [PATCH 05/20] qdev: Stop using error_set_from_qdev_prop_error() for devfn property, Eduardo Habkost, 2020/10/30
- [PATCH 06/20] qdev: Stop using error_set_from_qdev_prop_error() for PCI host device property, Eduardo Habkost, 2020/10/30
- [PATCH 08/20] qdev: Delete unused error_set_from_qdev_prop_error() function, Eduardo Habkost, 2020/10/30
- [PATCH 07/20] qdev: Stop using error_set_from_qdev_prop_error() for css devno property,
Eduardo Habkost <=
- [PATCH 09/20] cryptodev: Remove unnecessary prefix from error message, Eduardo Habkost, 2020/10/30
- [PATCH 10/20] memfd: Remove unnecessary prefix from error message, Eduardo Habkost, 2020/10/30
- [PATCH 11/20] tpm_util: Remove unnecessary prefix from error message, Eduardo Habkost, 2020/10/30
- [PATCH 13/20] qdev: chardev: Remove unnecessary prefix from error message, Eduardo Habkost, 2020/10/30
- [PATCH 14/20] i386: Remove unnecessary prefix from error message, Eduardo Habkost, 2020/10/30
- [PATCH 16/20] nvdimm: Remove unnecessary prefix from error message, Eduardo Habkost, 2020/10/30
- [PATCH 12/20] qdev: drive: Remove unnecessary prefix from error message, Eduardo Habkost, 2020/10/30
- [PATCH 15/20] qerror: Delete unused QERR_PROPERTY_VALUE_BAD macro, Eduardo Habkost, 2020/10/30
- [PATCH 17/20] colo-compare: Remove unnecessary prefix from error message, Eduardo Habkost, 2020/10/30
- [PATCH 18/20] filter-dump: Remove unnecessary prefix from error message, Eduardo Habkost, 2020/10/30