[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PULL 17/30] include: move qdict_{crumple,flatten} declarations
From: |
marcandre . lureau |
Subject: |
[PULL 17/30] include: move qdict_{crumple,flatten} declarations |
Date: |
Thu, 21 Apr 2022 17:49:27 +0400 |
From: Marc-André Lureau <marcandre.lureau@redhat.com>
Move them where they belong, since the functions are implemented in
block-qdict.c.
Signed-off-by: Marc-André Lureau <marcandre.lureau@redhat.com>
Reviewed-by: Daniel P. Berrangé <berrange@redhat.com>
Message-Id: <20220420132624.2439741-25-marcandre.lureau@redhat.com>
---
include/block/qdict.h | 3 +++
include/qapi/qmp/qdict.h | 3 ---
softmmu/vl.c | 1 +
tests/unit/check-qobject.c | 1 +
4 files changed, 5 insertions(+), 3 deletions(-)
diff --git a/include/block/qdict.h b/include/block/qdict.h
index ced2acfb92a0..b4c28d96a9e5 100644
--- a/include/block/qdict.h
+++ b/include/block/qdict.h
@@ -12,6 +12,9 @@
#include "qapi/qmp/qdict.h"
+QObject *qdict_crumple(const QDict *src, Error **errp);
+void qdict_flatten(QDict *qdict);
+
void qdict_copy_default(QDict *dst, QDict *src, const char *key);
void qdict_set_default_str(QDict *dst, const char *key, const char *val);
diff --git a/include/qapi/qmp/qdict.h b/include/qapi/qmp/qdict.h
index 882d950bde89..82e90fc07229 100644
--- a/include/qapi/qmp/qdict.h
+++ b/include/qapi/qmp/qdict.h
@@ -68,7 +68,4 @@ const char *qdict_get_try_str(const QDict *qdict, const char
*key);
QDict *qdict_clone_shallow(const QDict *src);
-QObject *qdict_crumple(const QDict *src, Error **errp);
-void qdict_flatten(QDict *qdict);
-
#endif /* QDICT_H */
diff --git a/softmmu/vl.c b/softmmu/vl.c
index 5312bd25649f..06a0e342fe9e 100644
--- a/softmmu/vl.c
+++ b/softmmu/vl.c
@@ -125,6 +125,7 @@
#include "qapi/qapi-visit-qom.h"
#include "qapi/qapi-commands-ui.h"
#include "qapi/qmp/qdict.h"
+#include "block/qdict.h"
#include "qapi/qmp/qerror.h"
#include "sysemu/iothread.h"
#include "qemu/guest-random.h"
diff --git a/tests/unit/check-qobject.c b/tests/unit/check-qobject.c
index 0ed094e55f3a..c5e850a10cb5 100644
--- a/tests/unit/check-qobject.c
+++ b/tests/unit/check-qobject.c
@@ -15,6 +15,7 @@
#include "qapi/qmp/qnull.h"
#include "qapi/qmp/qnum.h"
#include "qapi/qmp/qstring.h"
+#include "block/qdict.h"
#include <math.h>
--
2.36.0
- [PULL 08/30] arm/digic: replace snprintf() with g_strdup_printf(), (continued)
- [PULL 08/30] arm/digic: replace snprintf() with g_strdup_printf(), marcandre . lureau, 2022/04/21
- [PULL 07/30] docs: trace-events-all is installed without renaming, marcandre . lureau, 2022/04/21
- [PULL 09/30] arm/allwinner-a10: replace snprintf() with g_strdup_printf(), marcandre . lureau, 2022/04/21
- [PULL 10/30] intc/exynos4210_gic: replace snprintf() with g_strdup_printf(), marcandre . lureau, 2022/04/21
- [PULL 11/30] doc/style: CLang -> Clang, marcandre . lureau, 2022/04/21
- [PULL 12/30] osdep.h: move qemu_build_not_reached(), marcandre . lureau, 2022/04/21
- [PULL 13/30] compiler.h: replace QEMU_NORETURN with G_NORETURN, marcandre . lureau, 2022/04/21
- [PULL 14/30] include: move qemu_msync() to osdep, marcandre . lureau, 2022/04/21
- [PULL 15/30] include: move qemu_fdatasync() to osdep, marcandre . lureau, 2022/04/21
- [PULL 16/30] include: add qemu/keyval.h, marcandre . lureau, 2022/04/21
- [PULL 17/30] include: move qdict_{crumple,flatten} declarations,
marcandre . lureau <=
- [PULL 19/30] compiler.h: add QEMU_SANITIZE_{ADDRESS,THREAD}, marcandre . lureau, 2022/04/21
- [PULL 18/30] tests: remove block/qdict checks from check-qobject.c, marcandre . lureau, 2022/04/21
- [PULL 20/30] tests: run-time skip test-qga if TSAN is enabled, marcandre . lureau, 2022/04/21
- [PULL 21/30] Move error_printf_unless_qmp() with monitor unit, marcandre . lureau, 2022/04/21
- [PULL 22/30] qga: move qga_get_host_name(), marcandre . lureau, 2022/04/21
- [PULL 24/30] util: simplify write in signal handler, marcandre . lureau, 2022/04/21
- [PULL 23/30] qtest: simplify socket_send(), marcandre . lureau, 2022/04/21
- [PULL 25/30] util: use qemu_write_full() in qemu_write_pidfile(), marcandre . lureau, 2022/04/21
- [PULL 26/30] util: use qemu_create() in qemu_write_pidfile(), marcandre . lureau, 2022/04/21
- [PULL 27/30] util: replace qemu_get_local_state_pathname(), marcandre . lureau, 2022/04/21