[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PULL 15/28] qapi: New QAPI_CLONE_MEMBERS()
From: |
Markus Armbruster |
Subject: |
[Qemu-devel] [PULL 15/28] qapi: New QAPI_CLONE_MEMBERS() |
Date: |
Thu, 4 May 2017 17:23:52 +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>
Message-Id: <address@hidden>
Reviewed-by: Eric Blake <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-devel] [PULL 21/28] qobject-input-visitor: Document full_name_nth(), (continued)
- [Qemu-devel] [PULL 21/28] qobject-input-visitor: Document full_name_nth(), Markus Armbruster, 2017/05/04
- [Qemu-devel] [PULL 01/28] tests/check-qdict: Fix missing brackets, Markus Armbruster, 2017/05/04
- [Qemu-devel] [PULL 04/28] pci: Reduce scope of error injection, Markus Armbruster, 2017/05/04
- [Qemu-devel] [PULL 22/28] qapi: Document intended use of @name within alternate visits, Markus Armbruster, 2017/05/04
- [Qemu-devel] [PULL 02/28] test-keyval: fix leaks, Markus Armbruster, 2017/05/04
- [Qemu-devel] [PULL 11/28] fdc-test: Avoid deprecated 'change' command, Markus Armbruster, 2017/05/04
- [Qemu-devel] [PULL 20/28] qmp: Improve QMP dispatch error messages, Markus Armbruster, 2017/05/04
- [Qemu-devel] [PULL 26/28] qmp-shell: Cope with query-commands error, Markus Armbruster, 2017/05/04
- [Qemu-devel] [PULL 12/28] test-qga: Actually test 0xff sync bytes, Markus Armbruster, 2017/05/04
- [Qemu-devel] [PULL 27/28] qmp-shell: don't show version greeting if unavailable, Markus Armbruster, 2017/05/04
- [Qemu-devel] [PULL 15/28] qapi: New QAPI_CLONE_MEMBERS(),
Markus Armbruster <=
- [Qemu-devel] [PULL 19/28] sockets: Delete unused helper socket_address_crumple(), Markus Armbruster, 2017/05/04
- [Qemu-devel] [PULL 14/28] sockets: Prepare inet_parse() for flattened SocketAddress, Markus Armbruster, 2017/05/04
- [Qemu-devel] [PULL 06/28] qobject: Drop useless QObject casts, Markus Armbruster, 2017/05/04
- [Qemu-devel] [PULL 25/28] qmp-shell: add -N option to skip negotiate, Markus Armbruster, 2017/05/04
- [Qemu-devel] [PULL 24/28] qmp-shell: add persistent command history, Markus Armbruster, 2017/05/04
- [Qemu-devel] [PULL 23/28] qobject-input-visitor: Catch misuse of end_struct vs. end_list, Markus Armbruster, 2017/05/04
- [Qemu-devel] [PULL 08/28] qobject: Use simpler QDict/QList scalar insertion macros, Markus Armbruster, 2017/05/04
- [Qemu-devel] [PULL 13/28] sockets: Prepare vsock_parse() for flattened SocketAddress, Markus Armbruster, 2017/05/04
- [Qemu-devel] [PULL 16/28] sockets: Rename SocketAddress to SocketAddressLegacy, Markus Armbruster, 2017/05/04
- [Qemu-devel] [PULL 28/28] qmp-shell: improve help, Markus Armbruster, 2017/05/04