qemu-devel.nongnu.org archive mirror
 help / color / mirror / Atom feed
From: Eduardo Habkost <ehabkost@redhat.com>
To: qemu-devel@nongnu.org
Cc: Thomas Huth <thuth@redhat.com>,
	David Hildenbrand <david@redhat.com>,
	Cornelia Huck <cohuck@redhat.com>,
	Markus Armbruster <armbru@redhat.com>,
	Halil Pasic <pasic@linux.ibm.com>,
	Christian Borntraeger <borntraeger@de.ibm.com>,
	qemu-s390x@nongnu.org, Richard Henderson <rth@twiddle.net>
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	[thread overview]
Message-ID: <20201030202131.796967-8-ehabkost@redhat.com> (raw)
In-Reply-To: <20201030202131.796967-1-ehabkost@redhat.com>

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



  parent reply	other threads:[~2020-10-30 20:31 UTC|newest]

Thread overview: 25+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2020-10-30 20:21 [PATCH 00/20] qdev/qom: Remove explicit type names from error_setg() calls Eduardo Habkost
2020-10-30 20:21 ` [PATCH 01/20] qom: Add prefix to error message inside object_property_parse() Eduardo Habkost
2020-11-03 12:33   ` Igor Mammedov
2020-10-30 20:21 ` [PATCH 02/20] qdev: Stop using error_set_from_qdev_prop_error() for netdev property Eduardo Habkost
2020-10-30 20:21 ` [PATCH 03/20] qdev: Stop using error_set_from_qdev_prop_error() for audiodev property Eduardo Habkost
2020-10-30 20:21 ` [PATCH 04/20] qdev: Stop using error_set_from_qdev_prop_error() for mac property Eduardo Habkost
2020-10-30 20:21 ` [PATCH 05/20] qdev: Stop using error_set_from_qdev_prop_error() for devfn property Eduardo Habkost
2020-10-30 20:21 ` [PATCH 06/20] qdev: Stop using error_set_from_qdev_prop_error() for PCI host device property Eduardo Habkost
2020-10-30 20:21 ` Eduardo Habkost [this message]
2020-10-30 20:21 ` [PATCH 08/20] qdev: Delete unused error_set_from_qdev_prop_error() function Eduardo Habkost
2020-10-30 20:21 ` [PATCH 09/20] cryptodev: Remove unnecessary prefix from error message Eduardo Habkost
2020-10-30 20:21 ` [PATCH 10/20] memfd: " Eduardo Habkost
2020-11-03 12:30   ` Igor Mammedov
2020-10-30 20:21 ` [PATCH 11/20] tpm_util: " Eduardo Habkost
2020-10-30 20:21 ` [PATCH 12/20] qdev: drive: " Eduardo Habkost
2020-10-30 20:21 ` [PATCH 13/20] qdev: chardev: " Eduardo Habkost
2020-10-30 20:21 ` [PATCH 14/20] i386: " Eduardo Habkost
2020-11-03 12:34   ` Igor Mammedov
2020-10-30 20:21 ` [PATCH 15/20] qerror: Delete unused QERR_PROPERTY_VALUE_BAD macro Eduardo Habkost
2020-10-30 20:21 ` [PATCH 16/20] nvdimm: Remove unnecessary prefix from error message Eduardo Habkost
2020-11-03 12:31   ` Igor Mammedov
2020-10-30 20:21 ` [PATCH 17/20] colo-compare: " Eduardo Habkost
2020-10-30 20:21 ` [PATCH 18/20] filter-dump: " Eduardo Habkost
2020-10-30 20:21 ` [PATCH 19/20] filter-buffer: " Eduardo Habkost
2020-10-30 20:21 ` [PATCH 20/20] qom: Remove error prefix check at object_property_parse() Eduardo Habkost

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20201030202131.796967-8-ehabkost@redhat.com \
    --to=ehabkost@redhat.com \
    --cc=armbru@redhat.com \
    --cc=borntraeger@de.ibm.com \
    --cc=cohuck@redhat.com \
    --cc=david@redhat.com \
    --cc=pasic@linux.ibm.com \
    --cc=qemu-devel@nongnu.org \
    --cc=qemu-s390x@nongnu.org \
    --cc=rth@twiddle.net \
    --cc=thuth@redhat.com \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).