summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMarkus Armbruster <armbru@redhat.com>2013-02-06 21:27:16 +0100
committerAnthony Liguori <aliguori@us.ibm.com>2013-02-06 16:35:17 -0600
commit1a69278e53a0e5060c8c6cc825449a122634ce3b (patch)
treeece4fab609091e3a595760836c72d28e0f53987e
parent3ab651fc819178cf6a518af5860cc49f42cff455 (diff)
downloadqemu-1a69278e53a0e5060c8c6cc825449a122634ce3b.tar.gz
qmp: Use generic errors in memchar-read, memchar-write
New errors should be generic unless there's a real use case for rich errors. Signed-off-by: Markus Armbruster <armbru@redhat.com> Reviewed-by: Eric Blake <eblake@redhat.com> Signed-off-by: Anthony Liguori <aliguori@us.ibm.com>
-rw-r--r--qapi-schema.json2
-rw-r--r--qemu-char.c4
2 files changed, 2 insertions, 4 deletions
diff --git a/qapi-schema.json b/qapi-schema.json
index d8fa1c376a..6f6379151f 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 b593c50f20..2bdd1bb18a 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;
}