From patchwork Wed Feb 6 20:27:16 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: [for-1.4, v2, 03/13] qmp: Use generic errors in memchar-read, memchar-write Date: Wed, 06 Feb 2013 10:27:16 -0000 From: Markus Armbruster X-Patchwork-Id: 218777 Message-Id: <1360182446-1502-4-git-send-email-armbru@redhat.com> To: qemu-devel@nongnu.org Cc: lilei@linux.vnet.ibm.com, lcapitulino@redhat.com New errors should be generic unless there's a real use case for rich errors. Signed-off-by: Markus Armbruster --- qapi-schema.json | 2 -- qemu-char.c | 4 ++-- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/qapi-schema.json b/qapi-schema.json index d8fa1c3..6f63791 100644 --- a/qapi-schema.json +++ b/qapi-schema.json @@ -352,7 +352,6 @@ # by default is 'utf8'. # # Returns: Nothing on success -# If @device is not a valid char device, DeviceNotFound # # Since: 1.4 ## @@ -374,7 +373,6 @@ # memchardev, by default is 'utf8'. # # Returns: data read from the device -# If @device is not a valid memchr device, DeviceNotFound # # Since: 1.4 ## diff --git a/qemu-char.c b/qemu-char.c index b593c50..2bdd1bb 100644 --- a/qemu-char.c +++ b/qemu-char.c @@ -2764,7 +2764,7 @@ void qmp_memchar_write(const char *device, const char *data, chr = qemu_chr_find(device); if (!chr) { - error_set(errp, QERR_DEVICE_NOT_FOUND, device); + error_setg(errp, "Device '%s' not found", device); return; } @@ -2799,7 +2799,7 @@ char *qmp_memchar_read(const char *device, int64_t size, chr = qemu_chr_find(device); if (!chr) { - error_set(errp, QERR_DEVICE_NOT_FOUND, device); + error_setg(errp, "Device '%s' not found", device); return NULL; }