block: Add block-specific QDict header

There are numerous QDict functions that have been introduced for and are
used only by the block layer.  Move their declarations into an own
header file to reflect that.

While qdict_extract_subqdict() is in fact used outside of the block
layer (in util/qemu-config.c), it is still a function related very
closely to how the block layer works with nested QDicts, namely by
sometimes flattening them.  Therefore, its declaration is put into this
header as well and util/qemu-config.c includes it with a comment stating
exactly which function it needs.

Suggested-by: Markus Armbruster <armbru@redhat.com>
Signed-off-by: Max Reitz <mreitz@redhat.com>
Message-Id: <20180509165530.29561-7-mreitz@redhat.com>
[Copyright note tweaked, superfluous includes dropped]
Signed-off-by: Markus Armbruster <armbru@redhat.com>
Reviewed-by: Kevin Wolf <kwolf@redhat.com>
Signed-off-by: Kevin Wolf <kwolf@redhat.com>

diff --git a/block.c b/block.c
index 50887087f328a355291a93d8d84353512d13e869..afe30caac3df8e009cb28889a4dc2d2663ea09f1 100644 (file)
--- a/block.c
+++ b/block.c
@@ -27,6 +27,7 @@
 #include "block/block_int.h"
 #include "block/blockjob.h"
 #include "block/nbd.h"
+#include "block/qdict.h"
 #include "qemu/error-report.h"
 #include "module_block.h"
 #include "qemu/module.h"

diff --git a/block/gluster.c b/block/gluster.c
index 9900b6420c8874d1b88c0f47c3c2f65471df8032..b5fe7f3e87ca65265eb2533389f4450633f6ceb4 100644 (file)
--- a/block/gluster.c
+++ b/block/gluster.c
@@ -11,6 +11,7 @@
 #include "qemu/osdep.h"
 #include <glusterfs/api/glfs.h>
 #include "block/block_int.h"
+#include "block/qdict.h"
 #include "qapi/error.h"
 #include "qapi/qmp/qdict.h"
 #include "qapi/qmp/qerror.h"

diff --git a/block/iscsi.c b/block/iscsi.c
index 7e3ea72bd2fbf8ee40ed49a856d1cba24a67f7ae..9f00fb47a598f551284cd01b4fbc6c95bc0a4191 100644 (file)
--- a/block/iscsi.c
+++ b/block/iscsi.c
@@ -33,6 +33,7 @@
 #include "qemu/bitops.h"
 #include "qemu/bitmap.h"
 #include "block/block_int.h"
+#include "block/qdict.h"
 #include "scsi/constants.h"
 #include "qemu/iov.h"
 #include "qemu/option.h"

diff --git a/block/nbd.c b/block/nbd.c
index ff8333e3c1fea94c4c17f49f94e6d612d6d301a2..d6c4c4ddbc124a0a04c04f785fcea4e958be8a7b 100644 (file)
--- a/block/nbd.c
+++ b/block/nbd.c
@@ -28,6 +28,7 @@
 
 #include "qemu/osdep.h"
 #include "nbd-client.h"
+#include "block/qdict.h"
 #include "qapi/error.h"
 #include "qemu/uri.h"
 #include "block/block_int.h"

diff --git a/block/nfs.c b/block/nfs.c
index 3349b67a767a9e8c00c1458e8b29f181cb629641..3170b059b3adb60d036cdf12abd5e973ac2e8092 100644 (file)
--- a/block/nfs.c
+++ b/block/nfs.c
@@ -29,6 +29,7 @@
 #include "qemu/error-report.h"
 #include "qapi/error.h"
 #include "block/block_int.h"
+#include "block/qdict.h"
 #include "trace.h"
 #include "qemu/iov.h"
 #include "qemu/option.h"

diff --git a/block/parallels.c b/block/parallels.c
index 6e9c37f44e1fe7784029ef539f922207f4ff72c5..c1d9643498028699001207d8f1fbd331d28e78f6 100644 (file)
--- a/block/parallels.c
+++ b/block/parallels.c
@@ -31,6 +31,7 @@
 #include "qemu/osdep.h"
 #include "qapi/error.h"
 #include "block/block_int.h"
+#include "block/qdict.h"
 #include "sysemu/block-backend.h"
 #include "qemu/module.h"
 #include "qemu/option.h"

diff --git a/block/qcow.c b/block/qcow.c
index 1f866af0d31efbaebd2d49b69aa984190475f044..8c08908fd88774565e29fe17eb36cebec850dc4b 100644 (file)
--- a/block/qcow.c
+++ b/block/qcow.c
@@ -26,6 +26,7 @@
 #include "qapi/error.h"
 #include "qemu/error-report.h"
 #include "block/block_int.h"
+#include "block/qdict.h"
 #include "sysemu/block-backend.h"
 #include "qemu/module.h"
 #include "qemu/option.h"

diff --git a/block/qcow2.c b/block/qcow2.c
index 6fa5e1d71a93b7d4c233bbd84b81e9446b64b185..d2d955f984871c9d9509a774be25ee9623608665 100644 (file)
--- a/block/qcow2.c
+++ b/block/qcow2.c
@@ -24,6 +24,7 @@
 
 #include "qemu/osdep.h"
 #include "block/block_int.h"
+#include "block/qdict.h"
 #include "sysemu/block-backend.h"
 #include "qemu/module.h"
 #include <zlib.h>

diff --git a/block/qed.c b/block/qed.c
index 65cfe92393355925e014cdd118bd5e82c9297c1e..324a953cbcfa8176e9df80a1ad6105518153a457 100644 (file)
--- a/block/qed.c
+++ b/block/qed.c
@@ -13,6 +13,7 @@
  */
 
 #include "qemu/osdep.h"
+#include "block/qdict.h"
 #include "qapi/error.h"
 #include "qemu/timer.h"
 #include "qemu/bswap.h"

diff --git a/block/quorum.c b/block/quorum.c
index b6476c405a249dae8f1bc728346d1606c13fc651..9152da8c589212f7aff57a191f521129aabd437e 100644 (file)
--- a/block/quorum.c
+++ b/block/quorum.c
@@ -17,6 +17,7 @@
 #include "qemu/cutils.h"
 #include "qemu/option.h"
 #include "block/block_int.h"
+#include "block/qdict.h"
 #include "qapi/error.h"
 #include "qapi/qapi-events-block.h"
 #include "qapi/qmp/qdict.h"

diff --git a/block/rbd.c b/block/rbd.c
index 40c6e4185ff4baa4c78e1ae8df6b5e4fc49875c8..9659c7361ff908b8feb92c0750e3443d457c9e98 100644 (file)
--- a/block/rbd.c
+++ b/block/rbd.c
@@ -18,6 +18,7 @@
 #include "qemu/error-report.h"
 #include "qemu/option.h"
 #include "block/block_int.h"
+#include "block/qdict.h"
 #include "crypto/secret.h"
 #include "qemu/cutils.h"
 #include "qapi/qmp/qstring.h"

diff --git a/block/sheepdog.c b/block/sheepdog.c
index 7b98725af7b28cf29b8bb443f751ffb96584d010..2e1f0e6eca7bd7b5a768cde0f67bff52ea388758 100644 (file)
--- a/block/sheepdog.c
+++ b/block/sheepdog.c
@@ -24,6 +24,7 @@
 #include "qemu/option.h"
 #include "qemu/sockets.h"
 #include "block/block_int.h"
+#include "block/qdict.h"
 #include "sysemu/block-backend.h"
 #include "qemu/bitops.h"
 #include "qemu/cutils.h"

diff --git a/block/snapshot.c b/block/snapshot.c
index 2953d96c06c3f0c48ae8d7aed2609972efb43ed3..f9903bc94e15b17a6d099b290b8546271a94bda2 100644 (file)
--- a/block/snapshot.c
+++ b/block/snapshot.c
@@ -25,6 +25,7 @@
 #include "qemu/osdep.h"
 #include "block/snapshot.h"
 #include "block/block_int.h"
+#include "block/qdict.h"
 #include "qapi/error.h"
 #include "qapi/qmp/qdict.h"
 #include "qapi/qmp/qerror.h"

diff --git a/block/ssh.c b/block/ssh.c
index 4c4fa3ccfc5a81482347e6eff0c64db22982f53c..eec37dd27c12e509fd2a16fdde62c633eb3563af 100644 (file)
--- a/block/ssh.c
+++ b/block/ssh.c
@@ -28,6 +28,7 @@
 #include <libssh2_sftp.h>
 
 #include "block/block_int.h"
+#include "block/qdict.h"
 #include "qapi/error.h"
 #include "qemu/error-report.h"
 #include "qemu/option.h"

diff --git a/block/vhdx.c b/block/vhdx.c
index 0831c5c5f482846941e7a7b4d145d3e367155f92..2e32e245146eb39a54b27859891789145ec58ea3 100644 (file)
--- a/block/vhdx.c
+++ b/block/vhdx.c
@@ -18,6 +18,7 @@
 #include "qemu/osdep.h"
 #include "qapi/error.h"
 #include "block/block_int.h"
+#include "block/qdict.h"
 #include "sysemu/block-backend.h"
 #include "qemu/module.h"
 #include "qemu/option.h"

diff --git a/block/vpc.c b/block/vpc.c
index 0ebfcd3cc8edfd50cf23d9d29b5eed7d9336b408..41c8c980f19d15a5d2ff3e2c682720f839ec31f5 100644 (file)
--- a/block/vpc.c
+++ b/block/vpc.c
@@ -26,6 +26,7 @@
 #include "qemu/osdep.h"
 #include "qapi/error.h"
 #include "block/block_int.h"
+#include "block/qdict.h"
 #include "sysemu/block-backend.h"
 #include "qemu/module.h"
 #include "qemu/option.h"

diff --git a/block/vvfat.c b/block/vvfat.c
index 662dca0114097ffd2a99831a96bd3242e4348af4..4595f335b8c698dc86ea27b2c2387b2da460e3c6 100644 (file)
--- a/block/vvfat.c
+++ b/block/vvfat.c
@@ -27,6 +27,7 @@
 #include <dirent.h>
 #include "qapi/error.h"
 #include "block/block_int.h"
+#include "block/qdict.h"
 #include "qemu/module.h"
 #include "qemu/option.h"
 #include "qemu/bswap.h"

diff --git a/block/vxhs.c b/block/vxhs.c
index 339e23218dcdf673b8531adafad30daa48bd56fe..0cb0a007e90de9d860af852f20b525dc609f59ef 100644 (file)
--- a/block/vxhs.c
+++ b/block/vxhs.c
@@ -12,6 +12,7 @@
 #include <qnio/qnio_api.h>
 #include <sys/param.h>
 #include "block/block_int.h"
+#include "block/qdict.h"
 #include "qapi/qmp/qerror.h"
 #include "qapi/qmp/qdict.h"
 #include "qapi/qmp/qstring.h"

diff --git a/blockdev.c b/blockdev.c
index 4862323012a94fc96695f25781588e6e80024c93..c24e261e37a73fdd1c67b6e4e9c773d17564b390 100644 (file)
--- a/blockdev.c
+++ b/blockdev.c
@@ -35,6 +35,7 @@
 #include "sysemu/blockdev.h"
 #include "hw/block/block.h"
 #include "block/blockjob.h"
+#include "block/qdict.h"
 #include "block/throttle-groups.h"
 #include "monitor/monitor.h"
 #include "qemu/error-report.h"

diff --git a/include/block/qdict.h b/include/block/qdict.h
new file mode 100644 (file)
index 0000000..71c037a
--- /dev/null
+++ b/include/block/qdict.h
@@ -0,0 +1,32 @@
+/*
+ * Special QDict functions used by the block layer
+ *
+ * Copyright (c) 2013-2018 Red Hat, Inc.
+ *
+ * This work is licensed under the terms of the GNU LGPL, version 2.1 or later.
+ * See the COPYING.LIB file in the top-level directory.
+ */
+
+#ifndef BLOCK_QDICT_H
+#define BLOCK_QDICT_H
+
+#include "qapi/qmp/qdict.h"
+
+void qdict_copy_default(QDict *dst, QDict *src, const char *key);
+void qdict_set_default_str(QDict *dst, const char *key, const char *val);
+
+void qdict_join(QDict *dest, QDict *src, bool overwrite);
+
+void qdict_extract_subqdict(QDict *src, QDict **dst, const char *start);
+void qdict_array_split(QDict *src, QList **dst);
+int qdict_array_entries(QDict *src, const char *subqdict);
+QObject *qdict_crumple(const QDict *src, Error **errp);
+void qdict_flatten(QDict *qdict);
+
+typedef struct QDictRenames {
+    const char *from;
+    const char *to;
+} QDictRenames;
+bool qdict_rename_keys(QDict *qdict, const QDictRenames *renames, Error **errp);
+
+#endif

diff --git a/include/qapi/qmp/qdict.h b/include/qapi/qmp/qdict.h
index 921a28d2d3df31e3fa157483a1bd4d52740f2dde..7f3ec10a10b2e325340e107c32ca106b3020e60e 100644 (file)
--- a/include/qapi/qmp/qdict.h
+++ b/include/qapi/qmp/qdict.h
@@ -67,23 +67,6 @@ int64_t qdict_get_try_int(const QDict *qdict, const char *key,
 bool qdict_get_try_bool(const QDict *qdict, const char *key, bool def_value);
 const char *qdict_get_try_str(const QDict *qdict, const char *key);
 
-void qdict_copy_default(QDict *dst, QDict *src, const char *key);
-void qdict_set_default_str(QDict *dst, const char *key, const char *val);
-
 QDict *qdict_clone_shallow(const QDict *src);
-void qdict_flatten(QDict *qdict);
-
-void qdict_extract_subqdict(QDict *src, QDict **dst, const char *start);
-void qdict_array_split(QDict *src, QList **dst);
-int qdict_array_entries(QDict *src, const char *subqdict);
-QObject *qdict_crumple(const QDict *src, Error **errp);
-
-void qdict_join(QDict *dest, QDict *src, bool overwrite);
-
-typedef struct QDictRenames {
-    const char *from;
-    const char *to;
-} QDictRenames;
-bool qdict_rename_keys(QDict *qdict, const QDictRenames *renames, Error **errp);
 
 #endif /* QDICT_H */

diff --git a/qobject/qdict.c b/qobject/qdict.c
index 22800eecebe594210e164e3500da80fc9788f9d7..0554c64553a6de119a538336017cec143532df3d 100644 (file)
--- a/qobject/qdict.c
+++ b/qobject/qdict.c
@@ -11,6 +11,7 @@
  */
 
 #include "qemu/osdep.h"
+#include "block/qdict.h"
 #include "qapi/qmp/qnum.h"
 #include "qapi/qmp/qdict.h"
 #include "qapi/qmp/qbool.h"

diff --git a/tests/check-qdict.c b/tests/check-qdict.c
index eba5d3528e32f29245eb955912015b41ae71ecf9..93e2112b6d9984ae93b35f3d59be85577d723a38 100644 (file)
--- a/tests/check-qdict.c
+++ b/tests/check-qdict.c
@@ -11,6 +11,7 @@
  */
 
 #include "qemu/osdep.h"
+#include "block/qdict.h"
 #include "qapi/qmp/qdict.h"
 #include "qapi/qmp/qlist.h"
 #include "qapi/qmp/qnum.h"

diff --git a/tests/check-qobject.c b/tests/check-qobject.c
index 5cb08fcb631101f4d66a15ef9ee24fdf13b0a744..16ccbde82cc32ba682a13855e86d65561ea48f64 100644 (file)
--- a/tests/check-qobject.c
+++ b/tests/check-qobject.c
@@ -8,6 +8,7 @@
  */
 
 #include "qemu/osdep.h"
+#include "block/qdict.h"
 #include "qapi/qmp/qbool.h"
 #include "qapi/qmp/qdict.h"
 #include "qapi/qmp/qlist.h"

diff --git a/tests/test-replication.c b/tests/test-replication.c
index 68c0d04f2a951dd0feecb2fcb8d7608a7ac2f384..c8165ae9549941b0b3efa2e373c76aaac3129a0e 100644 (file)
--- a/tests/test-replication.c
+++ b/tests/test-replication.c
@@ -15,6 +15,7 @@
 #include "qemu/option.h"
 #include "replication.h"
 #include "block/block_int.h"
+#include "block/qdict.h"
 #include "sysemu/block-backend.h"
 
 #define IMG_SIZE (64 * 1024 * 1024)

diff --git a/util/qemu-config.c b/util/qemu-config.c
index 14d84022dc75e4270ebf95763ebfae0e31f9c10b..9d2e278e2906e153fefcc994d65bbe66e712020f 100644 (file)
--- a/util/qemu-config.c
+++ b/util/qemu-config.c
@@ -1,4 +1,5 @@
 #include "qemu/osdep.h"
+#include "block/qdict.h" /* for qdict_extract_subqdict() */
 #include "qapi/error.h"
 #include "qapi/qapi-commands-misc.h"
 #include "qapi/qmp/qdict.h"