motorhead/qemu
1
0
Fork 0
mirror of https://github.com/Motorhead1991/qemu.git synced 2025-08-27 12:02:04 -06:00
Code Issues Projects Releases Packages Wiki Activity Actions

QAPI patches patches for 2025-02-10

Browse source 
-----BEGIN PGP SIGNATURE-----
 
 iQJGBAABCAAwFiEENUvIs9frKmtoZ05fOHC0AOuRhlMFAmeqEXESHGFybWJydUBy
 ZWRoYXQuY29tAAoJEDhwtADrkYZTaOEP/2VYKkb2VzPdWzyQcEx66MJ+1RjcEy1A
 JtD6mTdpEuti5NgrUUOSHjrd6P3DVNZL8SMPD21F4/I1t0u+ztfCtx65YKrKo8hV
 jCnYS5w2i/YT3Cpz052yEhUoPgxj4kQiR3gqbLkpBKV7lh6wZ3+gVTNW8DJzPW/R
 MmE9vkOCLhjmkodxRiVa7df73qMEm4nfbmQjM9SWBU55AC2xElptjJo0Sc7sMT3n
 HdoLjXKfjUCIpmI3LfbRvS3Tyxd9gQn/la2yf3gaXJ0qrbP4xyu5VCzAOla5myuC
 XyakLUu9DOsfNuHXvKX+M8jE7pf6wibLMfVhPigACob2LAa4Zo7LvCKqjhclTNhK
 +/PvTGrirnGweNWXz5/2tG97F7oSzX2m182LyuloQbaehXAtpAuHehSCQUet6HOu
 CEUOeV7D13nxcgxXT1GvQIqsTYRtIJvY8DM3tRoCAzDv/KNdXF4M/ybtUHmyHUkg
 kspwCRfQJ1sNRdmj7oBtmWvvbYBk/zKvt84yOQZFYocmofp18KVLDN+hzEAHvHQE
 4t8yCktjrGGC0bCgIaQkBaeU7nxMWXBOOlYcejnXTR4VPTDTRKMAosmAotcd9d5H
 QgGjcMhbDPJHavi36JdJQgxuwl4LskwLCdenBfXhmH8ePIWhjIqqzcdDJy0UcH0x
 pX8L/Jsd42qD
 =jFK8
 -----END PGP SIGNATURE-----

Merge tag 'pull-qapi-2025-02-10-v2' of https://repo.or.cz/qemu/armbru into staging

QAPI patches patches for 2025-02-10

# -----BEGIN PGP SIGNATURE-----
#
# iQJGBAABCAAwFiEENUvIs9frKmtoZ05fOHC0AOuRhlMFAmeqEXESHGFybWJydUBy
# ZWRoYXQuY29tAAoJEDhwtADrkYZTaOEP/2VYKkb2VzPdWzyQcEx66MJ+1RjcEy1A
# JtD6mTdpEuti5NgrUUOSHjrd6P3DVNZL8SMPD21F4/I1t0u+ztfCtx65YKrKo8hV
# jCnYS5w2i/YT3Cpz052yEhUoPgxj4kQiR3gqbLkpBKV7lh6wZ3+gVTNW8DJzPW/R
# MmE9vkOCLhjmkodxRiVa7df73qMEm4nfbmQjM9SWBU55AC2xElptjJo0Sc7sMT3n
# HdoLjXKfjUCIpmI3LfbRvS3Tyxd9gQn/la2yf3gaXJ0qrbP4xyu5VCzAOla5myuC
# XyakLUu9DOsfNuHXvKX+M8jE7pf6wibLMfVhPigACob2LAa4Zo7LvCKqjhclTNhK
# +/PvTGrirnGweNWXz5/2tG97F7oSzX2m182LyuloQbaehXAtpAuHehSCQUet6HOu
# CEUOeV7D13nxcgxXT1GvQIqsTYRtIJvY8DM3tRoCAzDv/KNdXF4M/ybtUHmyHUkg
# kspwCRfQJ1sNRdmj7oBtmWvvbYBk/zKvt84yOQZFYocmofp18KVLDN+hzEAHvHQE
# 4t8yCktjrGGC0bCgIaQkBaeU7nxMWXBOOlYcejnXTR4VPTDTRKMAosmAotcd9d5H
# QgGjcMhbDPJHavi36JdJQgxuwl4LskwLCdenBfXhmH8ePIWhjIqqzcdDJy0UcH0x
# pX8L/Jsd42qD
# =jFK8
# -----END PGP SIGNATURE-----
# gpg: Signature made Mon 10 Feb 2025 09:47:13 EST
# gpg:                using RSA key 354BC8B3D7EB2A6B68674E5F3870B400EB918653
# gpg:                issuer "armbru@redhat.com"
# gpg: Good signature from "Markus Armbruster <armbru@redhat.com>" [full]
# gpg:                 aka "Markus Armbruster <armbru@pond.sub.org>" [full]
# Primary key fingerprint: 354B C8B3 D7EB 2A6B 6867  4E5F 3870 B400 EB91 8653

* tag 'pull-qapi-2025-02-10-v2' of https://repo.or.cz/qemu/armbru:
  qapi: expose all schema features to code
  qapi: rename 'special_features' to 'features'
  qapi: change 'unsigned special_features' to 'uint64_t features'
  qapi: cope with feature names containing a '-'
  qapi/ui: Fix documentation of upper bound value in InputMoveEvent
  qapi: fix colon in Since tag section
  qapi: Move and rename qapi/qmp/dispatch.h to qapi/qmp-registry.h
  qapi: Move include/qapi/qmp/ to include/qobject/

Signed-off-by: Stefan Hajnoczi <stefanha@redhat.com>
This commit is contained in:
Stefan Hajnoczi 2025-02-10 10:47:31 -05:00
commit 54e91d1523
273 changed files with 1142 additions and 519 deletions
Download patch file Download diff file Expand all files Collapse all files

5
MAINTAINERS
View file

@ -3235,8 +3235,6 @@ S: Supported
F: qapi/ F: qapi/
X: qapi/*.json X: qapi/*.json
F: include/qapi/ F: include/qapi/
X: include/qapi/qmp/
F: include/qapi/qmp/dispatch.h
F: tests/qapi-schema/ F: tests/qapi-schema/
F: tests/unit/test-*-visitor.c F: tests/unit/test-*-visitor.c
F: tests/unit/test-qapi-*.c F: tests/unit/test-qapi-*.c
@ -3260,8 +3258,7 @@ QObject
M: Markus Armbruster <armbru@redhat.com> M: Markus Armbruster <armbru@redhat.com>
S: Supported S: Supported
F: qobject/ F: qobject/
F: include/qapi/qmp/ F: include/qobject/
X: include/qapi/qmp/dispatch.h
F: scripts/coccinelle/qobject.cocci F: scripts/coccinelle/qobject.cocci
F: tests/unit/check-qdict.c F: tests/unit/check-qdict.c
F: tests/unit/check-qjson.c F: tests/unit/check-qjson.c

2
audio/audio-hmp-cmds.c
View file

@ -27,7 +27,7 @@
#include "monitor/hmp.h" #include "monitor/hmp.h"
#include "monitor/monitor.h" #include "monitor/monitor.h"
#include "qapi/error.h" #include "qapi/error.h"
#include "qapi/qmp/qdict.h" #include "qobject/qdict.h"
static QLIST_HEAD (capture_list_head, CaptureState) capture_head; static QLIST_HEAD (capture_list_head, CaptureState) capture_head;

2
audio/audio.c
View file

@ -32,7 +32,7 @@
#include "qapi/qobject-input-visitor.h" #include "qapi/qobject-input-visitor.h"
#include "qapi/qapi-visit-audio.h" #include "qapi/qapi-visit-audio.h"
#include "qapi/qapi-commands-audio.h" #include "qapi/qapi-commands-audio.h"
#include "qapi/qmp/qdict.h" #include "qobject/qdict.h"
#include "qemu/cutils.h" #include "qemu/cutils.h"
#include "qemu/error-report.h" #include "qemu/error-report.h"
#include "qemu/log.h" #include "qemu/log.h"

4
authz/listfile.c
View file

@ -28,8 +28,8 @@
#include "qemu/filemonitor.h" #include "qemu/filemonitor.h"
#include "qom/object_interfaces.h" #include "qom/object_interfaces.h"
#include "qapi/qapi-visit-authz.h" #include "qapi/qapi-visit-authz.h"
#include "qapi/qmp/qjson.h" #include "qobject/qjson.h"
#include "qapi/qmp/qobject.h" #include "qobject/qobject.h"
#include "qapi/qobject-input-visitor.h" #include "qapi/qobject-input-visitor.h"

2
backends/cryptodev-hmp-cmds.c
View file

@ -14,7 +14,7 @@
#include "monitor/hmp.h" #include "monitor/hmp.h"
#include "monitor/monitor.h" #include "monitor/monitor.h"
#include "qapi/qapi-commands-cryptodev.h" #include "qapi/qapi-commands-cryptodev.h"
#include "qapi/qmp/qdict.h" #include "qobject/qdict.h"
void hmp_info_cryptodev(Monitor *mon, const QDict *qdict) void hmp_info_cryptodev(Monitor *mon, const QDict *qdict)

8
block.c
View file

@ -36,10 +36,10 @@
#include "qemu/main-loop.h" #include "qemu/main-loop.h"
#include "qemu/module.h" #include "qemu/module.h"
#include "qapi/error.h" #include "qapi/error.h"
#include "qapi/qmp/qdict.h" #include "qobject/qdict.h"
#include "qapi/qmp/qjson.h" #include "qobject/qjson.h"
#include "qapi/qmp/qnull.h" #include "qobject/qnull.h"
#include "qapi/qmp/qstring.h" #include "qobject/qstring.h"
#include "qapi/qobject-output-visitor.h" #include "qapi/qobject-output-visitor.h"
#include "qapi/qapi-visit-block-core.h" #include "qapi/qapi-visit-block-core.h"
#include "system/block-backend.h" #include "system/block-backend.h"

6
block/blkdebug.c
View file

@ -33,9 +33,9 @@
#include "qemu/module.h" #include "qemu/module.h"
#include "qemu/option.h" #include "qemu/option.h"
#include "qapi/qapi-visit-block-core.h" #include "qapi/qapi-visit-block-core.h"
#include "qapi/qmp/qdict.h" #include "qobject/qdict.h"
#include "qapi/qmp/qlist.h" #include "qobject/qlist.h"
#include "qapi/qmp/qstring.h" #include "qobject/qstring.h"
#include "qapi/qobject-input-visitor.h" #include "qapi/qobject-input-visitor.h"
#include "system/qtest.h" #include "system/qtest.h"

2
block/blkio.c
View file

@ -16,7 +16,7 @@
#include "qemu/defer-call.h" #include "qemu/defer-call.h"
#include "qapi/error.h" #include "qapi/error.h"
#include "qemu/error-report.h" #include "qemu/error-report.h"
#include "qapi/qmp/qdict.h" #include "qobject/qdict.h"
#include "qemu/module.h" #include "qemu/module.h"
#include "system/block-backend.h" #include "system/block-backend.h"
#include "exec/memory.h" /* for ram_block_discard_disable() */ #include "exec/memory.h" /* for ram_block_discard_disable() */

4
block/blklogwrites.c
View file

@ -14,8 +14,8 @@
#include "qemu/sockets.h" /* for EINPROGRESS on Windows */ #include "qemu/sockets.h" /* for EINPROGRESS on Windows */
#include "block/block-io.h" #include "block/block-io.h"
#include "block/block_int.h" #include "block/block_int.h"
#include "qapi/qmp/qdict.h" #include "qobject/qdict.h"
#include "qapi/qmp/qstring.h" #include "qobject/qstring.h"
#include "qemu/cutils.h" #include "qemu/cutils.h"
#include "qemu/module.h" #include "qemu/module.h"
#include "qemu/option.h" #include "qemu/option.h"

4
block/blkverify.c
View file

@ -12,8 +12,8 @@
#include "qemu/sockets.h" /* for EINPROGRESS on Windows */ #include "qemu/sockets.h" /* for EINPROGRESS on Windows */
#include "block/block-io.h" #include "block/block-io.h"
#include "block/block_int.h" #include "block/block_int.h"
#include "qapi/qmp/qdict.h" #include "qobject/qdict.h"
#include "qapi/qmp/qstring.h" #include "qobject/qstring.h"
#include "qemu/cutils.h" #include "qemu/cutils.h"
#include "qemu/module.h" #include "qemu/module.h"
#include "qemu/option.h" #include "qemu/option.h"

2
block/copy-before-write.c
View file

@ -24,7 +24,7 @@
*/ */
#include "qemu/osdep.h" #include "qemu/osdep.h"
#include "qapi/qmp/qjson.h" #include "qobject/qjson.h"
#include "system/block-backend.h" #include "system/block-backend.h"
#include "qemu/cutils.h" #include "qemu/cutils.h"

2
block/copy-on-read.c
View file

@ -25,7 +25,7 @@
#include "block/block_int.h" #include "block/block_int.h"
#include "qemu/module.h" #include "qemu/module.h"
#include "qapi/error.h" #include "qapi/error.h"
#include "qapi/qmp/qdict.h" #include "qobject/qdict.h"
#include "block/copy-on-read.h" #include "block/copy-on-read.h"

4
block/curl.c
View file

@ -29,8 +29,8 @@
#include "qemu/option.h" #include "qemu/option.h"
#include "block/block-io.h" #include "block/block-io.h"
#include "block/block_int.h" #include "block/block_int.h"
#include "qapi/qmp/qdict.h" #include "qobject/qdict.h"
#include "qapi/qmp/qstring.h" #include "qobject/qstring.h"
#include "crypto/secret.h" #include "crypto/secret.h"
#include <curl/curl.h> #include <curl/curl.h>
#include "qemu/cutils.h" #include "qemu/cutils.h"

4
block/file-posix.c
View file

@ -36,8 +36,8 @@
#include "block/thread-pool.h" #include "block/thread-pool.h"
#include "qemu/iov.h" #include "qemu/iov.h"
#include "block/raw-aio.h" #include "block/raw-aio.h"
#include "qapi/qmp/qdict.h" #include "qobject/qdict.h"
#include "qapi/qmp/qstring.h" #include "qobject/qstring.h"
#include "scsi/pr-manager.h" #include "scsi/pr-manager.h"
#include "scsi/constants.h" #include "scsi/constants.h"

4
block/file-win32.c
View file

@ -33,8 +33,8 @@
#include "trace.h" #include "trace.h"
#include "block/thread-pool.h" #include "block/thread-pool.h"
#include "qemu/iov.h" #include "qemu/iov.h"
#include "qapi/qmp/qdict.h" #include "qobject/qdict.h"
#include "qapi/qmp/qstring.h" #include "qobject/qstring.h"
#include <windows.h> #include <windows.h>
#include <winioctl.h> #include <winioctl.h>

2
block/gluster.c
View file

@ -15,7 +15,7 @@
#include "block/block_int.h" #include "block/block_int.h"
#include "block/qdict.h" #include "block/qdict.h"
#include "qapi/error.h" #include "qapi/error.h"
#include "qapi/qmp/qdict.h" #include "qobject/qdict.h"
#include "qapi/qmp/qerror.h" #include "qapi/qmp/qerror.h"
#include "qemu/error-report.h" #include "qemu/error-report.h"
#include "qemu/module.h" #include "qemu/module.h"

4
block/iscsi.c
View file

@ -44,8 +44,8 @@
#include "system/replay.h" #include "system/replay.h"
#include "qapi/error.h" #include "qapi/error.h"
#include "qapi/qapi-commands-machine.h" #include "qapi/qapi-commands-machine.h"
#include "qapi/qmp/qdict.h" #include "qobject/qdict.h"
#include "qapi/qmp/qstring.h" #include "qobject/qstring.h"
#include "crypto/secret.h" #include "crypto/secret.h"
#include "scsi/utils.h" #include "scsi/utils.h"
#include "trace.h" #include "trace.h"

2
block/monitor/block-hmp-cmds.c
View file

@ -41,7 +41,7 @@
#include "system/blockdev.h" #include "system/blockdev.h"
#include "qapi/qapi-commands-block.h" #include "qapi/qapi-commands-block.h"
#include "qapi/qapi-commands-block-export.h" #include "qapi/qapi-commands-block-export.h"
#include "qapi/qmp/qdict.h" #include "qobject/qdict.h"
#include "qapi/error.h" #include "qapi/error.h"
#include "qapi/qmp/qerror.h" #include "qapi/qmp/qerror.h"
#include "qemu/config-file.h" #include "qemu/config-file.h"

2
block/nbd.c
View file

@ -36,7 +36,7 @@
#include "qemu/main-loop.h" #include "qemu/main-loop.h"
#include "qapi/qapi-visit-sockets.h" #include "qapi/qapi-visit-sockets.h"
#include "qapi/qmp/qstring.h" #include "qobject/qstring.h"
#include "qapi/clone-visitor.h" #include "qapi/clone-visitor.h"
#include "block/qdict.h" #include "block/qdict.h"

4
block/nfs.c
View file

@ -41,8 +41,8 @@
#include "qemu/cutils.h" #include "qemu/cutils.h"
#include "system/replay.h" #include "system/replay.h"
#include "qapi/qapi-visit-block-core.h" #include "qapi/qapi-visit-block-core.h"
#include "qapi/qmp/qdict.h" #include "qobject/qdict.h"
#include "qapi/qmp/qstring.h" #include "qobject/qstring.h"
#include "qapi/qobject-input-visitor.h" #include "qapi/qobject-input-visitor.h"
#include "qapi/qobject-output-visitor.h" #include "qapi/qobject-output-visitor.h"
#include <nfsc/libnfs.h> #include <nfsc/libnfs.h>

4
block/null.c
View file

@ -12,8 +12,8 @@
#include "qemu/osdep.h" #include "qemu/osdep.h"
#include "qapi/error.h" #include "qapi/error.h"
#include "qapi/qmp/qdict.h" #include "qobject/qdict.h"
#include "qapi/qmp/qstring.h" #include "qobject/qstring.h"
#include "qemu/module.h" #include "qemu/module.h"
#include "qemu/option.h" #include "qemu/option.h"
#include "block/block-io.h" #include "block/block-io.h"

4
block/nvme.c
View file

@ -14,8 +14,8 @@
#include "qemu/osdep.h" #include "qemu/osdep.h"
#include <linux/vfio.h> #include <linux/vfio.h>
#include "qapi/error.h" #include "qapi/error.h"
#include "qapi/qmp/qdict.h" #include "qobject/qdict.h"
#include "qapi/qmp/qstring.h" #include "qobject/qstring.h"
#include "qemu/defer-call.h" #include "qemu/defer-call.h"
#include "qemu/error-report.h" #include "qemu/error-report.h"
#include "qemu/main-loop.h" #include "qemu/main-loop.h"

2
block/parallels.c
View file

@ -36,7 +36,7 @@
#include "system/block-backend.h" #include "system/block-backend.h"
#include "qemu/module.h" #include "qemu/module.h"
#include "qemu/option.h" #include "qemu/option.h"
#include "qapi/qmp/qdict.h" #include "qobject/qdict.h"
#include "qapi/qobject-input-visitor.h" #include "qapi/qobject-input-visitor.h"
#include "qapi/qapi-visit-block-core.h" #include "qapi/qapi-visit-block-core.h"
#include "qemu/bswap.h" #include "qemu/bswap.h"

2
block/qapi-system.c
View file

@ -35,7 +35,7 @@
#include "block/block_int.h" #include "block/block_int.h"
#include "qapi/error.h" #include "qapi/error.h"
#include "qapi/qapi-commands-block.h" #include "qapi/qapi-commands-block.h"
#include "qapi/qmp/qdict.h" #include "qobject/qdict.h"
#include "system/block-backend.h" #include "system/block-backend.h"
#include "system/blockdev.h" #include "system/blockdev.h"

10
block/qapi.c
View file

@ -33,11 +33,11 @@
#include "qapi/qapi-commands-block-core.h" #include "qapi/qapi-commands-block-core.h"
#include "qapi/qobject-output-visitor.h" #include "qapi/qobject-output-visitor.h"
#include "qapi/qapi-visit-block-core.h" #include "qapi/qapi-visit-block-core.h"
#include "qapi/qmp/qbool.h" #include "qobject/qbool.h"
#include "qapi/qmp/qdict.h" #include "qobject/qdict.h"
#include "qapi/qmp/qlist.h" #include "qobject/qlist.h"
#include "qapi/qmp/qnum.h" #include "qobject/qnum.h"
#include "qapi/qmp/qstring.h" #include "qobject/qstring.h"
#include "qemu/qemu-print.h" #include "qemu/qemu-print.h"
#include "system/block-backend.h" #include "system/block-backend.h"

4
block/qcow.c
View file

@ -34,8 +34,8 @@
#include "qemu/cutils.h" #include "qemu/cutils.h"
#include "qemu/memalign.h" #include "qemu/memalign.h"
#include <zlib.h> #include <zlib.h>
#include "qapi/qmp/qdict.h" #include "qobject/qdict.h"
#include "qapi/qmp/qstring.h" #include "qobject/qstring.h"
#include "qapi/qobject-input-visitor.h" #include "qapi/qobject-input-visitor.h"
#include "qapi/qapi-visit-block-core.h" #include "qapi/qapi-visit-block-core.h"
#include "crypto/block.h" #include "crypto/block.h"

4
block/qcow2.c
View file

@ -32,8 +32,8 @@
#include "qemu/error-report.h" #include "qemu/error-report.h"
#include "qapi/error.h" #include "qapi/error.h"
#include "qapi/qapi-events-block-core.h" #include "qapi/qapi-events-block-core.h"
#include "qapi/qmp/qdict.h" #include "qobject/qdict.h"
#include "qapi/qmp/qstring.h" #include "qobject/qstring.h"
#include "trace.h" #include "trace.h"
#include "qemu/option_int.h" #include "qemu/option_int.h"
#include "qemu/cutils.h" #include "qemu/cutils.h"

2
block/qed.c
View file

@ -24,7 +24,7 @@
#include "trace.h" #include "trace.h"
#include "qed.h" #include "qed.h"
#include "system/block-backend.h" #include "system/block-backend.h"
#include "qapi/qmp/qdict.h" #include "qobject/qdict.h"
#include "qapi/qobject-input-visitor.h" #include "qapi/qobject-input-visitor.h"
#include "qapi/qapi-visit-block-core.h" #include "qapi/qapi-visit-block-core.h"

6
block/quorum.c
View file

@ -23,10 +23,10 @@
#include "block/qdict.h" #include "block/qdict.h"
#include "qapi/error.h" #include "qapi/error.h"
#include "qapi/qapi-events-block.h" #include "qapi/qapi-events-block.h"
#include "qapi/qmp/qdict.h" #include "qobject/qdict.h"
#include "qapi/qmp/qerror.h" #include "qapi/qmp/qerror.h"
#include "qapi/qmp/qlist.h" #include "qobject/qlist.h"
#include "qapi/qmp/qstring.h" #include "qobject/qstring.h"
#include "crypto/hash.h" #include "crypto/hash.h"
#define HASH_LENGTH 32 #define HASH_LENGTH 32

8
block/rbd.c
View file

@ -24,10 +24,10 @@
#include "crypto/secret.h" #include "crypto/secret.h"
#include "qemu/cutils.h" #include "qemu/cutils.h"
#include "system/replay.h" #include "system/replay.h"
#include "qapi/qmp/qstring.h" #include "qobject/qstring.h"
#include "qapi/qmp/qdict.h" #include "qobject/qdict.h"
#include "qapi/qmp/qjson.h" #include "qobject/qjson.h"
#include "qapi/qmp/qlist.h" #include "qobject/qlist.h"
#include "qapi/qobject-input-visitor.h" #include "qapi/qobject-input-visitor.h"
#include "qapi/qapi-visit-block-core.h" #include "qapi/qapi-visit-block-core.h"

2
block/replication.c
View file

@ -21,7 +21,7 @@
#include "block/block_backup.h" #include "block/block_backup.h"
#include "system/block-backend.h" #include "system/block-backend.h"
#include "qapi/error.h" #include "qapi/error.h"
#include "qapi/qmp/qdict.h" #include "qobject/qdict.h"
#include "block/replication.h" #include "block/replication.h"
typedef enum { typedef enum {

4
block/snapshot.c
View file

@ -27,8 +27,8 @@
#include "block/block_int.h" #include "block/block_int.h"
#include "block/qdict.h" #include "block/qdict.h"
#include "qapi/error.h" #include "qapi/error.h"
#include "qapi/qmp/qdict.h" #include "qobject/qdict.h"
#include "qapi/qmp/qstring.h" #include "qobject/qstring.h"
#include "qemu/option.h" #include "qemu/option.h"
#include "system/block-backend.h" #include "system/block-backend.h"

4
block/ssh.c
View file

@ -39,8 +39,8 @@
#include "qemu/sockets.h" #include "qemu/sockets.h"
#include "qapi/qapi-visit-sockets.h" #include "qapi/qapi-visit-sockets.h"
#include "qapi/qapi-visit-block-core.h" #include "qapi/qapi-visit-block-core.h"
#include "qapi/qmp/qdict.h" #include "qobject/qdict.h"
#include "qapi/qmp/qstring.h" #include "qobject/qstring.h"
#include "qapi/qobject-input-visitor.h" #include "qapi/qobject-input-visitor.h"
#include "qapi/qobject-output-visitor.h" #include "qapi/qobject-output-visitor.h"
#include "trace.h" #include "trace.h"

2
block/stream.c
View file

@ -16,7 +16,7 @@
#include "block/block_int.h" #include "block/block_int.h"
#include "block/blockjob_int.h" #include "block/blockjob_int.h"
#include "qapi/error.h" #include "qapi/error.h"
#include "qapi/qmp/qdict.h" #include "qobject/qdict.h"
#include "qemu/ratelimit.h" #include "qemu/ratelimit.h"
#include "system/block-backend.h" #include "system/block-backend.h"
#include "block/copy-on-read.h" #include "block/copy-on-read.h"

2
block/vhdx.c
View file

@ -29,7 +29,7 @@
#include "vhdx.h" #include "vhdx.h"
#include "migration/blocker.h" #include "migration/blocker.h"
#include "qemu/uuid.h" #include "qemu/uuid.h"
#include "qapi/qmp/qdict.h" #include "qobject/qdict.h"
#include "qapi/qobject-input-visitor.h" #include "qapi/qobject-input-visitor.h"
#include "qapi/qapi-visit-block-core.h" #include "qapi/qapi-visit-block-core.h"

2
block/vmdk.c
View file

@ -27,7 +27,7 @@
#include "qapi/error.h" #include "qapi/error.h"
#include "block/block_int.h" #include "block/block_int.h"
#include "system/block-backend.h" #include "system/block-backend.h"
#include "qapi/qmp/qdict.h" #include "qobject/qdict.h"
#include "qemu/error-report.h" #include "qemu/error-report.h"
#include "qemu/module.h" #include "qemu/module.h"
#include "qemu/option.h" #include "qemu/option.h"

2
block/vpc.c
View file

@ -34,7 +34,7 @@
#include "qemu/bswap.h" #include "qemu/bswap.h"
#include "qemu/uuid.h" #include "qemu/uuid.h"
#include "qemu/memalign.h" #include "qemu/memalign.h"
#include "qapi/qmp/qdict.h" #include "qobject/qdict.h"
#include "qapi/qobject-input-visitor.h" #include "qapi/qobject-input-visitor.h"
#include "qapi/qapi-visit-block-core.h" #include "qapi/qapi-visit-block-core.h"

4
block/vvfat.c
View file

@ -34,8 +34,8 @@
#include "qemu/option.h" #include "qemu/option.h"
#include "qemu/bswap.h" #include "qemu/bswap.h"
#include "migration/blocker.h" #include "migration/blocker.h"
#include "qapi/qmp/qdict.h" #include "qobject/qdict.h"
#include "qapi/qmp/qstring.h" #include "qobject/qstring.h"
#include "qemu/ctype.h" #include "qemu/ctype.h"
#include "qemu/cutils.h" #include "qemu/cutils.h"
#include "qemu/error-report.h" #include "qemu/error-report.h"

8
blockdev.c
View file

@ -46,12 +46,12 @@
#include "qapi/qapi-commands-block.h" #include "qapi/qapi-commands-block.h"
#include "qapi/qapi-commands-transaction.h" #include "qapi/qapi-commands-transaction.h"
#include "qapi/qapi-visit-block-core.h" #include "qapi/qapi-visit-block-core.h"
#include "qapi/qmp/qdict.h" #include "qobject/qdict.h"
#include "qapi/qmp/qnum.h" #include "qobject/qnum.h"
#include "qapi/qmp/qstring.h" #include "qobject/qstring.h"
#include "qapi/error.h" #include "qapi/error.h"
#include "qapi/qmp/qerror.h" #include "qapi/qmp/qerror.h"
#include "qapi/qmp/qlist.h" #include "qobject/qlist.h"
#include "qapi/qobject-output-visitor.h" #include "qapi/qobject-output-visitor.h"
#include "system/system.h" #include "system/system.h"
#include "system/iothread.h" #include "system/iothread.h"

2
chardev/char-hmp-cmds.c
View file

@ -19,7 +19,7 @@
#include "monitor/monitor.h" #include "monitor/monitor.h"
#include "qapi/error.h" #include "qapi/error.h"
#include "qapi/qapi-commands-char.h" #include "qapi/qapi-commands-char.h"
#include "qapi/qmp/qdict.h" #include "qobject/qdict.h"
#include "qemu/config-file.h" #include "qemu/config-file.h"
#include "qemu/option.h" #include "qemu/option.h"

4
docs/devel/qapi-code-gen.rst
View file

@ -1855,7 +1855,7 @@ Example::
#ifndef EXAMPLE_QAPI_INIT_COMMANDS_H #ifndef EXAMPLE_QAPI_INIT_COMMANDS_H
#define EXAMPLE_QAPI_INIT_COMMANDS_H #define EXAMPLE_QAPI_INIT_COMMANDS_H
#include "qapi/qmp/dispatch.h" #include "qapi/qmp-registry.h"
void example_qmp_init_marshal(QmpCommandList *cmds); void example_qmp_init_marshal(QmpCommandList *cmds);
@ -1986,7 +1986,7 @@ Example::
#ifndef EXAMPLE_QAPI_INTROSPECT_H #ifndef EXAMPLE_QAPI_INTROSPECT_H
#define EXAMPLE_QAPI_INTROSPECT_H #define EXAMPLE_QAPI_INTROSPECT_H
#include "qapi/qmp/qlit.h" #include "qobject/qlit.h"
extern const QLitObject example_qmp_schema_qlit; extern const QLitObject example_qmp_schema_qlit;

2
dump/dump-hmp-cmds.c
View file

@ -10,7 +10,7 @@
#include "monitor/monitor.h" #include "monitor/monitor.h"
#include "qapi/error.h" #include "qapi/error.h"
#include "qapi/qapi-commands-dump.h" #include "qapi/qapi-commands-dump.h"
#include "qapi/qmp/qdict.h" #include "qobject/qdict.h"
void hmp_dump_guest_memory(Monitor *mon, const QDict *qdict) void hmp_dump_guest_memory(Monitor *mon, const QDict *qdict)
{ {

2
hw/arm/aspeed_ast27x0.c
View file

@ -20,7 +20,7 @@
#include "net/net.h" #include "net/net.h"
#include "system/system.h" #include "system/system.h"
#include "hw/intc/arm_gicv3.h" #include "hw/intc/arm_gicv3.h"
#include "qapi/qmp/qlist.h" #include "qobject/qlist.h"
#include "qemu/log.h" #include "qemu/log.h"
static const hwaddr aspeed_soc_ast2700_memmap[] = { static const hwaddr aspeed_soc_ast2700_memmap[] = {

2
hw/arm/mps2-tz.c
View file

@ -48,7 +48,7 @@
#include "qemu/units.h" #include "qemu/units.h"
#include "qemu/cutils.h" #include "qemu/cutils.h"
#include "qapi/error.h" #include "qapi/error.h"
#include "qapi/qmp/qlist.h" #include "qobject/qlist.h"
#include "qemu/error-report.h" #include "qemu/error-report.h"
#include "hw/arm/boot.h" #include "hw/arm/boot.h"
#include "hw/arm/armv7m.h" #include "hw/arm/armv7m.h"

2
hw/arm/mps2.c
View file

@ -48,7 +48,7 @@
#include "net/net.h" #include "net/net.h"
#include "hw/watchdog/cmsdk-apb-watchdog.h" #include "hw/watchdog/cmsdk-apb-watchdog.h"
#include "hw/qdev-clock.h" #include "hw/qdev-clock.h"
#include "qapi/qmp/qlist.h" #include "qobject/qlist.h"
#include "qom/object.h" #include "qom/object.h"
typedef enum MPS2FPGAType { typedef enum MPS2FPGAType {

2
hw/arm/mps3r.c
View file

@ -27,7 +27,7 @@
#include "qemu/osdep.h" #include "qemu/osdep.h"
#include "qemu/units.h" #include "qemu/units.h"
#include "qapi/error.h" #include "qapi/error.h"
#include "qapi/qmp/qlist.h" #include "qobject/qlist.h"
#include "exec/address-spaces.h" #include "exec/address-spaces.h"
#include "cpu.h" #include "cpu.h"
#include "system/system.h" #include "system/system.h"

2
hw/arm/sbsa-ref.c
View file

@ -48,7 +48,7 @@
#include "hw/char/pl011.h" #include "hw/char/pl011.h"
#include "hw/watchdog/sbsa_gwdt.h" #include "hw/watchdog/sbsa_gwdt.h"
#include "net/net.h" #include "net/net.h"
#include "qapi/qmp/qlist.h" #include "qobject/qlist.h"
#include "qom/object.h" #include "qom/object.h"
#include "target/arm/cpu-qom.h" #include "target/arm/cpu-qom.h"
#include "target/arm/gtimer.h" #include "target/arm/gtimer.h"

2
hw/arm/stellaris.c
View file

@ -32,7 +32,7 @@
#include "hw/timer/stellaris-gptm.h" #include "hw/timer/stellaris-gptm.h"
#include "hw/qdev-clock.h" #include "hw/qdev-clock.h"
#include "qom/object.h" #include "qom/object.h"
#include "qapi/qmp/qlist.h" #include "qobject/qlist.h"
#include "ui/input.h" #include "ui/input.h"
#define GPIO_A 0 #define GPIO_A 0

2
hw/arm/vexpress.c
View file

@ -42,7 +42,7 @@
#include "hw/cpu/a15mpcore.h" #include "hw/cpu/a15mpcore.h"
#include "hw/i2c/arm_sbcon_i2c.h" #include "hw/i2c/arm_sbcon_i2c.h"
#include "hw/sd/sd.h" #include "hw/sd/sd.h"
#include "qapi/qmp/qlist.h" #include "qobject/qlist.h"
#include "qom/object.h" #include "qom/object.h"
#include "audio/audio.h" #include "audio/audio.h"
#include "target/arm/cpu-qom.h" #include "target/arm/cpu-qom.h"

2
hw/arm/virt.c
View file

@ -70,7 +70,7 @@
#include "hw/firmware/smbios.h" #include "hw/firmware/smbios.h"
#include "qapi/visitor.h" #include "qapi/visitor.h"
#include "qapi/qapi-visit-common.h" #include "qapi/qapi-visit-common.h"
#include "qapi/qmp/qlist.h" #include "qobject/qlist.h"
#include "standard-headers/linux/input.h" #include "standard-headers/linux/input.h"
#include "hw/arm/smmuv3.h" #include "hw/arm/smmuv3.h"
#include "hw/acpi/acpi.h" #include "hw/acpi/acpi.h"

2
hw/arm/xlnx-versal.c
View file

@ -12,7 +12,7 @@
#include "qemu/osdep.h" #include "qemu/osdep.h"
#include "qemu/units.h" #include "qemu/units.h"
#include "qapi/error.h" #include "qapi/error.h"
#include "qapi/qmp/qlist.h" #include "qobject/qlist.h"
#include "qemu/module.h" #include "qemu/module.h"
#include "hw/sysbus.h" #include "hw/sysbus.h"
#include "net/net.h" #include "net/net.h"

4
hw/block/xen-block.c
View file

@ -16,8 +16,8 @@
#include "qapi/qapi-visit-block-core.h" #include "qapi/qapi-visit-block-core.h"
#include "qapi/qobject-input-visitor.h" #include "qapi/qobject-input-visitor.h"
#include "qapi/visitor.h" #include "qapi/visitor.h"
#include "qapi/qmp/qdict.h" #include "qobject/qdict.h"
#include "qapi/qmp/qstring.h" #include "qobject/qstring.h"
#include "qom/object_interfaces.h" #include "qom/object_interfaces.h"
#include "hw/block/xen_blkif.h" #include "hw/block/xen_blkif.h"
#include "hw/qdev-properties.h" #include "hw/qdev-properties.h"

2
hw/core/machine-hmp-cmds.c
View file

@ -19,7 +19,7 @@
#include "qapi/error.h" #include "qapi/error.h"
#include "qapi/qapi-builtin-visit.h" #include "qapi/qapi-builtin-visit.h"
#include "qapi/qapi-commands-machine.h" #include "qapi/qapi-commands-machine.h"
#include "qapi/qmp/qdict.h" #include "qobject/qdict.h"
#include "qapi/string-output-visitor.h" #include "qapi/string-output-visitor.h"
#include "qemu/error-report.h" #include "qemu/error-report.h"
#include "system/numa.h" #include "system/numa.h"

2
hw/core/machine-qmp-cmds.c
View file

@ -15,7 +15,7 @@
#include "qapi/error.h" #include "qapi/error.h"
#include "qapi/qapi-builtin-visit.h" #include "qapi/qapi-builtin-visit.h"
#include "qapi/qapi-commands-machine.h" #include "qapi/qapi-commands-machine.h"
#include "qapi/qmp/qobject.h" #include "qobject/qobject.h"
#include "qapi/qobject-input-visitor.h" #include "qapi/qobject-input-visitor.h"
#include "qapi/type-helpers.h" #include "qapi/type-helpers.h"
#include "qemu/uuid.h" #include "qemu/uuid.h"

2
hw/core/qdev-properties.c
View file

@ -2,7 +2,7 @@
#include "hw/qdev-properties.h" #include "hw/qdev-properties.h"
#include "qapi/error.h" #include "qapi/error.h"
#include "qapi/qapi-types-misc.h" #include "qapi/qapi-types-misc.h"
#include "qapi/qmp/qlist.h" #include "qobject/qlist.h"
#include "qemu/ctype.h" #include "qemu/ctype.h"
#include "qemu/error-report.h" #include "qemu/error-report.h"
#include "qapi/visitor.h" #include "qapi/visitor.h"

2
hw/core/qdev.c
View file

@ -28,7 +28,7 @@
#include "qemu/osdep.h" #include "qemu/osdep.h"
#include "qapi/error.h" #include "qapi/error.h"
#include "qapi/qapi-events-qdev.h" #include "qapi/qapi-events-qdev.h"
#include "qapi/qmp/qdict.h" #include "qobject/qdict.h"
#include "qapi/visitor.h" #include "qapi/visitor.h"
#include "qemu/error-report.h" #include "qemu/error-report.h"
#include "qemu/option.h" #include "qemu/option.h"

2
hw/hyperv/hv-balloon.c
View file

@ -26,7 +26,7 @@
#include "qapi/qapi-commands-machine.h" #include "qapi/qapi-commands-machine.h"
#include "qapi/qapi-events-machine.h" #include "qapi/qapi-events-machine.h"
#include "qapi/qapi-types-machine.h" #include "qapi/qapi-types-machine.h"
#include "qapi/qmp/qdict.h" #include "qobject/qdict.h"
#include "qapi/visitor.h" #include "qapi/visitor.h"
#include "qemu/error-report.h" #include "qemu/error-report.h"
#include "qemu/module.h" #include "qemu/module.h"

2
hw/i386/acpi-build.c
View file

@ -22,7 +22,7 @@
#include "qemu/osdep.h" #include "qemu/osdep.h"
#include "qapi/error.h" #include "qapi/error.h"
#include "qapi/qmp/qnum.h" #include "qobject/qnum.h"
#include "acpi-build.h" #include "acpi-build.h"
#include "acpi-common.h" #include "acpi-common.h"
#include "qemu/bitmap.h" #include "qemu/bitmap.h"

2
hw/i386/kvm/xen_evtchn.c
View file

@ -20,7 +20,7 @@
#include "monitor/hmp.h" #include "monitor/hmp.h"
#include "qapi/error.h" #include "qapi/error.h"
#include "qapi/qapi-commands-misc-target.h" #include "qapi/qapi-commands-misc-target.h"
#include "qapi/qmp/qdict.h" #include "qobject/qdict.h"
#include "qom/object.h" #include "qom/object.h"
#include "exec/target_page.h" #include "exec/target_page.h"
#include "exec/address-spaces.h" #include "exec/address-spaces.h"

2
hw/i386/monitor.c
View file

@ -24,7 +24,7 @@
#include "qemu/osdep.h" #include "qemu/osdep.h"
#include "monitor/monitor.h" #include "monitor/monitor.h"
#include "qapi/qmp/qdict.h" #include "qobject/qdict.h"
#include "qapi/error.h" #include "qapi/error.h"
#include "qapi/qapi-commands-misc-target.h" #include "qapi/qapi-commands-misc-target.h"
#include "hw/i386/x86.h" #include "hw/i386/x86.h"

2
hw/i386/pc.c
View file

@ -44,7 +44,7 @@
#include "system/reset.h" #include "system/reset.h"
#include "kvm/kvm_i386.h" #include "kvm/kvm_i386.h"
#include "hw/xen/xen.h" #include "hw/xen/xen.h"
#include "qapi/qmp/qlist.h" #include "qobject/qlist.h"
#include "qemu/error-report.h" #include "qemu/error-report.h"
#include "hw/acpi/cpu_hotplug.h" #include "hw/acpi/cpu_hotplug.h"
#include "acpi-build.h" #include "acpi-build.h"

2
hw/net/rocker/rocker-hmp-cmds.c
View file

@ -18,7 +18,7 @@
#include "monitor/monitor.h" #include "monitor/monitor.h"
#include "net/eth.h" #include "net/eth.h"
#include "qapi/qapi-commands-rocker.h" #include "qapi/qapi-commands-rocker.h"
#include "qapi/qmp/qdict.h" #include "qobject/qdict.h"
void hmp_rocker(Monitor *mon, const QDict *qdict) void hmp_rocker(Monitor *mon, const QDict *qdict)
{ {

2
hw/net/virtio-net.c
View file

@ -26,7 +26,7 @@
#include "qemu/option.h" #include "qemu/option.h"
#include "qemu/option_int.h" #include "qemu/option_int.h"
#include "qemu/config-file.h" #include "qemu/config-file.h"
#include "qapi/qmp/qdict.h" #include "qobject/qdict.h"
#include "hw/virtio/virtio-net.h" #include "hw/virtio/virtio-net.h"
#include "net/vhost_net.h" #include "net/vhost_net.h"
#include "net/announce.h" #include "net/announce.h"

2
hw/net/xen_nic.c
View file

@ -24,7 +24,7 @@
#include "qemu/cutils.h" #include "qemu/cutils.h"
#include "qemu/log.h" #include "qemu/log.h"
#include "qemu/qemu-print.h" #include "qemu/qemu-print.h"
#include "qapi/qmp/qdict.h" #include "qobject/qdict.h"
#include "qapi/error.h" #include "qapi/error.h"
#include <sys/socket.h> #include <sys/socket.h>

2
hw/pci/pci-hmp-cmds.c
View file

@ -20,7 +20,7 @@
#include "monitor/monitor.h" #include "monitor/monitor.h"
#include "pci-internal.h" #include "pci-internal.h"
#include "qapi/error.h" #include "qapi/error.h"
#include "qapi/qmp/qdict.h" #include "qobject/qdict.h"
#include "qapi/qapi-commands-pci.h" #include "qapi/qapi-commands-pci.h"
#include "qemu/cutils.h" #include "qemu/cutils.h"

2
hw/ppc/pegasos2.c
View file

@ -33,7 +33,7 @@
#include "kvm_ppc.h" #include "kvm_ppc.h"
#include "exec/address-spaces.h" #include "exec/address-spaces.h"
#include "qom/qom-qobject.h" #include "qom/qom-qobject.h"
#include "qapi/qmp/qdict.h" #include "qobject/qdict.h"
#include "trace.h" #include "trace.h"
#include "qemu/datadir.h" #include "qemu/datadir.h"
#include "system/device_tree.h" #include "system/device_tree.h"

2
hw/ppc/spapr_drc.c
View file

@ -12,7 +12,7 @@
#include "qemu/osdep.h" #include "qemu/osdep.h"
#include "qapi/error.h" #include "qapi/error.h"
#include "qapi/qmp/qnull.h" #include "qobject/qnull.h"
#include "qemu/cutils.h" #include "qemu/cutils.h"
#include "hw/ppc/spapr_drc.h" #include "hw/ppc/spapr_drc.h"
#include "qom/object.h" #include "qom/object.h"

2
hw/rx/rx62n.c
View file

@ -29,7 +29,7 @@
#include "hw/sysbus.h" #include "hw/sysbus.h"
#include "hw/qdev-properties.h" #include "hw/qdev-properties.h"
#include "system/system.h" #include "system/system.h"
#include "qapi/qmp/qlist.h" #include "qobject/qlist.h"
#include "qom/object.h" #include "qom/object.h"
/* /*

2
hw/s390x/s390-skeys.c
View file

@ -16,7 +16,7 @@
#include "hw/s390x/storage-keys.h" #include "hw/s390x/storage-keys.h"
#include "qapi/error.h" #include "qapi/error.h"
#include "qapi/qapi-commands-misc-target.h" #include "qapi/qapi-commands-misc-target.h"
#include "qapi/qmp/qdict.h" #include "qobject/qdict.h"
#include "qemu/error-report.h" #include "qemu/error-report.h"
#include "system/memory_mapping.h" #include "system/memory_mapping.h"
#include "exec/address-spaces.h" #include "exec/address-spaces.h"

2
hw/s390x/s390-stattrib.c
View file

@ -18,7 +18,7 @@
#include "qemu/error-report.h" #include "qemu/error-report.h"
#include "exec/ram_addr.h" #include "exec/ram_addr.h"
#include "qapi/error.h" #include "qapi/error.h"
#include "qapi/qmp/qdict.h" #include "qobject/qdict.h"
#include "cpu.h" #include "cpu.h"
/* 512KiB cover 2GB of guest memory */ /* 512KiB cover 2GB of guest memory */

4
hw/usb/xen-usb.c
View file

@ -30,8 +30,8 @@
#include "hw/xen/xen-legacy-backend.h" #include "hw/xen/xen-legacy-backend.h"
#include "monitor/qdev.h" #include "monitor/qdev.h"
#include "qapi/error.h" #include "qapi/error.h"
#include "qapi/qmp/qdict.h" #include "qobject/qdict.h"
#include "qapi/qmp/qstring.h" #include "qobject/qstring.h"
#include "hw/xen/interface/io/usbif.h" #include "hw/xen/interface/io/usbif.h"

2
hw/vfio/pci.c
View file

@ -30,7 +30,7 @@
#include "hw/qdev-properties.h" #include "hw/qdev-properties.h"
#include "hw/qdev-properties-system.h" #include "hw/qdev-properties-system.h"
#include "migration/vmstate.h" #include "migration/vmstate.h"
#include "qapi/qmp/qdict.h" #include "qobject/qdict.h"
#include "qemu/error-report.h" #include "qemu/error-report.h"
#include "qemu/main-loop.h" #include "qemu/main-loop.h"
#include "qemu/module.h" #include "qemu/module.h"

2
hw/virtio/virtio-hmp-cmds.c
View file

@ -9,7 +9,7 @@
#include "monitor/hmp.h" #include "monitor/hmp.h"
#include "monitor/monitor.h" #include "monitor/monitor.h"
#include "qapi/qapi-commands-virtio.h" #include "qapi/qapi-commands-virtio.h"
#include "qapi/qmp/qdict.h" #include "qobject/qdict.h"
static void hmp_virtio_dump_protocols(Monitor *mon, static void hmp_virtio_dump_protocols(Monitor *mon,

4
hw/virtio/virtio-qmp.c
View file

@ -15,8 +15,8 @@
#include "qapi/error.h" #include "qapi/error.h"
#include "qapi/qapi-commands-virtio.h" #include "qapi/qapi-commands-virtio.h"
#include "qapi/qapi-commands-qom.h" #include "qapi/qapi-commands-qom.h"
#include "qapi/qmp/qobject.h" #include "qobject/qobject.h"
#include "qapi/qmp/qjson.h" #include "qobject/qjson.h"
#include "hw/virtio/vhost-user.h" #include "hw/virtio/vhost-user.h"
#include "standard-headers/linux/virtio_ids.h" #include "standard-headers/linux/virtio_ids.h"

2
hw/xen/xen-bus.c
View file

@ -18,7 +18,7 @@
#include "hw/xen/xen-bus-helper.h" #include "hw/xen/xen-bus-helper.h"
#include "monitor/monitor.h" #include "monitor/monitor.h"
#include "qapi/error.h" #include "qapi/error.h"
#include "qapi/qmp/qdict.h" #include "qobject/qdict.h"
#include "system/system.h" #include "system/system.h"
#include "net/net.h" #include "net/net.h"
#include "trace.h" #include "trace.h"

2
include/block/qdict.h
View file

@ -10,7 +10,7 @@
#ifndef BLOCK_QDICT_H #ifndef BLOCK_QDICT_H
#define BLOCK_QDICT_H #define BLOCK_QDICT_H
#include "qapi/qmp/qdict.h" #include "qobject/qdict.h"
QObject *qdict_crumple(const QDict *src, Error **errp); QObject *qdict_crumple(const QDict *src, Error **errp);
void qdict_flatten(QDict *qdict); void qdict_flatten(QDict *qdict);

2
include/qapi/compat-policy.h
View file

@ -18,7 +18,7 @@
extern CompatPolicy compat_policy; extern CompatPolicy compat_policy;
bool compat_policy_input_ok(unsigned special_features, bool compat_policy_input_ok(uint64_t features,
const CompatPolicy *policy, const CompatPolicy *policy,
ErrorClass error_class, ErrorClass error_class,
const char *kind, const char *name, const char *kind, const char *name,

4
include/qapi/qmp/dispatch.h → include/qapi/qmp-registry.h
View file

@ -33,7 +33,7 @@ typedef struct QmpCommand
/* Runs in coroutine context if QCO_COROUTINE is set */ /* Runs in coroutine context if QCO_COROUTINE is set */
QmpCommandFunc *fn; QmpCommandFunc *fn;
QmpCommandOptions options; QmpCommandOptions options;
unsigned special_features; uint64_t features;
QTAILQ_ENTRY(QmpCommand) node; QTAILQ_ENTRY(QmpCommand) node;
bool enabled; bool enabled;
const char *disable_reason; const char *disable_reason;
@ -43,7 +43,7 @@ typedef QTAILQ_HEAD(QmpCommandList, QmpCommand) QmpCommandList;
void qmp_register_command(QmpCommandList *cmds, const char *name, void qmp_register_command(QmpCommandList *cmds, const char *name,
QmpCommandFunc *fn, QmpCommandOptions options, QmpCommandFunc *fn, QmpCommandOptions options,
unsigned special_features); uint64_t features);
const QmpCommand *qmp_find_command(const QmpCommandList *cmds, const QmpCommand *qmp_find_command(const QmpCommandList *cmds,
const char *name); const char *name);
void qmp_disable_command(QmpCommandList *cmds, const char *name, void qmp_disable_command(QmpCommandList *cmds, const char *name,

2
include/qapi/util.h
View file

@ -18,7 +18,7 @@ typedef enum {
typedef struct QEnumLookup { typedef struct QEnumLookup {
const char *const *array; const char *const *array;
const unsigned char *const special_features; const uint64_t *const features;
const int size; const int size;
} QEnumLookup; } QEnumLookup;

4
include/qapi/visitor-impl.h
View file

@ -115,11 +115,11 @@ struct Visitor
/* Optional */ /* Optional */
bool (*policy_reject)(Visitor *v, const char *name, bool (*policy_reject)(Visitor *v, const char *name,
unsigned special_features, Error **errp); uint64_t features, Error **errp);
/* Optional */ /* Optional */
bool (*policy_skip)(Visitor *v, const char *name, bool (*policy_skip)(Visitor *v, const char *name,
unsigned special_features); uint64_t features);
/* Must be set */ /* Must be set */
VisitorType type; VisitorType type;

12
include/qapi/visitor.h
View file

@ -463,29 +463,29 @@ bool visit_optional(Visitor *v, const char *name, bool *present);
/* /*
* Should we reject member @name due to policy? * Should we reject member @name due to policy?
* *
* @special_features is the member's special features encoded as a * @features is the member's special features encoded as a
* bitset of QapiSpecialFeature. * bitset of QapiFeature.
* *
* @name must not be NULL. This function is only useful between * @name must not be NULL. This function is only useful between
* visit_start_struct() and visit_end_struct(), since only objects * visit_start_struct() and visit_end_struct(), since only objects
* have deprecated members. * have deprecated members.
*/ */
bool visit_policy_reject(Visitor *v, const char *name, bool visit_policy_reject(Visitor *v, const char *name,
unsigned special_features, Error **errp); uint64_t features, Error **errp);
/* /*
* *
* Should we skip member @name due to policy? * Should we skip member @name due to policy?
* *
* @special_features is the member's special features encoded as a * @features is the member's special features encoded as a
* bitset of QapiSpecialFeature. * bitset of QapiFeature.
* *
* @name must not be NULL. This function is only useful between * @name must not be NULL. This function is only useful between
* visit_start_struct() and visit_end_struct(), since only objects * visit_start_struct() and visit_end_struct(), since only objects
* have deprecated members. * have deprecated members.
*/ */
bool visit_policy_skip(Visitor *v, const char *name, bool visit_policy_skip(Visitor *v, const char *name,
unsigned special_features); uint64_t features);
/* /*
* Set policy for handling deprecated management interfaces. * Set policy for handling deprecated management interfaces.

0
include/qapi/qmp/json-parser.h → include/qobject/json-parser.h
View file

0
include/qapi/qmp/json-writer.h → include/qobject/json-writer.h
View file

2
include/qapi/qmp/qbool.h → include/qobject/qbool.h
View file

@ -14,7 +14,7 @@
#ifndef QBOOL_H #ifndef QBOOL_H
#define QBOOL_H #define QBOOL_H
#include "qapi/qmp/qobject.h" #include "qobject/qobject.h"
struct QBool { struct QBool {
struct QObjectBase_ base; struct QObjectBase_ base;

2
include/qapi/qmp/qdict.h → include/qobject/qdict.h
View file

@ -13,7 +13,7 @@
#ifndef QDICT_H #ifndef QDICT_H
#define QDICT_H #define QDICT_H
#include "qapi/qmp/qobject.h" #include "qobject/qobject.h"
#include "qemu/queue.h" #include "qemu/queue.h"
#define QDICT_BUCKET_MAX 512 #define QDICT_BUCKET_MAX 512

0
include/qapi/qmp/qjson.h → include/qobject/qjson.h
View file

2
include/qapi/qmp/qlist.h → include/qobject/qlist.h
View file

@ -13,7 +13,7 @@
#ifndef QLIST_H #ifndef QLIST_H
#define QLIST_H #define QLIST_H
#include "qapi/qmp/qobject.h" #include "qobject/qobject.h"
#include "qemu/queue.h" #include "qemu/queue.h"
typedef struct QListEntry { typedef struct QListEntry {

0
include/qapi/qmp/qlit.h → include/qobject/qlit.h
View file

2
include/qapi/qmp/qnull.h → include/qobject/qnull.h
View file

@ -13,7 +13,7 @@
#ifndef QNULL_H #ifndef QNULL_H
#define QNULL_H #define QNULL_H
#include "qapi/qmp/qobject.h" #include "qobject/qobject.h"
struct QNull { struct QNull {
struct QObjectBase_ base; struct QObjectBase_ base;

2
include/qapi/qmp/qnum.h → include/qobject/qnum.h
View file

@ -15,7 +15,7 @@
#ifndef QNUM_H #ifndef QNUM_H
#define QNUM_H #define QNUM_H
#include "qapi/qmp/qobject.h" #include "qobject/qobject.h"
typedef enum { typedef enum {
QNUM_I64, QNUM_I64,

2
include/qapi/qmp/qobject.h → include/qobject/qobject.h
View file

@ -34,7 +34,7 @@
#include "qapi/qapi-builtin-types.h" #include "qapi/qapi-builtin-types.h"
/* Not for use outside include/qapi/qmp/ */ /* Not for use outside include/qobject/ */
struct QObjectBase_ { struct QObjectBase_ {
QType type; QType type;
size_t refcnt; size_t refcnt;

2
include/qapi/qmp/qstring.h → include/qobject/qstring.h
View file

@ -13,7 +13,7 @@
#ifndef QSTRING_H #ifndef QSTRING_H
#define QSTRING_H #define QSTRING_H
#include "qapi/qmp/qobject.h" #include "qobject/qobject.h"
struct QString { struct QString {
struct QObjectBase_ base; struct QObjectBase_ base;

1
meson.build
View file

@ -3449,6 +3449,7 @@ qapi_gen_depends = [ meson.current_source_dir() / 'scripts/qapi/__init__.py',
meson.current_source_dir() / 'scripts/qapi/schema.py', meson.current_source_dir() / 'scripts/qapi/schema.py',
meson.current_source_dir() / 'scripts/qapi/source.py', meson.current_source_dir() / 'scripts/qapi/source.py',
meson.current_source_dir() / 'scripts/qapi/types.py', meson.current_source_dir() / 'scripts/qapi/types.py',
meson.current_source_dir() / 'scripts/qapi/features.py',
meson.current_source_dir() / 'scripts/qapi/visit.py', meson.current_source_dir() / 'scripts/qapi/visit.py',
meson.current_source_dir() / 'scripts/qapi-gen.py' meson.current_source_dir() / 'scripts/qapi-gen.py'
] ]

2
migration/dirtyrate.c
View file

@ -24,7 +24,7 @@
#include "dirtyrate.h" #include "dirtyrate.h"
#include "monitor/hmp.h" #include "monitor/hmp.h"
#include "monitor/monitor.h" #include "monitor/monitor.h"
#include "qapi/qmp/qdict.h" #include "qobject/qdict.h"
#include "system/kvm.h" #include "system/kvm.h"
#include "system/runstate.h" #include "system/runstate.h"
#include "exec/memory.h" #include "exec/memory.h"

2
migration/migration-hmp-cmds.c
View file

@ -21,7 +21,7 @@
#include "qapi/error.h" #include "qapi/error.h"
#include "qapi/qapi-commands-migration.h" #include "qapi/qapi-commands-migration.h"
#include "qapi/qapi-visit-migration.h" #include "qapi/qapi-visit-migration.h"
#include "qapi/qmp/qdict.h" #include "qobject/qdict.h"
#include "qapi/string-input-visitor.h" #include "qapi/string-input-visitor.h"
#include "qapi/string-output-visitor.h" #include "qapi/string-output-visitor.h"
#include "qemu/cutils.h" #include "qemu/cutils.h"

2
migration/migration.c
View file

@ -45,7 +45,7 @@
#include "qapi/qapi-commands-migration.h" #include "qapi/qapi-commands-migration.h"
#include "qapi/qapi-events-migration.h" #include "qapi/qapi-events-migration.h"
#include "qapi/qmp/qerror.h" #include "qapi/qmp/qerror.h"
#include "qapi/qmp/qnull.h" #include "qobject/qnull.h"
#include "qemu/rcu.h" #include "qemu/rcu.h"
#include "postcopy-ram.h" #include "postcopy-ram.h"
#include "qemu/thread.h" #include "qemu/thread.h"

2
migration/migration.h
View file

@ -17,7 +17,7 @@
#include "exec/cpu-common.h" #include "exec/cpu-common.h"
#include "hw/qdev-core.h" #include "hw/qdev-core.h"
#include "qapi/qapi-types-migration.h" #include "qapi/qapi-types-migration.h"
#include "qapi/qmp/json-writer.h" #include "qobject/json-writer.h"
#include "qemu/thread.h" #include "qemu/thread.h"
#include "qemu/coroutine.h" #include "qemu/coroutine.h"
#include "io/channel.h" #include "io/channel.h"

2
migration/options.c
View file

@ -19,7 +19,7 @@
#include "qapi/qapi-commands-migration.h" #include "qapi/qapi-commands-migration.h"
#include "qapi/qapi-visit-migration.h" #include "qapi/qapi-visit-migration.h"
#include "qapi/qmp/qerror.h" #include "qapi/qmp/qerror.h"
#include "qapi/qmp/qnull.h" #include "qobject/qnull.h"
#include "system/runstate.h" #include "system/runstate.h"
#include "migration/colo.h" #include "migration/colo.h"
#include "migration/cpr.h" #include "migration/cpr.h"

2
migration/vmstate.c
View file

@ -15,7 +15,7 @@
#include "migration/vmstate.h" #include "migration/vmstate.h"
#include "savevm.h" #include "savevm.h"
#include "qapi/error.h" #include "qapi/error.h"
#include "qapi/qmp/json-writer.h" #include "qobject/json-writer.h"
#include "qemu-file.h" #include "qemu-file.h"
#include "qemu/bitops.h" #include "qemu/bitops.h"
#include "qemu/error-report.h" #include "qemu/error-report.h"

2
monitor/hmp-cmds-target.c
View file

@ -29,7 +29,7 @@
#include "monitor/hmp-target.h" #include "monitor/hmp-target.h"
#include "monitor/monitor-internal.h" #include "monitor/monitor-internal.h"
#include "qapi/error.h" #include "qapi/error.h"
#include "qapi/qmp/qdict.h" #include "qobject/qdict.h"
#include "system/hw_accel.h" #include "system/hw_accel.h"
/* Set the current CPU defined by the user. Callers must hold BQL. */ /* Set the current CPU defined by the user. Callers must hold BQL. */

Some files were not shown because too many files have changed in this diff Show more