[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH for-1.4 11/12] qmp: Use generic errors in memchar-re
From: |
Markus Armbruster |
Subject: |
[Qemu-devel] [PATCH for-1.4 11/12] qmp: Use generic errors in memchar-read, memchar-write |
Date: |
Tue, 5 Feb 2013 17:22:14 +0100 |
From: Markus Armbruster <address@hidden>
New errors should be generic unless there's a real use case for rich
errors.
Signed-off-by: Markus Armbruster <address@hidden>
---
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 d92578a..3123432 100644
--- a/qemu-char.c
+++ b/qemu-char.c
@@ -2751,7 +2751,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;
}
@@ -2790,7 +2790,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;
}
--
1.7.11.7
- Re: [Qemu-devel] [PATCH for-1.4 01/12] qmp: Fix design bug and read beyond buffer in memchar-write, (continued)
[Qemu-devel] [PATCH for-1.4 08/12] qemu-char: Drop undocumented chardev "memory" compatibility syntax, Markus Armbruster, 2013/02/05
[Qemu-devel] [PATCH for-1.4 09/12] qemu-char: Redo chardev "memory" size configuration, Markus Armbruster, 2013/02/05
[Qemu-devel] [PATCH for-1.4 12/12] QAPI QMP HMP: Fix and improve memchar-read/-write docs, Markus Armbruster, 2013/02/05
[Qemu-devel] [PATCH for-1.4 11/12] qmp: Use generic errors in memchar-read, memchar-write,
Markus Armbruster <=
[Qemu-devel] [PATCH for-1.4 10/12] qemu-char: General chardev "memory" code cleanup, Markus Armbruster, 2013/02/05
Re: [Qemu-devel] [PATCH for-1.4 00/12] Fix memchar-read/-write before API gets released, Luiz Capitulino, 2013/02/06
Re: [Qemu-devel] [PATCH for-1.4 00/12] Fix memchar-read/-write before API gets released, Anthony Liguori, 2013/02/06