Skip to content

Commit 407bc4b

Browse files
berrangeMarkus Armbruster
berrange
authored and
Markus Armbruster
committed
qapi: Move include/qapi/qmp/ to include/qobject/
The general expectation is that header files should follow the same file/path naming scheme as the corresponding source file. There are various historical exceptions to this practice in QEMU, with one of the most notable being the include/qapi/qmp/ directory. Most of the headers there correspond to source files in qobject/. This patch corrects most of that inconsistency by creating include/qobject/ and moving the headers for qobject/ there. This also fixes MAINTAINERS for include/qapi/qmp/dispatch.h: scripts/get_maintainer.pl now reports "QAPI" instead of "No maintainers found". Signed-off-by: Daniel P. Berrangé <[email protected]> Reviewed-by: Zhao Liu <[email protected]> Acked-by: Halil Pasic <[email protected]> #s390x Signed-off-by: Markus Armbruster <[email protected]> Message-ID: <[email protected]> [Rebased]
1 parent 04d3d0e commit 407bc4b

File tree

248 files changed

+970
-443
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

248 files changed

+970
-443
lines changed

‎MAINTAINERS

+1-4
Original file line numberDiff line numberDiff line change
@@ -3235,8 +3235,6 @@ S: Supported
32353235
F: qapi/
32363236
X: qapi/*.json
32373237
F: include/qapi/
3238-
X: include/qapi/qmp/
3239-
F: include/qapi/qmp/dispatch.h
32403238
F: tests/qapi-schema/
32413239
F: tests/unit/test-*-visitor.c
32423240
F: tests/unit/test-qapi-*.c
@@ -3260,8 +3258,7 @@ QObject
32603258
M: Markus Armbruster <[email protected]>
32613259
S: Supported
32623260
F: qobject/
3263-
F: include/qapi/qmp/
3264-
X: include/qapi/qmp/dispatch.h
3261+
F: include/qobject/
32653262
F: scripts/coccinelle/qobject.cocci
32663263
F: tests/unit/check-qdict.c
32673264
F: tests/unit/check-qjson.c

‎audio/audio-hmp-cmds.c

+1-1
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@
2727
#include "monitor/hmp.h"
2828
#include "monitor/monitor.h"
2929
#include "qapi/error.h"
30-
#include "qapi/qmp/qdict.h"
30+
#include "qobject/qdict.h"
3131

3232
static QLIST_HEAD (capture_list_head, CaptureState) capture_head;
3333

‎audio/audio.c

+1-1
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@
3232
#include "qapi/qobject-input-visitor.h"
3333
#include "qapi/qapi-visit-audio.h"
3434
#include "qapi/qapi-commands-audio.h"
35-
#include "qapi/qmp/qdict.h"
35+
#include "qobject/qdict.h"
3636
#include "qemu/cutils.h"
3737
#include "qemu/error-report.h"
3838
#include "qemu/log.h"

‎authz/listfile.c

+2-2
Original file line numberDiff line numberDiff line change
@@ -28,8 +28,8 @@
2828
#include "qemu/filemonitor.h"
2929
#include "qom/object_interfaces.h"
3030
#include "qapi/qapi-visit-authz.h"
31-
#include "qapi/qmp/qjson.h"
32-
#include "qapi/qmp/qobject.h"
31+
#include "qobject/qjson.h"
32+
#include "qobject/qobject.h"
3333
#include "qapi/qobject-input-visitor.h"
3434

3535

‎backends/cryptodev-hmp-cmds.c

+1-1
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
#include "monitor/hmp.h"
1515
#include "monitor/monitor.h"
1616
#include "qapi/qapi-commands-cryptodev.h"
17-
#include "qapi/qmp/qdict.h"
17+
#include "qobject/qdict.h"
1818

1919

2020
void hmp_info_cryptodev(Monitor *mon, const QDict *qdict)

‎block.c

+4-4
Original file line numberDiff line numberDiff line change
@@ -36,10 +36,10 @@
3636
#include "qemu/main-loop.h"
3737
#include "qemu/module.h"
3838
#include "qapi/error.h"
39-
#include "qapi/qmp/qdict.h"
40-
#include "qapi/qmp/qjson.h"
41-
#include "qapi/qmp/qnull.h"
42-
#include "qapi/qmp/qstring.h"
39+
#include "qobject/qdict.h"
40+
#include "qobject/qjson.h"
41+
#include "qobject/qnull.h"
42+
#include "qobject/qstring.h"
4343
#include "qapi/qobject-output-visitor.h"
4444
#include "qapi/qapi-visit-block-core.h"
4545
#include "system/block-backend.h"

‎block/blkdebug.c

+3-3
Original file line numberDiff line numberDiff line change
@@ -33,9 +33,9 @@
3333
#include "qemu/module.h"
3434
#include "qemu/option.h"
3535
#include "qapi/qapi-visit-block-core.h"
36-
#include "qapi/qmp/qdict.h"
37-
#include "qapi/qmp/qlist.h"
38-
#include "qapi/qmp/qstring.h"
36+
#include "qobject/qdict.h"
37+
#include "qobject/qlist.h"
38+
#include "qobject/qstring.h"
3939
#include "qapi/qobject-input-visitor.h"
4040
#include "system/qtest.h"
4141

‎block/blkio.c

+1-1
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616
#include "qemu/defer-call.h"
1717
#include "qapi/error.h"
1818
#include "qemu/error-report.h"
19-
#include "qapi/qmp/qdict.h"
19+
#include "qobject/qdict.h"
2020
#include "qemu/module.h"
2121
#include "system/block-backend.h"
2222
#include "exec/memory.h" /* for ram_block_discard_disable() */

‎block/blklogwrites.c

+2-2
Original file line numberDiff line numberDiff line change
@@ -14,8 +14,8 @@
1414
#include "qemu/sockets.h" /* for EINPROGRESS on Windows */
1515
#include "block/block-io.h"
1616
#include "block/block_int.h"
17-
#include "qapi/qmp/qdict.h"
18-
#include "qapi/qmp/qstring.h"
17+
#include "qobject/qdict.h"
18+
#include "qobject/qstring.h"
1919
#include "qemu/cutils.h"
2020
#include "qemu/module.h"
2121
#include "qemu/option.h"

‎block/blkverify.c

+2-2
Original file line numberDiff line numberDiff line change
@@ -12,8 +12,8 @@
1212
#include "qemu/sockets.h" /* for EINPROGRESS on Windows */
1313
#include "block/block-io.h"
1414
#include "block/block_int.h"
15-
#include "qapi/qmp/qdict.h"
16-
#include "qapi/qmp/qstring.h"
15+
#include "qobject/qdict.h"
16+
#include "qobject/qstring.h"
1717
#include "qemu/cutils.h"
1818
#include "qemu/module.h"
1919
#include "qemu/option.h"

‎block/copy-before-write.c

+1-1
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@
2424
*/
2525

2626
#include "qemu/osdep.h"
27-
#include "qapi/qmp/qjson.h"
27+
#include "qobject/qjson.h"
2828

2929
#include "system/block-backend.h"
3030
#include "qemu/cutils.h"

‎block/copy-on-read.c

+1-1
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@
2525
#include "block/block_int.h"
2626
#include "qemu/module.h"
2727
#include "qapi/error.h"
28-
#include "qapi/qmp/qdict.h"
28+
#include "qobject/qdict.h"
2929
#include "block/copy-on-read.h"
3030

3131

‎block/curl.c

+2-2
Original file line numberDiff line numberDiff line change
@@ -29,8 +29,8 @@
2929
#include "qemu/option.h"
3030
#include "block/block-io.h"
3131
#include "block/block_int.h"
32-
#include "qapi/qmp/qdict.h"
33-
#include "qapi/qmp/qstring.h"
32+
#include "qobject/qdict.h"
33+
#include "qobject/qstring.h"
3434
#include "crypto/secret.h"
3535
#include <curl/curl.h>
3636
#include "qemu/cutils.h"

‎block/file-posix.c

+2-2
Original file line numberDiff line numberDiff line change
@@ -36,8 +36,8 @@
3636
#include "block/thread-pool.h"
3737
#include "qemu/iov.h"
3838
#include "block/raw-aio.h"
39-
#include "qapi/qmp/qdict.h"
40-
#include "qapi/qmp/qstring.h"
39+
#include "qobject/qdict.h"
40+
#include "qobject/qstring.h"
4141

4242
#include "scsi/pr-manager.h"
4343
#include "scsi/constants.h"

‎block/file-win32.c

+2-2
Original file line numberDiff line numberDiff line change
@@ -33,8 +33,8 @@
3333
#include "trace.h"
3434
#include "block/thread-pool.h"
3535
#include "qemu/iov.h"
36-
#include "qapi/qmp/qdict.h"
37-
#include "qapi/qmp/qstring.h"
36+
#include "qobject/qdict.h"
37+
#include "qobject/qstring.h"
3838
#include <windows.h>
3939
#include <winioctl.h>
4040

‎block/gluster.c

+1-1
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
#include "block/block_int.h"
1616
#include "block/qdict.h"
1717
#include "qapi/error.h"
18-
#include "qapi/qmp/qdict.h"
18+
#include "qobject/qdict.h"
1919
#include "qapi/qmp/qerror.h"
2020
#include "qemu/error-report.h"
2121
#include "qemu/module.h"

‎block/iscsi.c

+2-2
Original file line numberDiff line numberDiff line change
@@ -44,8 +44,8 @@
4444
#include "system/replay.h"
4545
#include "qapi/error.h"
4646
#include "qapi/qapi-commands-machine.h"
47-
#include "qapi/qmp/qdict.h"
48-
#include "qapi/qmp/qstring.h"
47+
#include "qobject/qdict.h"
48+
#include "qobject/qstring.h"
4949
#include "crypto/secret.h"
5050
#include "scsi/utils.h"
5151
#include "trace.h"

‎block/monitor/block-hmp-cmds.c

+1-1
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@
4141
#include "system/blockdev.h"
4242
#include "qapi/qapi-commands-block.h"
4343
#include "qapi/qapi-commands-block-export.h"
44-
#include "qapi/qmp/qdict.h"
44+
#include "qobject/qdict.h"
4545
#include "qapi/error.h"
4646
#include "qapi/qmp/qerror.h"
4747
#include "qemu/config-file.h"

‎block/nbd.c

+1-1
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@
3636
#include "qemu/main-loop.h"
3737

3838
#include "qapi/qapi-visit-sockets.h"
39-
#include "qapi/qmp/qstring.h"
39+
#include "qobject/qstring.h"
4040
#include "qapi/clone-visitor.h"
4141

4242
#include "block/qdict.h"

‎block/nfs.c

+2-2
Original file line numberDiff line numberDiff line change
@@ -41,8 +41,8 @@
4141
#include "qemu/cutils.h"
4242
#include "system/replay.h"
4343
#include "qapi/qapi-visit-block-core.h"
44-
#include "qapi/qmp/qdict.h"
45-
#include "qapi/qmp/qstring.h"
44+
#include "qobject/qdict.h"
45+
#include "qobject/qstring.h"
4646
#include "qapi/qobject-input-visitor.h"
4747
#include "qapi/qobject-output-visitor.h"
4848
#include <nfsc/libnfs.h>

‎block/null.c

+2-2
Original file line numberDiff line numberDiff line change
@@ -12,8 +12,8 @@
1212

1313
#include "qemu/osdep.h"
1414
#include "qapi/error.h"
15-
#include "qapi/qmp/qdict.h"
16-
#include "qapi/qmp/qstring.h"
15+
#include "qobject/qdict.h"
16+
#include "qobject/qstring.h"
1717
#include "qemu/module.h"
1818
#include "qemu/option.h"
1919
#include "block/block-io.h"

‎block/nvme.c

+2-2
Original file line numberDiff line numberDiff line change
@@ -14,8 +14,8 @@
1414
#include "qemu/osdep.h"
1515
#include <linux/vfio.h>
1616
#include "qapi/error.h"
17-
#include "qapi/qmp/qdict.h"
18-
#include "qapi/qmp/qstring.h"
17+
#include "qobject/qdict.h"
18+
#include "qobject/qstring.h"
1919
#include "qemu/defer-call.h"
2020
#include "qemu/error-report.h"
2121
#include "qemu/main-loop.h"

‎block/parallels.c

+1-1
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@
3636
#include "system/block-backend.h"
3737
#include "qemu/module.h"
3838
#include "qemu/option.h"
39-
#include "qapi/qmp/qdict.h"
39+
#include "qobject/qdict.h"
4040
#include "qapi/qobject-input-visitor.h"
4141
#include "qapi/qapi-visit-block-core.h"
4242
#include "qemu/bswap.h"

‎block/qapi-system.c

+1-1
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@
3535
#include "block/block_int.h"
3636
#include "qapi/error.h"
3737
#include "qapi/qapi-commands-block.h"
38-
#include "qapi/qmp/qdict.h"
38+
#include "qobject/qdict.h"
3939
#include "system/block-backend.h"
4040
#include "system/blockdev.h"
4141

‎block/qapi.c

+5-5
Original file line numberDiff line numberDiff line change
@@ -33,11 +33,11 @@
3333
#include "qapi/qapi-commands-block-core.h"
3434
#include "qapi/qobject-output-visitor.h"
3535
#include "qapi/qapi-visit-block-core.h"
36-
#include "qapi/qmp/qbool.h"
37-
#include "qapi/qmp/qdict.h"
38-
#include "qapi/qmp/qlist.h"
39-
#include "qapi/qmp/qnum.h"
40-
#include "qapi/qmp/qstring.h"
36+
#include "qobject/qbool.h"
37+
#include "qobject/qdict.h"
38+
#include "qobject/qlist.h"
39+
#include "qobject/qnum.h"
40+
#include "qobject/qstring.h"
4141
#include "qemu/qemu-print.h"
4242
#include "system/block-backend.h"
4343

‎block/qcow.c

+2-2
Original file line numberDiff line numberDiff line change
@@ -34,8 +34,8 @@
3434
#include "qemu/cutils.h"
3535
#include "qemu/memalign.h"
3636
#include <zlib.h>
37-
#include "qapi/qmp/qdict.h"
38-
#include "qapi/qmp/qstring.h"
37+
#include "qobject/qdict.h"
38+
#include "qobject/qstring.h"
3939
#include "qapi/qobject-input-visitor.h"
4040
#include "qapi/qapi-visit-block-core.h"
4141
#include "crypto/block.h"

‎block/qcow2.c

+2-2
Original file line numberDiff line numberDiff line change
@@ -32,8 +32,8 @@
3232
#include "qemu/error-report.h"
3333
#include "qapi/error.h"
3434
#include "qapi/qapi-events-block-core.h"
35-
#include "qapi/qmp/qdict.h"
36-
#include "qapi/qmp/qstring.h"
35+
#include "qobject/qdict.h"
36+
#include "qobject/qstring.h"
3737
#include "trace.h"
3838
#include "qemu/option_int.h"
3939
#include "qemu/cutils.h"

‎block/qed.c

+1-1
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@
2424
#include "trace.h"
2525
#include "qed.h"
2626
#include "system/block-backend.h"
27-
#include "qapi/qmp/qdict.h"
27+
#include "qobject/qdict.h"
2828
#include "qapi/qobject-input-visitor.h"
2929
#include "qapi/qapi-visit-block-core.h"
3030

‎block/quorum.c

+3-3
Original file line numberDiff line numberDiff line change
@@ -23,10 +23,10 @@
2323
#include "block/qdict.h"
2424
#include "qapi/error.h"
2525
#include "qapi/qapi-events-block.h"
26-
#include "qapi/qmp/qdict.h"
26+
#include "qobject/qdict.h"
2727
#include "qapi/qmp/qerror.h"
28-
#include "qapi/qmp/qlist.h"
29-
#include "qapi/qmp/qstring.h"
28+
#include "qobject/qlist.h"
29+
#include "qobject/qstring.h"
3030
#include "crypto/hash.h"
3131

3232
#define HASH_LENGTH 32

‎block/rbd.c

+4-4
Original file line numberDiff line numberDiff line change
@@ -24,10 +24,10 @@
2424
#include "crypto/secret.h"
2525
#include "qemu/cutils.h"
2626
#include "system/replay.h"
27-
#include "qapi/qmp/qstring.h"
28-
#include "qapi/qmp/qdict.h"
29-
#include "qapi/qmp/qjson.h"
30-
#include "qapi/qmp/qlist.h"
27+
#include "qobject/qstring.h"
28+
#include "qobject/qdict.h"
29+
#include "qobject/qjson.h"
30+
#include "qobject/qlist.h"
3131
#include "qapi/qobject-input-visitor.h"
3232
#include "qapi/qapi-visit-block-core.h"
3333

‎block/replication.c

+1-1
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@
2121
#include "block/block_backup.h"
2222
#include "system/block-backend.h"
2323
#include "qapi/error.h"
24-
#include "qapi/qmp/qdict.h"
24+
#include "qobject/qdict.h"
2525
#include "block/replication.h"
2626

2727
typedef enum {

‎block/snapshot.c

+2-2
Original file line numberDiff line numberDiff line change
@@ -27,8 +27,8 @@
2727
#include "block/block_int.h"
2828
#include "block/qdict.h"
2929
#include "qapi/error.h"
30-
#include "qapi/qmp/qdict.h"
31-
#include "qapi/qmp/qstring.h"
30+
#include "qobject/qdict.h"
31+
#include "qobject/qstring.h"
3232
#include "qemu/option.h"
3333
#include "system/block-backend.h"
3434

‎block/ssh.c

+2-2
Original file line numberDiff line numberDiff line change
@@ -39,8 +39,8 @@
3939
#include "qemu/sockets.h"
4040
#include "qapi/qapi-visit-sockets.h"
4141
#include "qapi/qapi-visit-block-core.h"
42-
#include "qapi/qmp/qdict.h"
43-
#include "qapi/qmp/qstring.h"
42+
#include "qobject/qdict.h"
43+
#include "qobject/qstring.h"
4444
#include "qapi/qobject-input-visitor.h"
4545
#include "qapi/qobject-output-visitor.h"
4646
#include "trace.h"

‎block/stream.c

+1-1
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616
#include "block/block_int.h"
1717
#include "block/blockjob_int.h"
1818
#include "qapi/error.h"
19-
#include "qapi/qmp/qdict.h"
19+
#include "qobject/qdict.h"
2020
#include "qemu/ratelimit.h"
2121
#include "system/block-backend.h"
2222
#include "block/copy-on-read.h"

‎block/vhdx.c

+1-1
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@
2929
#include "vhdx.h"
3030
#include "migration/blocker.h"
3131
#include "qemu/uuid.h"
32-
#include "qapi/qmp/qdict.h"
32+
#include "qobject/qdict.h"
3333
#include "qapi/qobject-input-visitor.h"
3434
#include "qapi/qapi-visit-block-core.h"
3535

‎block/vmdk.c

+1-1
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@
2727
#include "qapi/error.h"
2828
#include "block/block_int.h"
2929
#include "system/block-backend.h"
30-
#include "qapi/qmp/qdict.h"
30+
#include "qobject/qdict.h"
3131
#include "qemu/error-report.h"
3232
#include "qemu/module.h"
3333
#include "qemu/option.h"

‎block/vpc.c

+1-1
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@
3434
#include "qemu/bswap.h"
3535
#include "qemu/uuid.h"
3636
#include "qemu/memalign.h"
37-
#include "qapi/qmp/qdict.h"
37+
#include "qobject/qdict.h"
3838
#include "qapi/qobject-input-visitor.h"
3939
#include "qapi/qapi-visit-block-core.h"
4040

0 commit comments

Comments
 (0)