[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH 04/15] qmp: Consistently name Error ** objects errp,
From: |
Markus Armbruster |
Subject: |
[Qemu-devel] [PATCH 04/15] qmp: Consistently name Error ** objects errp, and not err |
Date: |
Fri, 25 Apr 2014 17:05:42 +0200 |
Signed-off-by: Markus Armbruster <address@hidden>
---
qmp.c | 16 ++++++++--------
1 file changed, 8 insertions(+), 8 deletions(-)
diff --git a/qmp.c b/qmp.c
index 87a28f7..456af05 100644
--- a/qmp.c
+++ b/qmp.c
@@ -41,7 +41,7 @@ NameInfo *qmp_query_name(Error **errp)
return info;
}
-VersionInfo *qmp_query_version(Error **err)
+VersionInfo *qmp_query_version(Error **errp)
{
VersionInfo *info = g_malloc0(sizeof(*info));
const char *version = QEMU_VERSION;
@@ -82,7 +82,7 @@ UuidInfo *qmp_query_uuid(Error **errp)
return info;
}
-void qmp_quit(Error **err)
+void qmp_quit(Error **errp)
{
no_shutdown = 0;
qemu_system_shutdown_request();
@@ -153,10 +153,10 @@ static void iostatus_bdrv_it(void *opaque,
BlockDriverState *bs)
static void encrypted_bdrv_it(void *opaque, BlockDriverState *bs)
{
- Error **err = opaque;
+ Error **errp = opaque;
- if (!error_is_set(err) && bdrv_key_required(bs)) {
- error_set(err, QERR_DEVICE_ENCRYPTED, bdrv_get_device_name(bs),
+ if (!error_is_set(errp) && bdrv_key_required(bs)) {
+ error_set(errp, QERR_DEVICE_ENCRYPTED, bdrv_get_device_name(bs),
bdrv_get_encrypted_filename(bs));
}
}
@@ -401,12 +401,12 @@ static void qmp_change_vnc(const char *target, bool
has_arg, const char *arg,
#endif /* !CONFIG_VNC */
void qmp_change(const char *device, const char *target,
- bool has_arg, const char *arg, Error **err)
+ bool has_arg, const char *arg, Error **errp)
{
if (strcmp(device, "vnc") == 0) {
- qmp_change_vnc(target, has_arg, arg, err);
+ qmp_change_vnc(target, has_arg, arg, errp);
} else {
- qmp_change_blockdev(device, target, arg, err);
+ qmp_change_blockdev(device, target, arg, errp);
}
}
--
1.8.1.4
- [Qemu-devel] [PATCH 11/15] qga: Clean up fragile use of error_is_set(), (continued)
- [Qemu-devel] [PATCH 11/15] qga: Clean up fragile use of error_is_set(), Markus Armbruster, 2014/04/25
- [Qemu-devel] [PATCH 09/15] tests/qapi-schema: Drop superfluous error_is_set(), Markus Armbruster, 2014/04/25
- [Qemu-devel] [PATCH 12/15] qga: Drop superfluous error_is_set(), Markus Armbruster, 2014/04/25
- [Qemu-devel] [PATCH 01/15] qmp hmp: Consistently name Error * objects err, and not errp, Markus Armbruster, 2014/04/25
- [Qemu-devel] [PATCH 13/15] qemu-option: Clean up fragile use of error_is_set(), Markus Armbruster, 2014/04/25
- [Qemu-devel] [PATCH 06/15] qga: Use return values instead of error_is_set(errp), Markus Armbruster, 2014/04/25
[Qemu-devel] [PATCH 04/15] qmp: Consistently name Error ** objects errp, and not err,
Markus Armbruster <=
[Qemu-devel] [PATCH 03/15] qga: Consistently name Error ** objects errp, and not err, Markus Armbruster, 2014/04/25
[Qemu-devel] [PATCH 15/15] qmp: Don't use error_is_set() to suppress additional errors, Markus Armbruster, 2014/04/25
Re: [Qemu-devel] [PATCH 00/15] qmp qga: Purge error_is_set(), Eric Blake, 2014/04/25