[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-block] [PATCH 3/7] qapi: New QAPI_CLONE_MEMBERS()
From: |
Markus Armbruster |
Subject: |
[Qemu-block] [PATCH 3/7] qapi: New QAPI_CLONE_MEMBERS() |
Date: |
Wed, 26 Apr 2017 09:36:38 +0200 |
QAPI_CLONE() returns a newly allocated QAPI object. Inconvenient when
we want to clone into an existing object. QAPI_CLONE_MEMBERS() does
exactly that.
Signed-off-by: Markus Armbruster <address@hidden>
---
include/qapi/clone-visitor.h | 14 ++++++++++++++
qapi/qapi-clone-visitor.c | 13 +++++++++++++
2 files changed, 27 insertions(+)
diff --git a/include/qapi/clone-visitor.h b/include/qapi/clone-visitor.h
index b16177e..a4915c7 100644
--- a/include/qapi/clone-visitor.h
+++ b/include/qapi/clone-visitor.h
@@ -24,6 +24,9 @@ typedef struct QapiCloneVisitor QapiCloneVisitor;
void *qapi_clone(const void *src, void (*visit_type)(Visitor *, const char *,
void **, Error **));
+void qapi_clone_members(void *dst, const void *src, size_t sz,
+ void (*visit_type_members)(Visitor *, void *,
+ Error **));
/*
* Deep-clone QAPI object @src of the given @type, and return the result.
@@ -36,4 +39,15 @@ void *qapi_clone(const void *src, void (*visit_type)(Visitor
*, const char *,
(void (*)(Visitor *, const char *, void**, \
Error **))visit_type_ ## type))
+/*
+ * Copy deep clones of @type members from @src to @dst.
+ *
+ * Not usable on QAPI scalars (integers, strings, enums), nor on a
+ * QAPI object that references the 'any' type.
+ */
+#define QAPI_CLONE_MEMBERS(type, dst, src) \
+ qapi_clone_members(dst, src, sizeof(type), \
+ (void (*)(Visitor *, void *, \
+ Error **))visit_type_ ## type ## _members)
+
#endif
diff --git a/qapi/qapi-clone-visitor.c b/qapi/qapi-clone-visitor.c
index 34086cb..de756bf 100644
--- a/qapi/qapi-clone-visitor.c
+++ b/qapi/qapi-clone-visitor.c
@@ -180,3 +180,16 @@ void *qapi_clone(const void *src, void
(*visit_type)(Visitor *, const char *,
visit_free(v);
return dst;
}
+
+void qapi_clone_members(void *dst, const void *src, size_t sz,
+ void (*visit_type_members)(Visitor *, void *,
+ Error **))
+{
+ Visitor *v;
+
+ v = qapi_clone_visitor_new();
+ memcpy(dst, src, sz);
+ to_qcv(v)->depth++;
+ visit_type_members(v, dst, &error_abort);
+ visit_free(v);
+}
--
2.7.4
- [Qemu-block] [PATCH 0/7] sockets: Flatten SocketAddress except in external interfaces, Markus Armbruster, 2017/04/26
- [Qemu-block] [PATCH 7/7] socket: Delete unused helper socket_address_crumple(), Markus Armbruster, 2017/04/26
- [Qemu-block] [PATCH 1/7] sockets: Prepare vsock_parse() for flattened SocketAddress, Markus Armbruster, 2017/04/26
- [Qemu-block] [PATCH 2/7] sockets: Prepare inet_parse() for flattened SocketAddress, Markus Armbruster, 2017/04/26
- [Qemu-block] [PATCH 3/7] qapi: New QAPI_CLONE_MEMBERS(),
Markus Armbruster <=
- [Qemu-block] [PATCH 5/7] sockets: Rename SocketAddressFlat to SocketAddress, Markus Armbruster, 2017/04/26
- [Qemu-block] [PATCH 4/7] sockets: Rename SocketAddress to SocketAddressLegacy, Markus Armbruster, 2017/04/26
- [Qemu-block] [PATCH 6/7] sockets: Limit SocketAddressLegacy except to external interfaces, Markus Armbruster, 2017/04/26