[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PULL 21/34] 9pfs: make Error **errp const where it is appropriate
From: |
Markus Armbruster |
Subject: |
[PULL 21/34] 9pfs: make Error **errp const where it is appropriate |
Date: |
Tue, 17 Dec 2019 07:26:38 +0100 |
From: Vladimir Sementsov-Ogievskiy <address@hidden>
Mostly, Error ** is for returning error from the function, so the
callee sets it. However error_append_security_model_hint and
error_append_socket_sockfd_hint get already filled errp
parameter. They don't change the pointer itself, only change the
internal state of referenced Error object. So we can make it Error
*const * errp, to stress the behavior. It will also help coccinelle
script (in future) to distinguish such cases from common errp usage.
Signed-off-by: Vladimir Sementsov-Ogievskiy <address@hidden>
Acked-by: Greg Kurz <address@hidden>
Message-Id: <address@hidden>
Reviewed-by: Markus Armbruster <address@hidden>
[Commit message replaced]
Signed-off-by: Markus Armbruster <address@hidden>
---
hw/9pfs/9p-local.c | 2 +-
hw/9pfs/9p-proxy.c | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/hw/9pfs/9p-local.c b/hw/9pfs/9p-local.c
index 4708c0bd89..ca641390fb 100644
--- a/hw/9pfs/9p-local.c
+++ b/hw/9pfs/9p-local.c
@@ -1473,7 +1473,7 @@ static void local_cleanup(FsContext *ctx)
g_free(data);
}
-static void error_append_security_model_hint(Error **errp)
+static void error_append_security_model_hint(Error *const *errp)
{
error_append_hint(errp, "Valid options are: security_model="
"[passthrough|mapped-xattr|mapped-file|none]\n");
diff --git a/hw/9pfs/9p-proxy.c b/hw/9pfs/9p-proxy.c
index 97ab9c58a5..8136e1342d 100644
--- a/hw/9pfs/9p-proxy.c
+++ b/hw/9pfs/9p-proxy.c
@@ -1114,7 +1114,7 @@ static int connect_namedsocket(const char *path, Error
**errp)
return sockfd;
}
-static void error_append_socket_sockfd_hint(Error **errp)
+static void error_append_socket_sockfd_hint(Error *const *errp)
{
error_append_hint(errp, "Either specify socket=/some/path where /some/path"
" points to a listening AF_UNIX socket or sock_fd=fd"
--
2.21.0
- [PULL 16/34] error: make Error **errp const where it is appropriate, (continued)
- [PULL 16/34] error: make Error **errp const where it is appropriate, Markus Armbruster, 2019/12/17
- [PULL 28/34] hw/sd: drop extra whitespace in sdhci_sysbus_realize() header, Markus Armbruster, 2019/12/17
- [PULL 19/34] qdev-monitor: make Error **errp const where it is appropriate, Markus Armbruster, 2019/12/17
- [PULL 18/34] vnc: drop Error pointer indirection in vnc_client_io_error, Markus Armbruster, 2019/12/17
- [PULL 23/34] block/snapshot: rename Error ** parameter to more common errp, Markus Armbruster, 2019/12/17
- [PULL 32/34] backends/cryptodev: drop local_err from cryptodev_backend_complete(), Markus Armbruster, 2019/12/17
- [PULL 34/34] nbd: assert that Error** is not NULL in nbd_iter_channel_error, Markus Armbruster, 2019/12/17
- [PULL 30/34] hw/usb: rename Error ** parameter to more common errp, Markus Armbruster, 2019/12/17
- [PULL 21/34] 9pfs: make Error **errp const where it is appropriate,
Markus Armbruster <=
- [PULL 17/34] hmp: drop Error pointer indirection in hmp_handle_error, Markus Armbruster, 2019/12/17
- [PULL 27/34] hw/s390x: rename Error ** parameter to more common errp, Markus Armbruster, 2019/12/17
- [PULL 31/34] include/qom/object.h: rename Error ** parameter to more common errp, Markus Armbruster, 2019/12/17
- [PULL 24/34] hw/i386/amd_iommu: rename Error ** parameter to more common errp, Markus Armbruster, 2019/12/17
- [PULL 20/34] ppc: make Error **errp const where it is appropriate, Markus Armbruster, 2019/12/17
- [PULL 12/34] error: Clean up unusual names of Error * variables, Markus Armbruster, 2019/12/17
- [PULL 22/34] hw/core/qdev: cleanup Error ** variables, Markus Armbruster, 2019/12/17
- [PULL 25/34] qga: rename Error ** parameter to more common errp, Markus Armbruster, 2019/12/17
- Re: [PULL 00/34] Error reporting patches for 2019-12-16, Peter Maydell, 2019/12/17