QAPI patches patches for 2025-02-10
Subsystems (6)
The following changes since commit 04d3d0e9f54d4c42759f3810aa135ce314d98dc4:
Merge tag 'hppa-system-for-v10-diva-artist-pull-request' of https://github.com/hdeller/qemu-hppa into staging (2025-02-08 09:00:57 -0500)
are available in the Git repository at:
https://repo.or.cz/qemu/armbru.git tags/pull-qapi-2025-02-10-v2
for you to fetch changes up to 2ebb09f34ffff152dda6d2b5d9a2348f3fefc6d3:
qapi: expose all schema features to code (2025-02-10 15:45:04 +0100)
----------------------------------------------------------------
QAPI patches patches for 2025-02-10
----------------------------------------------------------------
Daniel P. Berrangé (6):
qapi: Move include/qapi/qmp/ to include/qobject/
qapi: Move and rename qapi/qmp/dispatch.h to qapi/qmp-registry.h
qapi: cope with feature names containing a '-'
qapi: change 'unsigned special_features' to 'uint64_t features'
qapi: rename 'special_features' to 'features'
qapi: expose all schema features to code
Victor Toso (1):
qapi: fix colon in Since tag section
Zhang Boyang (1):
qapi/ui: Fix documentation of upper bound value in InputMoveEvent
MAINTAINERS | 5 +-
docs/devel/qapi-code-gen.rst | 4 +-
meson.build | 1 +
qapi/cxl.json | 4 +-
qapi/ui.json | 2 +-
include/block/qdict.h | 2 +-
include/qapi/compat-policy.h | 2 +-
include/qapi/{qmp/dispatch.h => qmp-registry.h} | 4 +-
include/qapi/util.h | 2 +-
include/qapi/visitor-impl.h | 4 +-
include/qapi/visitor.h | 12 +-
include/{qapi/qmp => qobject}/json-parser.h | 0
include/{qapi/qmp => qobject}/json-writer.h | 0
include/{qapi/qmp => qobject}/qbool.h | 2 +-
include/{qapi/qmp => qobject}/qdict.h | 2 +-
include/{qapi/qmp => qobject}/qjson.h | 0
include/{qapi/qmp => qobject}/qlist.h | 2 +-
include/{qapi/qmp => qobject}/qlit.h | 0
include/{qapi/qmp => qobject}/qnull.h | 2 +-
include/{qapi/qmp => qobject}/qnum.h | 2 +-
include/{qapi/qmp => qobject}/qobject.h | 2 +-
include/{qapi/qmp => qobject}/qstring.h | 2 +-
migration/migration.h | 2 +-
monitor/monitor-internal.h | 4 +-
qga/guest-agent-core.h | 2 +-
qobject/json-parser-int.h | 2 +-
qobject/qobject-internal.h | 2 +-
tests/qtest/libqmp.h | 2 +-
tests/qtest/libqtest.h | 6 +-
audio/audio-hmp-cmds.c | 2 +-
audio/audio.c | 2 +-
authz/listfile.c | 4 +-
backends/cryptodev-hmp-cmds.c | 2 +-
block.c | 8 +-
block/blkdebug.c | 6 +-
block/blkio.c | 2 +-
block/blklogwrites.c | 4 +-
block/blkverify.c | 4 +-
block/copy-before-write.c | 2 +-
block/copy-on-read.c | 2 +-
block/curl.c | 4 +-
block/file-posix.c | 4 +-
block/file-win32.c | 4 +-
block/gluster.c | 2 +-
block/iscsi.c | 4 +-
block/monitor/block-hmp-cmds.c | 2 +-
block/nbd.c | 2 +-
block/nfs.c | 4 +-
block/null.c | 4 +-
block/nvme.c | 4 +-
block/parallels.c | 2 +-
block/qapi-system.c | 2 +-
block/qapi.c | 10 +-
block/qcow.c | 4 +-
block/qcow2.c | 4 +-
block/qed.c | 2 +-
block/quorum.c | 6 +-
block/rbd.c | 8 +-
block/replication.c | 2 +-
block/snapshot.c | 4 +-
block/ssh.c | 4 +-
block/stream.c | 2 +-
block/vhdx.c | 2 +-
block/vmdk.c | 2 +-
block/vpc.c | 2 +-
block/vvfat.c | 4 +-
blockdev.c | 8 +-
chardev/char-hmp-cmds.c | 2 +-
dump/dump-hmp-cmds.c | 2 +-
hw/arm/aspeed_ast27x0.c | 2 +-
hw/arm/mps2-tz.c | 2 +-
hw/arm/mps2.c | 2 +-
hw/arm/mps3r.c | 2 +-
hw/arm/sbsa-ref.c | 2 +-
hw/arm/stellaris.c | 2 +-
hw/arm/vexpress.c | 2 +-
hw/arm/virt.c | 2 +-
hw/arm/xlnx-versal.c | 2 +-
hw/block/xen-block.c | 4 +-
hw/core/machine-hmp-cmds.c | 2 +-
hw/core/machine-qmp-cmds.c | 2 +-
hw/core/qdev-properties.c | 2 +-
hw/core/qdev.c | 2 +-
hw/hyperv/hv-balloon.c | 2 +-
hw/i386/acpi-build.c | 2 +-
hw/i386/kvm/xen_evtchn.c | 2 +-
hw/i386/monitor.c | 2 +-
hw/i386/pc.c | 2 +-
hw/net/rocker/rocker-hmp-cmds.c | 2 +-
hw/net/virtio-net.c | 2 +-
hw/net/xen_nic.c | 2 +-
hw/pci/pci-hmp-cmds.c | 2 +-
hw/ppc/pegasos2.c | 2 +-
hw/ppc/spapr_drc.c | 2 +-
hw/rx/rx62n.c | 2 +-
hw/s390x/s390-skeys.c | 2 +-
hw/s390x/s390-stattrib.c | 2 +-
hw/usb/xen-usb.c | 4 +-
hw/vfio/pci.c | 2 +-
hw/virtio/virtio-hmp-cmds.c | 2 +-
hw/virtio/virtio-qmp.c | 4 +-
hw/xen/xen-bus.c | 2 +-
migration/dirtyrate.c | 2 +-
migration/migration-hmp-cmds.c | 2 +-
migration/migration.c | 2 +-
migration/options.c | 2 +-
migration/vmstate.c | 2 +-
monitor/hmp-cmds-target.c | 2 +-
monitor/hmp-cmds.c | 2 +-
monitor/hmp.c | 4 +-
monitor/monitor.c | 2 +-
monitor/qemu-config-qmp.c | 2 +-
monitor/qmp.c | 6 +-
net/net-hmp-cmds.c | 2 +-
net/net.c | 2 +-
net/slirp.c | 2 +-
qapi/qapi-clone-visitor.c | 2 +-
qapi/qapi-dealloc-visitor.c | 2 +-
qapi/qapi-forward-visitor.c | 22 +-
qapi/qapi-util.c | 6 +-
qapi/qapi-visit-core.c | 12 +-
qapi/qmp-dispatch.c | 10 +-
qapi/qmp-event.c | 6 +-
qapi/qmp-registry.c | 6 +-
qapi/qobject-input-visitor.c | 18 +-
qapi/qobject-output-visitor.c | 18 +-
qapi/string-input-visitor.c | 2 +-
qemu-img.c | 4 +-
qemu-io-cmds.c | 2 +-
qemu-io.c | 4 +-
qemu-nbd.c | 4 +-
qga/main.c | 6 +-
qobject/block-qdict.c | 8 +-
qobject/json-parser.c | 12 +-
qobject/json-writer.c | 2 +-
qobject/qbool.c | 2 +-
qobject/qdict.c | 10 +-
qobject/qjson.c | 16 +-
qobject/qlist.c | 10 +-
qobject/qlit.c | 14 +-
qobject/qnull.c | 2 +-
qobject/qnum.c | 2 +-
qobject/qobject.c | 12 +-
qobject/qstring.c | 2 +-
qom/object.c | 10 +-
qom/object_interfaces.c | 6 +-
qom/qom-hmp-cmds.c | 4 +-
qom/qom-qmp-cmds.c | 2 +-
replay/replay-debugging.c | 2 +-
replay/replay-snapshot.c | 2 +-
scsi/qemu-pr-helper.c | 2 +-
stats/stats-hmp-cmds.c | 2 +-
storage-daemon/qemu-storage-daemon.c | 4 +-
stubs/qmp-command-available.c | 2 +-
stubs/qmp-quit.c | 2 +-
system/device_tree.c | 2 +-
system/dirtylimit.c | 2 +-
system/qdev-monitor.c | 6 +-
system/runstate-hmp-cmds.c | 2 +-
system/vl.c | 6 +-
target/arm/arm-qmp-cmds.c | 2 +-
target/i386/cpu-apic.c | 2 +-
target/i386/cpu-system.c | 2 +-
target/i386/monitor.c | 2 +-
target/loongarch/loongarch-qmp-cmds.c | 2 +-
target/ppc/cpu_init.c | 2 +-
target/riscv/riscv-qmp-cmds.c | 4 +-
target/s390x/cpu_models_system.c | 2 +-
tests/qtest/adm1266-test.c | 4 +-
tests/qtest/adm1272-test.c | 4 +-
tests/qtest/ahci-test.c | 2 +-
tests/qtest/arm-cpu-features.c | 4 +-
tests/qtest/aspeed_gpio-test.c | 2 +-
tests/qtest/ast2700-gpio-test.c | 2 +-
tests/qtest/boot-order-test.c | 2 +-
tests/qtest/cdrom-test.c | 2 +-
tests/qtest/cpu-plug-test.c | 4 +-
tests/qtest/device-introspect-test.c | 6 +-
tests/qtest/device-plug-test.c | 4 +-
tests/qtest/drive_del-test.c | 4 +-
tests/qtest/emc141x-test.c | 2 +-
tests/qtest/fdc-test.c | 2 +-
tests/qtest/hd-geo-test.c | 2 +-
tests/qtest/ide-test.c | 2 +-
tests/qtest/isl_pmbus_vr-test.c | 4 +-
tests/qtest/libqmp.c | 4 +-
tests/qtest/libqos/generic-pcihost.c | 2 +-
tests/qtest/libqos/libqos.c | 2 +-
tests/qtest/libqos/pci-pc.c | 2 +-
tests/qtest/libqos/qos_external.c | 8 +-
tests/qtest/libqtest.c | 10 +-
tests/qtest/lsm303dlhc-mag-test.c | 2 +-
tests/qtest/machine-none-test.c | 2 +-
tests/qtest/max34451-test.c | 4 +-
tests/qtest/migration-helpers.c | 530 ++++++++++++++++++++++++
tests/qtest/migration/file-tests.c | 2 +-
tests/qtest/migration/framework.c | 4 +-
tests/qtest/migration/migration-qmp.c | 6 +-
tests/qtest/migration/migration-util.c | 2 +-
tests/qtest/migration/misc-tests.c | 2 +-
tests/qtest/migration/postcopy-tests.c | 2 +-
tests/qtest/migration/precopy-tests.c | 2 +-
tests/qtest/netdev-socket.c | 2 +-
tests/qtest/npcm7xx_adc-test.c | 2 +-
tests/qtest/npcm7xx_emc-test.c | 4 +-
tests/qtest/npcm7xx_pwm-test.c | 4 +-
tests/qtest/npcm7xx_watchdog_timer-test.c | 2 +-
tests/qtest/numa-test.c | 4 +-
tests/qtest/pvpanic-pci-test.c | 2 +-
tests/qtest/pvpanic-test.c | 2 +-
tests/qtest/q35-test.c | 2 +-
tests/qtest/qmp-cmd-test.c | 2 +-
tests/qtest/qmp-test.c | 6 +-
tests/qtest/qom-test.c | 4 +-
tests/qtest/qos-test.c | 2 +-
tests/qtest/readconfig-test.c | 6 +-
tests/qtest/tco-test.c | 2 +-
tests/qtest/test-filter-mirror.c | 2 +-
tests/qtest/test-filter-redirector.c | 2 +-
tests/qtest/test-netfilter.c | 2 +-
tests/qtest/test-x86-cpuid-compat.c | 8 +-
tests/qtest/tmp105-test.c | 2 +-
tests/qtest/tpm-emu.c | 4 +-
tests/qtest/tpm-util.c | 2 +-
tests/qtest/vhost-user-test.c | 2 +-
tests/qtest/virtio-net-failover.c | 6 +-
tests/qtest/virtio-net-test.c | 2 +-
tests/qtest/vmgenid-test.c | 2 +-
tests/qtest/wdt_ib700-test.c | 2 +-
tests/unit/check-block-qdict.c | 4 +-
tests/unit/check-qdict.c | 6 +-
tests/unit/check-qjson.c | 12 +-
tests/unit/check-qlist.c | 4 +-
tests/unit/check-qlit.c | 12 +-
tests/unit/check-qnull.c | 2 +-
tests/unit/check-qnum.c | 2 +-
tests/unit/check-qobject.c | 12 +-
tests/unit/check-qom-proplist.c | 4 +-
tests/unit/check-qstring.c | 2 +-
tests/unit/test-block-iothread.c | 2 +-
tests/unit/test-blockjob-txn.c | 2 +-
tests/unit/test-blockjob.c | 2 +-
tests/unit/test-char.c | 2 +-
tests/unit/test-forward-visitor.c | 4 +-
tests/unit/test-image-locking.c | 2 +-
tests/unit/test-keyval.c | 6 +-
tests/unit/test-qemu-opts.c | 4 +-
tests/unit/test-qga.c | 4 +-
tests/unit/test-qmp-cmds.c | 8 +-
tests/unit/test-qmp-event.c | 10 +-
tests/unit/test-qobject-input-visitor.c | 12 +-
tests/unit/test-qobject-output-visitor.c | 12 +-
tests/unit/test-replication.c | 2 +-
tests/unit/test-visitor-serialization.c | 4 +-
trace/trace-hmp-cmds.c | 2 +-
ui/ui-hmp-cmds.c | 2 +-
util/keyval.c | 6 +-
util/qemu-config.c | 4 +-
util/qemu-option.c | 8 +-
scripts/qapi/commands.py | 11 +-
scripts/qapi/events.py | 2 +-
scripts/qapi/features.py | 48 +++
scripts/qapi/gen.py | 9 +-
scripts/qapi/introspect.py | 2 +-
scripts/qapi/main.py | 2 +
scripts/qapi/schema.py | 31 +-
scripts/qapi/types.py | 23 +-
scripts/qapi/visit.py | 21 +-
tests/meson.build | 2 +
tests/qapi-schema/features-too-many.err | 2 +
tests/qapi-schema/features-too-many.json | 13 +
tests/qapi-schema/features-too-many.out | 0
tests/qapi-schema/meson.build | 1 +
273 files changed, 1142 insertions(+), 519 deletions(-)
rename include/qapi/{qmp/dispatch.h => qmp-registry.h} (96%)
rename include/{qapi/qmp => qobject}/json-parser.h (100%)
rename include/{qapi/qmp => qobject}/json-writer.h (100%)
rename include/{qapi/qmp => qobject}/qbool.h (94%)
rename include/{qapi/qmp => qobject}/qdict.h (98%)
rename include/{qapi/qmp => qobject}/qjson.h (100%)
rename include/{qapi/qmp => qobject}/qlist.h (98%)
rename include/{qapi/qmp => qobject}/qlit.h (100%)
rename include/{qapi/qmp => qobject}/qnull.h (94%)
rename include/{qapi/qmp => qobject}/qnum.h (98%)
rename include/{qapi/qmp => qobject}/qobject.h (98%)
rename include/{qapi/qmp => qobject}/qstring.h (96%)
create mode 100644 tests/qtest/migration-helpers.c
create mode 100644 scripts/qapi/features.py
create mode 100644 tests/qapi-schema/features-too-many.err
create mode 100644 tests/qapi-schema/features-too-many.json
create mode 100644 tests/qapi-schema/features-too-many.outSignature · 1 line
2.48.1
[PULL v2 3/8] qapi: fix colon in Since tag section
From: Victor Toso <[email protected]>
As described in docs/devel/qapi-code-gen.rst line 998, there should be no space between "Since" and ":".
Message-ID: <[email protected]>
--- qapi/cxl.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
qapi/cxl.json +2 -2
@@ -460,7 +460,7 @@ # # @unstable: For now this command is subject to change. # -# Since : 9.1 +# Since: 9.1 ## { 'command': 'cxl-add-dynamic-capacity', 'data': { 'path': 'str',
@@ -539,7 +539,7 @@ # # @unstable: For now this command is subject to change. # -# Since : 9.1 +# Since: 9.1 ## { 'command': 'cxl-release-dynamic-capacity', 'data': { 'path': 'str',
Signature · 1 line
2.48.1
[PULL v2 5/8] qapi: cope with feature names containing a '-'
In reply to Markus ArmbrusterFrom: Daniel P. Berrangé <[email protected]>
When we shortly expose all feature names to code, it will be valid to include a '-', which must be translated to a '_' for the enum constants.
Message-ID: <[email protected]>
--- scripts/qapi/gen.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)
scripts/qapi/gen.py +2 -1
@@ -24,6 +24,7 @@ ) from .common import ( + c_enum_const, c_fname, c_name, guardend,
@@ -41,7 +42,7 @@ def gen_special_features(features: Sequence[QAPISchemaFeature]) -> str: - special_features = [f"1u << QAPI_{feat.name.upper()}" + special_features = [f"1u << {c_enum_const('qapi', feat.name)}" for feat in features if feat.is_special()] return ' | '.join(special_features) or '0'
Signature · 1 line
2.48.1
[PULL v2 8/8] qapi: expose all schema features to code
In reply to Markus ArmbrusterFrom: Daniel P. Berrangé <[email protected]>
This replaces use of the constants from the QapiSpecialFeatures enum, with constants from the auto-generate QapiFeatures enum in qapi-features.h
The 'deprecated' and 'unstable' features still have a little bit of special handling, being force defined to be the 1st + 2nd features in the enum, regardless of whether they're used in the schema. This retains compatibility with common code that references the features via the QapiSpecialFeatures constants.
Message-ID: <[email protected]>
--- meson.build | 1 + scripts/qapi/commands.py | 1 + scripts/qapi/features.py | 48 ++++++++++++++++++++++++ scripts/qapi/gen.py | 6 +-- scripts/qapi/main.py | 2 + scripts/qapi/schema.py | 31 ++++++++++++++- scripts/qapi/types.py | 7 +++- scripts/qapi/visit.py | 3 +- tests/meson.build | 2 + tests/qapi-schema/features-too-many.err | 2 + tests/qapi-schema/features-too-many.json | 13 +++++++ tests/qapi-schema/features-too-many.out | 0 tests/qapi-schema/meson.build | 1 + 13 files changed, 110 insertions(+), 7 deletions(-) create mode 100644 scripts/qapi/features.py create mode 100644 tests/qapi-schema/features-too-many.err create mode 100644 tests/qapi-schema/features-too-many.json create mode 100644 tests/qapi-schema/features-too-many.out
meson.build +1 -0
@@ -3444,6 +3444,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/source.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-gen.py' ]
scripts/qapi/commands.py +1 -0
@@ -355,6 +355,7 @@ def visit_begin(self, schema: QAPISchema) -> None: #include "qemu/osdep.h" #include "%(prefix)sqapi-commands.h" #include "%(prefix)sqapi-init-commands.h" +#include "%(prefix)sqapi-features.h" void %(c_prefix)sqmp_init_marshal(QmpCommandList *cmds) {
scripts/qapi/features.py new file +48 -0
48 lines not on this page · raw message
scripts/qapi/gen.py +3 -3
@@ -42,9 +42,9 @@ def gen_features(features: Sequence[QAPISchemaFeature]) -> str: - featenum = [f"1u << {c_enum_const('qapi', feat.name)}" - for feat in features if feat.is_special()] - return ' | '.join(featenum) or '0' + feats = [f"1u << {c_enum_const('qapi_feature', feat.name)}" + for feat in features] + return ' | '.join(feats) or '0' class QAPIGen:
scripts/qapi/main.py +2 -0
@@ -15,6 +15,7 @@ from .common import must_match from .error import QAPIError from .events import gen_events +from .features import gen_features from .introspect import gen_introspect from .schema import QAPISchema from .types import gen_types
@@ -49,6 +50,7 @@ def generate(schema_file: str, schema = QAPISchema(schema_file) gen_types(schema, output_dir, prefix, builtins) + gen_features(schema, output_dir, prefix) gen_visit(schema, output_dir, prefix, builtins) gen_commands(schema, output_dir, prefix, gen_tracing) gen_events(schema, output_dir, prefix)
scripts/qapi/schema.py +30 -1
@@ -29,6 +29,7 @@ List, Optional, Union, + ValuesView, cast, )
@@ -933,8 +934,11 @@ def connect_doc(self, doc: Optional[QAPIDoc]) -> None: class QAPISchemaFeature(QAPISchemaMember): role = 'feature' + # Features which are standardized across all schemas + SPECIAL_NAMES = ['deprecated', 'unstable'] + def is_special(self) -> bool: - return self.name in ('deprecated', 'unstable') + return self.name in QAPISchemaFeature.SPECIAL_NAMES class QAPISchemaObjectTypeMember(QAPISchemaMember):
@@ -1138,6 +1142,16 @@ def __init__(self, fname: str): self._entity_list: List[QAPISchemaEntity] = [] self._entity_dict: Dict[str, QAPISchemaDefinition] = {} self._module_dict: Dict[str, QAPISchemaModule] = OrderedDict() + # NB, values in the dict will identify the first encountered + # usage of a named feature only + self._feature_dict: Dict[str, QAPISchemaFeature] = OrderedDict() + + # All schemas get the names defined in the QapiSpecialFeature enum. + # Rely on dict iteration order matching insertion order so that + # the special names are emitted first when generating code. + for f in QAPISchemaFeature.SPECIAL_NAMES: + self._feature_dict[f] = QAPISchemaFeature(f, None) + self._schema_dir = os.path.dirname(fname) self._make_module(QAPISchemaModule.BUILTIN_MODULE_NAME) self._make_module(fname)
@@ -1147,6 +1161,9 @@ def __init__(self, fname: str): self._def_exprs(exprs) self.check() + def features(self) -> ValuesView[QAPISchemaFeature]: + return self._feature_dict.values() + def _def_entity(self, ent: QAPISchemaEntity) -> None: self._entity_list.append(ent)
@@ -1258,6 +1275,12 @@ def _make_features( ) -> List[QAPISchemaFeature]: if features is None: return [] + + for f in features: + feat = QAPISchemaFeature(f['name'], info) + if feat.name not in self._feature_dict: + self._feature_dict[feat.name] = feat + return [QAPISchemaFeature(f['name'], info, QAPISchemaIfCond(f.get('if'))) for f in features]
@@ -1485,6 +1508,12 @@ def check(self) -> None: for doc in self.docs: doc.check() + features = list(self._feature_dict.values()) + if len(features) > 64: + raise QAPISemError( + features[64].info, + "Maximum of 64 schema features is permitted") + def visit(self, visitor: QAPISchemaVisitor) -> None: visitor.visit_begin(self) for mod in self._module_dict.values():
scripts/qapi/types.py +5 -2
@@ -304,11 +304,14 @@ def _begin_user_module(self, name: str) -> None: #include "qapi/dealloc-visitor.h" #include "%(types)s.h" #include "%(visit)s.h" +#include "%(prefix)sqapi-features.h" ''', - types=types, visit=visit)) + types=types, visit=visit, + prefix=self._prefix)) self._genh.preamble_add(mcgen(''' #include "qapi/qapi-builtin-types.h" -''')) +''', + prefix=self._prefix)) def visit_begin(self, schema: QAPISchema) -> None: # gen_object() is recursive, ensure it doesn't visit the empty type
scripts/qapi/visit.py +2 -1
@@ -356,8 +356,9 @@ def _begin_user_module(self, name: str) -> None: #include "qemu/osdep.h" #include "qapi/error.h" #include "%(visit)s.h" +#include "%(prefix)sqapi-features.h" ''', - visit=visit)) + visit=visit, prefix=self._prefix)) self._genh.preamble_add(mcgen(''' #include "qapi/qapi-builtin-visit.h" #include "%(types)s.h"
tests/meson.build +2 -0
@@ -16,6 +16,8 @@ test_qapi_outputs = [ 'test-qapi-events-sub-sub-module.h', 'test-qapi-events.c', 'test-qapi-events.h', + 'test-qapi-features.c', + 'test-qapi-features.h', 'test-qapi-init-commands.c', 'test-qapi-init-commands.h', 'test-qapi-introspect.c',
tests/qapi-schema/features-too-many.err new file +2 -0
@@ -0,0 +1,2 @@ +features-too-many.json: In command 'go-fish': +features-too-many.json:2: Maximum of 64 schema features is permitted
tests/qapi-schema/features-too-many.json new file +13 -0
@@ -0,0 +1,13 @@ +# Max 64 features, with 2 specials, so 63rd custom is invalid +{ 'command': 'go-fish', + 'features': [ + 'f00', 'f01', 'f02', 'f03', 'f04', 'f05', 'f06', 'f07', + 'f08', 'f09', 'f0a', 'f0b', 'f0c', 'f0d', 'f0e', 'f0f', + 'f10', 'f11', 'f12', 'f13', 'f14', 'f15', 'f16', 'f17', + 'f18', 'f19', 'f1a', 'f1b', 'f1c', 'f1d', 'f1e', 'f1f', + 'f20', 'f21', 'f22', 'f23', 'f24', 'f25', 'f26', 'f27', + 'f28', 'f29', 'f2a', 'f2b', 'f2c', 'f2d', 'f2e', 'f2f', + 'f30', 'f31', 'f32', 'f33', 'f34', 'f35', 'f36', 'f37', + 'f38', 'f39', 'f3a', 'f3b', 'f3c', 'f3d', 'f3e' + ] +}
tests/qapi-schema/features-too-many.out new file +0 -0
tests/qapi-schema/meson.build +1 -0
@@ -105,6 +105,7 @@ schemas = [ 'event-case.json', 'event-member-invalid-dict.json', 'event-nest-struct.json', + 'features-too-many.json', 'features-bad-type.json', 'features-deprecated-type.json', 'features-duplicate-name.json',
Signature · 1 line
2.48.1
[PULL v2 1/8] qapi: Move include/qapi/qmp/ to include/qobject/
In reply to Markus ArmbrusterFrom: Daniel P. Berrangé <[email protected]>
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".
Message-ID: <[email protected]> [Rebased]
---
MAINTAINERS | 5 +-
docs/devel/qapi-code-gen.rst | 2 +-
include/block/qdict.h | 2 +-
include/{qapi/qmp => qobject}/json-parser.h | 0
include/{qapi/qmp => qobject}/json-writer.h | 0
include/{qapi/qmp => qobject}/qbool.h | 2 +-
include/{qapi/qmp => qobject}/qdict.h | 2 +-
include/{qapi/qmp => qobject}/qjson.h | 0
include/{qapi/qmp => qobject}/qlist.h | 2 +-
include/{qapi/qmp => qobject}/qlit.h | 0
include/{qapi/qmp => qobject}/qnull.h | 2 +-
include/{qapi/qmp => qobject}/qnum.h | 2 +-
include/{qapi/qmp => qobject}/qobject.h | 2 +-
include/{qapi/qmp => qobject}/qstring.h | 2 +-
migration/migration.h | 2 +-
monitor/monitor-internal.h | 2 +-
qobject/json-parser-int.h | 2 +-
qobject/qobject-internal.h | 2 +-
tests/qtest/libqmp.h | 2 +-
tests/qtest/libqtest.h | 6 +-
audio/audio-hmp-cmds.c | 2 +-
audio/audio.c | 2 +-
authz/listfile.c | 4 +-
backends/cryptodev-hmp-cmds.c | 2 +-
block.c | 8 +-
block/blkdebug.c | 6 +-
block/blkio.c | 2 +-
block/blklogwrites.c | 4 +-
block/blkverify.c | 4 +-
block/copy-before-write.c | 2 +-
block/copy-on-read.c | 2 +-
block/curl.c | 4 +-
block/file-posix.c | 4 +-
block/file-win32.c | 4 +-
block/gluster.c | 2 +-
block/iscsi.c | 4 +-
block/monitor/block-hmp-cmds.c | 2 +-
block/nbd.c | 2 +-
block/nfs.c | 4 +-
block/null.c | 4 +-
block/nvme.c | 4 +-
block/parallels.c | 2 +-
block/qapi-system.c | 2 +-
block/qapi.c | 10 +-
block/qcow.c | 4 +-
block/qcow2.c | 4 +-
block/qed.c | 2 +-
block/quorum.c | 6 +-
block/rbd.c | 8 +-
block/replication.c | 2 +-
block/snapshot.c | 4 +-
block/ssh.c | 4 +-
block/stream.c | 2 +-
block/vhdx.c | 2 +-
block/vmdk.c | 2 +-
block/vpc.c | 2 +-
block/vvfat.c | 4 +-
blockdev.c | 8 +-
chardev/char-hmp-cmds.c | 2 +-
dump/dump-hmp-cmds.c | 2 +-
hw/arm/aspeed_ast27x0.c | 2 +-
hw/arm/mps2-tz.c | 2 +-
hw/arm/mps2.c | 2 +-
hw/arm/mps3r.c | 2 +-
hw/arm/sbsa-ref.c | 2 +-
hw/arm/stellaris.c | 2 +-
hw/arm/vexpress.c | 2 +-
hw/arm/virt.c | 2 +-
hw/arm/xlnx-versal.c | 2 +-
hw/block/xen-block.c | 4 +-
hw/core/machine-hmp-cmds.c | 2 +-
hw/core/machine-qmp-cmds.c | 2 +-
hw/core/qdev-properties.c | 2 +-
hw/core/qdev.c | 2 +-
hw/hyperv/hv-balloon.c | 2 +-
hw/i386/acpi-build.c | 2 +-
hw/i386/kvm/xen_evtchn.c | 2 +-
hw/i386/monitor.c | 2 +-
hw/i386/pc.c | 2 +-
hw/net/rocker/rocker-hmp-cmds.c | 2 +-
hw/net/virtio-net.c | 2 +-
hw/net/xen_nic.c | 2 +-
hw/pci/pci-hmp-cmds.c | 2 +-
hw/ppc/pegasos2.c | 2 +-
hw/ppc/spapr_drc.c | 2 +-
hw/rx/rx62n.c | 2 +-
hw/s390x/s390-skeys.c | 2 +-
hw/s390x/s390-stattrib.c | 2 +-
hw/usb/xen-usb.c | 4 +-
hw/vfio/pci.c | 2 +-
hw/virtio/virtio-hmp-cmds.c | 2 +-
hw/virtio/virtio-qmp.c | 4 +-
hw/xen/xen-bus.c | 2 +-
migration/dirtyrate.c | 2 +-
migration/migration-hmp-cmds.c | 2 +-
migration/migration.c | 2 +-
migration/options.c | 2 +-
migration/vmstate.c | 2 +-
monitor/hmp-cmds-target.c | 2 +-
monitor/hmp-cmds.c | 2 +-
monitor/hmp.c | 4 +-
monitor/monitor.c | 2 +-
monitor/qemu-config-qmp.c | 2 +-
monitor/qmp.c | 6 +-
net/net-hmp-cmds.c | 2 +-
net/net.c | 2 +-
net/slirp.c | 2 +-
qapi/qapi-clone-visitor.c | 2 +-
qapi/qapi-dealloc-visitor.c | 2 +-
qapi/qapi-forward-visitor.c | 14 +-
qapi/qmp-dispatch.c | 6 +-
qapi/qmp-event.c | 6 +-
qapi/qobject-input-visitor.c | 14 +-
qapi/qobject-output-visitor.c | 12 +-
qapi/string-input-visitor.c | 2 +-
qemu-img.c | 4 +-
qemu-io-cmds.c | 2 +-
qemu-io.c | 4 +-
qemu-nbd.c | 4 +-
qga/main.c | 6 +-
qobject/block-qdict.c | 8 +-
qobject/json-parser.c | 12 +-
qobject/json-writer.c | 2 +-
qobject/qbool.c | 2 +-
qobject/qdict.c | 10 +-
qobject/qjson.c | 16 +-
qobject/qlist.c | 10 +-
qobject/qlit.c | 14 +-
qobject/qnull.c | 2 +-
qobject/qnum.c | 2 +-
qobject/qobject.c | 12 +-
qobject/qstring.c | 2 +-
qom/object.c | 10 +-
qom/object_interfaces.c | 6 +-
qom/qom-hmp-cmds.c | 4 +-
qom/qom-qmp-cmds.c | 2 +-
replay/replay-debugging.c | 2 +-
replay/replay-snapshot.c | 2 +-
scsi/qemu-pr-helper.c | 2 +-
stats/stats-hmp-cmds.c | 2 +-
storage-daemon/qemu-storage-daemon.c | 4 +-
system/device_tree.c | 2 +-
system/dirtylimit.c | 2 +-
system/qdev-monitor.c | 4 +-
system/runstate-hmp-cmds.c | 2 +-
system/vl.c | 6 +-
target/arm/arm-qmp-cmds.c | 2 +-
target/i386/cpu-apic.c | 2 +-
target/i386/cpu-system.c | 2 +-
target/i386/monitor.c | 2 +-
target/loongarch/loongarch-qmp-cmds.c | 2 +-
target/ppc/cpu_init.c | 2 +-
target/riscv/riscv-qmp-cmds.c | 4 +-
target/s390x/cpu_models_system.c | 2 +-
tests/qtest/adm1266-test.c | 4 +-
tests/qtest/adm1272-test.c | 4 +-
tests/qtest/ahci-test.c | 2 +-
tests/qtest/arm-cpu-features.c | 4 +-
tests/qtest/aspeed_gpio-test.c | 2 +-
tests/qtest/ast2700-gpio-test.c | 2 +-
tests/qtest/boot-order-test.c | 2 +-
tests/qtest/cdrom-test.c | 2 +-
tests/qtest/cpu-plug-test.c | 4 +-
tests/qtest/device-introspect-test.c | 6 +-
tests/qtest/device-plug-test.c | 4 +-
tests/qtest/drive_del-test.c | 4 +-
tests/qtest/emc141x-test.c | 2 +-
tests/qtest/fdc-test.c | 2 +-
tests/qtest/hd-geo-test.c | 2 +-
tests/qtest/ide-test.c | 2 +-
tests/qtest/isl_pmbus_vr-test.c | 4 +-
tests/qtest/libqmp.c | 4 +-
tests/qtest/libqos/generic-pcihost.c | 2 +-
tests/qtest/libqos/libqos.c | 2 +-
tests/qtest/libqos/pci-pc.c | 2 +-
tests/qtest/libqos/qos_external.c | 8 +-
tests/qtest/libqtest.c | 10 +-
tests/qtest/lsm303dlhc-mag-test.c | 2 +-
tests/qtest/machine-none-test.c | 2 +-
tests/qtest/max34451-test.c | 4 +-
tests/qtest/migration-helpers.c | 530 ++++++++++++++++++++
tests/qtest/migration/file-tests.c | 2 +-
tests/qtest/migration/framework.c | 4 +-
tests/qtest/migration/migration-qmp.c | 6 +-
tests/qtest/migration/migration-util.c | 2 +-
tests/qtest/migration/misc-tests.c | 2 +-
tests/qtest/migration/postcopy-tests.c | 2 +-
tests/qtest/migration/precopy-tests.c | 2 +-
tests/qtest/netdev-socket.c | 2 +-
tests/qtest/npcm7xx_adc-test.c | 2 +-
tests/qtest/npcm7xx_emc-test.c | 4 +-
tests/qtest/npcm7xx_pwm-test.c | 4 +-
tests/qtest/npcm7xx_watchdog_timer-test.c | 2 +-
tests/qtest/numa-test.c | 4 +-
tests/qtest/pvpanic-pci-test.c | 2 +-
tests/qtest/pvpanic-test.c | 2 +-
tests/qtest/q35-test.c | 2 +-
tests/qtest/qmp-cmd-test.c | 2 +-
tests/qtest/qmp-test.c | 6 +-
tests/qtest/qom-test.c | 4 +-
tests/qtest/qos-test.c | 2 +-
tests/qtest/readconfig-test.c | 6 +-
tests/qtest/tco-test.c | 2 +-
tests/qtest/test-filter-mirror.c | 2 +-
tests/qtest/test-filter-redirector.c | 2 +-
tests/qtest/test-netfilter.c | 2 +-
tests/qtest/test-x86-cpuid-compat.c | 8 +-
tests/qtest/tmp105-test.c | 2 +-
tests/qtest/tpm-emu.c | 4 +-
tests/qtest/tpm-util.c | 2 +-
tests/qtest/vhost-user-test.c | 2 +-
tests/qtest/virtio-net-failover.c | 6 +-
tests/qtest/virtio-net-test.c | 2 +-
tests/qtest/vmgenid-test.c | 2 +-
tests/qtest/wdt_ib700-test.c | 2 +-
tests/unit/check-block-qdict.c | 4 +-
tests/unit/check-qdict.c | 6 +-
tests/unit/check-qjson.c | 12 +-
tests/unit/check-qlist.c | 4 +-
tests/unit/check-qlit.c | 12 +-
tests/unit/check-qnull.c | 2 +-
tests/unit/check-qnum.c | 2 +-
tests/unit/check-qobject.c | 12 +-
tests/unit/check-qom-proplist.c | 4 +-
tests/unit/check-qstring.c | 2 +-
tests/unit/test-block-iothread.c | 2 +-
tests/unit/test-blockjob-txn.c | 2 +-
tests/unit/test-blockjob.c | 2 +-
tests/unit/test-char.c | 2 +-
tests/unit/test-forward-visitor.c | 4 +-
tests/unit/test-image-locking.c | 2 +-
tests/unit/test-keyval.c | 6 +-
tests/unit/test-qemu-opts.c | 4 +-
tests/unit/test-qga.c | 4 +-
tests/unit/test-qmp-cmds.c | 8 +-
tests/unit/test-qmp-event.c | 10 +-
tests/unit/test-qobject-input-visitor.c | 12 +-
tests/unit/test-qobject-output-visitor.c | 12 +-
tests/unit/test-replication.c | 2 +-
tests/unit/test-visitor-serialization.c | 4 +-
trace/trace-hmp-cmds.c | 2 +-
ui/ui-hmp-cmds.c | 2 +-
util/keyval.c | 6 +-
util/qemu-config.c | 4 +-
util/qemu-option.c | 8 +-
scripts/qapi/commands.py | 4 +-
scripts/qapi/events.py | 2 +-
scripts/qapi/introspect.py | 2 +-
248 files changed, 970 insertions(+), 443 deletions(-)
rename include/{qapi/qmp => qobject}/json-parser.h (100%)
rename include/{qapi/qmp => qobject}/json-writer.h (100%)
rename include/{qapi/qmp => qobject}/qbool.h (94%)
rename include/{qapi/qmp => qobject}/qdict.h (98%)
rename include/{qapi/qmp => qobject}/qjson.h (100%)
rename include/{qapi/qmp => qobject}/qlist.h (98%)
rename include/{qapi/qmp => qobject}/qlit.h (100%)
rename include/{qapi/qmp => qobject}/qnull.h (94%)
rename include/{qapi/qmp => qobject}/qnum.h (98%)
rename include/{qapi/qmp => qobject}/qobject.h (98%)
rename include/{qapi/qmp => qobject}/qstring.h (96%)
create mode 100644 tests/qtest/migration-helpers.cMAINTAINERS +1 -4
@@ -3235,8 +3235,6 @@ S: Supported F: qapi/ X: qapi/*.json F: include/qapi/ -X: include/qapi/qmp/ -F: include/qapi/qmp/dispatch.h F: tests/qapi-schema/ F: tests/unit/test-*-visitor.c F: tests/unit/test-qapi-*.c
@@ -3260,8 +3258,7 @@ QObject M: Markus Armbruster <[email protected]> S: Supported F: qobject/ -F: include/qapi/qmp/ -X: include/qapi/qmp/dispatch.h +F: include/qobject/ F: scripts/coccinelle/qobject.cocci F: tests/unit/check-qdict.c F: tests/unit/check-qjson.c
docs/devel/qapi-code-gen.rst +1 -1
@@ -1986,7 +1986,7 @@ Example:: #ifndef 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;
include/block/qdict.h +1 -1
@@ -10,7 +10,7 @@#ifndef BLOCK_QDICT_H #define BLOCK_QDICT_H -#include "qapi/qmp/qdict.h" +#include "qobject/qdict.h" QObject *qdict_crumple (const QDict *src,Error **errp);void qdict_flatten (QDict *qdict);
include/qobject/json-parser.h renamed from include/qapi/qmp/json-parser.h +0 -0
include/qobject/json-writer.h renamed from include/qapi/qmp/json-writer.h +0 -0
include/qobject/qbool.h renamed from include/qapi/qmp/qbool.h +1 -1
@@ -14,7 +14,7 @@ #ifndef QBOOL_H #define QBOOL_H -#include "qapi/qmp/qobject.h" +#include "qobject/qobject.h" struct QBool { struct QObjectBase_ base;
include/qobject/qdict.h renamed from include/qapi/qmp/qdict.h +1 -1
@@ -13,7 +13,7 @@#ifndef QDICT_H #define QDICT_H -#include "qapi/qmp/qobject.h" +#include "qobject/qobject.h" #include "qemu/queue.h" #define QDICT_BUCKET_MAX 512
include/qobject/qjson.h renamed from include/qapi/qmp/qjson.h +0 -0
include/qobject/qlist.h renamed from include/qapi/qmp/qlist.h +1 -1
@@ -13,7 +13,7 @@ #ifndef QLIST_H #define QLIST_H -#include "qapi/qmp/qobject.h" +#include "qobject/qobject.h" #include "qemu/queue.h" typedef struct QListEntry {
include/qobject/qlit.h renamed from include/qapi/qmp/qlit.h +0 -0
include/qobject/qnull.h renamed from include/qapi/qmp/qnull.h +1 -1
@@ -13,7 +13,7 @@ #ifndef QNULL_H #define QNULL_H -#include "qapi/qmp/qobject.h" +#include "qobject/qobject.h" struct QNull { struct QObjectBase_ base;
include/qobject/qnum.h renamed from include/qapi/qmp/qnum.h +1 -1
@@ -15,7 +15,7 @@ #ifndef QNUM_H #define QNUM_H -#include "qapi/qmp/qobject.h" +#include "qobject/qobject.h" typedef enum { QNUM_I64,
include/qobject/qobject.h renamed from include/qapi/qmp/qobject.h +1 -1
@@ -34,7 +34,7 @@#include "qapi/qapi-builtin-types.h" -/* Not for use outside include/qapi/qmp/ */ +/* Not for use outside include/qobject/ */ struct QObjectBase_ {QType type;size_t refcnt;
include/qobject/qstring.h renamed from include/qapi/qmp/qstring.h +1 -1
@@ -13,7 +13,7 @@ #ifndef QSTRING_H #define QSTRING_H -#include "qapi/qmp/qobject.h" +#include "qobject/qobject.h" struct QString { struct QObjectBase_ base;
migration/migration.h +1 -1
@@ -17,7 +17,7 @@#include "exec/cpu-common.h" #include "hw/qdev-core.h" #include "qapi/qapi-types-migration.h" -#include "qapi/qmp/json-writer.h" +#include "qobject/json-writer.h" #include "qemu/thread.h" #include "qemu/coroutine.h" #include "io/channel.h"
monitor/monitor-internal.h +1 -1
@@ -29,7 +29,7 @@#include "monitor/monitor.h" #include "qapi/qapi-types-control.h" #include "qapi/qmp/dispatch.h" -#include "qapi/qmp/json-parser.h" +#include "qobject/json-parser.h" #include "qemu/readline.h" #include "system/iothread.h"
qobject/json-parser-int.h +1 -1
@@ -14,7 +14,7 @@ #ifndef JSON_PARSER_INT_H #define JSON_PARSER_INT_H -#include "qapi/qmp/json-parser.h" +#include "qobject/json-parser.h" typedef enum json_token_type { JSON_ERROR = 0, /* must be zero, see json_lexer[] */
qobject/qobject-internal.h +1 -1
@@ -10,7 +10,7 @@#ifndef QOBJECT_INTERNAL_H #define QOBJECT_INTERNAL_H -#include "qapi/qmp/qobject.h" +#include "qobject/qobject.h" static inline void qobject_init (QObject *obj,QType type) {
tests/qtest/libqmp.h +1 -1
@@ -18,7 +18,7 @@#ifndef LIBQMP_H #define LIBQMP_H -#include "qapi/qmp/qdict.h" +#include "qobject/qdict.h" QDict *qmp_fd_receive (int fd);#ifndef _WIN32
tests/qtest/libqtest.h +3 -3
@@ -17,9 +17,9 @@#ifndef LIBQTEST_H #define LIBQTEST_H -#include "qapi/qmp/qobject.h" -#include "qapi/qmp/qdict.h" -#include "qapi/qmp/qlist.h" +#include "qobject/qobject.h" +#include "qobject/qdict.h" +#include "qobject/qlist.h" #include "libqmp.h" typedef struct QTestState QTestState ;
audio/audio-hmp-cmds.c +1 -1
@@ -27,7 +27,7 @@#include "monitor/hmp.h" #include "monitor/monitor.h" #include "qapi/error.h" -#include "qapi/qmp/qdict.h" +#include "qobject/qdict.h" static QLIST_HEAD (capture_list_head, CaptureState) capture_head;
audio/audio.c +1 -1
@@ -32,7 +32,7 @@#include "qapi/qobject-input-visitor.h" #include "qapi/qapi-visit-audio.h" #include "qapi/qapi-commands-audio.h" -#include "qapi/qmp/qdict.h" +#include "qobject/qdict.h" #include "qemu/cutils.h" #include "qemu/error-report.h" #include "qemu/log.h"
authz/listfile.c +2 -2
@@ -28,8 +28,8 @@#include "qemu/filemonitor.h" #include "qom/object_interfaces.h" #include "qapi/qapi-visit-authz.h" -#include "qapi/qmp/qjson.h" -#include "qapi/qmp/qobject.h" +#include "qobject/qjson.h" +#include "qobject/qobject.h" #include "qapi/qobject-input-visitor.h"
backends/cryptodev-hmp-cmds.c +1 -1
@@ -14,7 +14,7 @@#include "monitor/hmp.h" #include "monitor/monitor.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)
block.c +4 -4
@@ -36,10 +36,10 @@#include "qemu/main-loop.h" #include "qemu/module.h" #include "qapi/error.h" -#include "qapi/qmp/qdict.h" -#include "qapi/qmp/qjson.h" -#include "qapi/qmp/qnull.h" -#include "qapi/qmp/qstring.h" +#include "qobject/qdict.h" +#include "qobject/qjson.h" +#include "qobject/qnull.h" +#include "qobject/qstring.h" #include "qapi/qobject-output-visitor.h" #include "qapi/qapi-visit-block-core.h" #include "system/block-backend.h"
block/blkdebug.c +3 -3
@@ -33,9 +33,9 @@#include "qemu/module.h" #include "qemu/option.h" #include "qapi/qapi-visit-block-core.h" -#include "qapi/qmp/qdict.h" -#include "qapi/qmp/qlist.h" -#include "qapi/qmp/qstring.h" +#include "qobject/qdict.h" +#include "qobject/qlist.h" +#include "qobject/qstring.h" #include "qapi/qobject-input-visitor.h" #include "system/qtest.h"
block/blkio.c +1 -1
@@ -16,7 +16,7 @@#include "qemu/defer-call.h" #include "qapi/error.h" #include "qemu/error-report.h" -#include "qapi/qmp/qdict.h" +#include "qobject/qdict.h" #include "qemu/module.h" #include "system/block-backend.h" #include "exec/memory.h" /* for ram_block_discard_disable() */
block/blklogwrites.c +2 -2
@@ -14,8 +14,8 @@#include "qemu/sockets.h" /* for EINPROGRESS on Windows */ #include "block/block-io.h" #include "block/block_int.h" -#include "qapi/qmp/qdict.h" -#include "qapi/qmp/qstring.h" +#include "qobject/qdict.h" +#include "qobject/qstring.h" #include "qemu/cutils.h" #include "qemu/module.h" #include "qemu/option.h"
block/blkverify.c +2 -2
@@ -12,8 +12,8 @@#include "qemu/sockets.h" /* for EINPROGRESS on Windows */ #include "block/block-io.h" #include "block/block_int.h" -#include "qapi/qmp/qdict.h" -#include "qapi/qmp/qstring.h" +#include "qobject/qdict.h" +#include "qobject/qstring.h" #include "qemu/cutils.h" #include "qemu/module.h" #include "qemu/option.h"
block/copy-before-write.c +1 -1
@@ -24,7 +24,7 @@*/ #include "qemu/osdep.h" -#include "qapi/qmp/qjson.h" +#include "qobject/qjson.h" #include "system/block-backend.h" #include "qemu/cutils.h"
block/copy-on-read.c +1 -1
@@ -25,7 +25,7 @@#include "block/block_int.h" #include "qemu/module.h" #include "qapi/error.h" -#include "qapi/qmp/qdict.h" +#include "qobject/qdict.h" #include "block/copy-on-read.h"
block/curl.c +2 -2
@@ -29,8 +29,8 @@#include "qemu/option.h" #include "block/block-io.h" #include "block/block_int.h" -#include "qapi/qmp/qdict.h" -#include "qapi/qmp/qstring.h" +#include "qobject/qdict.h" +#include "qobject/qstring.h" #include "crypto/secret.h" #include <curl/curl.h> #include "qemu/cutils.h"
block/file-posix.c +2 -2
@@ -36,8 +36,8 @@#include "block/thread-pool.h" #include "qemu/iov.h" #include "block/raw-aio.h" -#include "qapi/qmp/qdict.h" -#include "qapi/qmp/qstring.h" +#include "qobject/qdict.h" +#include "qobject/qstring.h" #include "scsi/pr-manager.h" #include "scsi/constants.h"
block/file-win32.c +2 -2
@@ -33,8 +33,8 @@#include "trace.h" #include "block/thread-pool.h" #include "qemu/iov.h" -#include "qapi/qmp/qdict.h" -#include "qapi/qmp/qstring.h" +#include "qobject/qdict.h" +#include "qobject/qstring.h" #include <windows.h> #include <winioctl.h>
block/gluster.c +1 -1
@@ -15,7 +15,7 @@#include "block/block_int.h" #include "block/qdict.h" #include "qapi/error.h" -#include "qapi/qmp/qdict.h" +#include "qobject/qdict.h" #include "qapi/qmp/qerror.h" #include "qemu/error-report.h" #include "qemu/module.h"
block/iscsi.c +2 -2
@@ -44,8 +44,8 @@#include "system/replay.h" #include "qapi/error.h" #include "qapi/qapi-commands-machine.h" -#include "qapi/qmp/qdict.h" -#include "qapi/qmp/qstring.h" +#include "qobject/qdict.h" +#include "qobject/qstring.h" #include "crypto/secret.h" #include "scsi/utils.h" #include "trace.h"
block/monitor/block-hmp-cmds.c +1 -1
@@ -41,7 +41,7 @@#include "system/blockdev.h" #include "qapi/qapi-commands-block.h" #include "qapi/qapi-commands-block-export.h" -#include "qapi/qmp/qdict.h" +#include "qobject/qdict.h" #include "qapi/error.h" #include "qapi/qmp/qerror.h" #include "qemu/config-file.h"
block/nbd.c +1 -1
@@ -36,7 +36,7 @@#include "qemu/main-loop.h" #include "qapi/qapi-visit-sockets.h" -#include "qapi/qmp/qstring.h" +#include "qobject/qstring.h" #include "qapi/clone-visitor.h" #include "block/qdict.h"
block/nfs.c +2 -2
@@ -41,8 +41,8 @@#include "qemu/cutils.h" #include "system/replay.h" #include "qapi/qapi-visit-block-core.h" -#include "qapi/qmp/qdict.h" -#include "qapi/qmp/qstring.h" +#include "qobject/qdict.h" +#include "qobject/qstring.h" #include "qapi/qobject-input-visitor.h" #include "qapi/qobject-output-visitor.h" #include <nfsc/libnfs.h>
block/null.c +2 -2
@@ -12,8 +12,8 @@#include "qemu/osdep.h" #include "qapi/error.h" -#include "qapi/qmp/qdict.h" -#include "qapi/qmp/qstring.h" +#include "qobject/qdict.h" +#include "qobject/qstring.h" #include "qemu/module.h" #include "qemu/option.h" #include "block/block-io.h"
block/nvme.c +2 -2
@@ -14,8 +14,8 @@#include "qemu/osdep.h" #include <linux/vfio.h> #include "qapi/error.h" -#include "qapi/qmp/qdict.h" -#include "qapi/qmp/qstring.h" +#include "qobject/qdict.h" +#include "qobject/qstring.h" #include "qemu/defer-call.h" #include "qemu/error-report.h" #include "qemu/main-loop.h"
block/parallels.c +1 -1
@@ -36,7 +36,7 @@#include "system/block-backend.h" #include "qemu/module.h" #include "qemu/option.h" -#include "qapi/qmp/qdict.h" +#include "qobject/qdict.h" #include "qapi/qobject-input-visitor.h" #include "qapi/qapi-visit-block-core.h" #include "qemu/bswap.h"
block/qapi-system.c +1 -1
@@ -35,7 +35,7 @@#include "block/block_int.h" #include "qapi/error.h" #include "qapi/qapi-commands-block.h" -#include "qapi/qmp/qdict.h" +#include "qobject/qdict.h" #include "system/block-backend.h" #include "system/blockdev.h"
block/qapi.c +5 -5
@@ -33,11 +33,11 @@#include "qapi/qapi-commands-block-core.h" #include "qapi/qobject-output-visitor.h" #include "qapi/qapi-visit-block-core.h" -#include "qapi/qmp/qbool.h" -#include "qapi/qmp/qdict.h" -#include "qapi/qmp/qlist.h" -#include "qapi/qmp/qnum.h" -#include "qapi/qmp/qstring.h" +#include "qobject/qbool.h" +#include "qobject/qdict.h" +#include "qobject/qlist.h" +#include "qobject/qnum.h" +#include "qobject/qstring.h" #include "qemu/qemu-print.h" #include "system/block-backend.h"
block/qcow.c +2 -2
@@ -34,8 +34,8 @@#include "qemu/cutils.h" #include "qemu/memalign.h" #include <zlib.h> -#include "qapi/qmp/qdict.h" -#include "qapi/qmp/qstring.h" +#include "qobject/qdict.h" +#include "qobject/qstring.h" #include "qapi/qobject-input-visitor.h" #include "qapi/qapi-visit-block-core.h" #include "crypto/block.h"
block/qcow2.c +2 -2
@@ -32,8 +32,8 @@#include "qemu/error-report.h" #include "qapi/error.h" #include "qapi/qapi-events-block-core.h" -#include "qapi/qmp/qdict.h" -#include "qapi/qmp/qstring.h" +#include "qobject/qdict.h" +#include "qobject/qstring.h" #include "trace.h" #include "qemu/option_int.h" #include "qemu/cutils.h"
block/qed.c +1 -1
@@ -24,7 +24,7 @@#include "trace.h" #include "qed.h" #include "system/block-backend.h" -#include "qapi/qmp/qdict.h" +#include "qobject/qdict.h" #include "qapi/qobject-input-visitor.h" #include "qapi/qapi-visit-block-core.h"
block/quorum.c +3 -3
@@ -23,10 +23,10 @@#include "block/qdict.h" #include "qapi/error.h" #include "qapi/qapi-events-block.h" -#include "qapi/qmp/qdict.h" +#include "qobject/qdict.h" #include "qapi/qmp/qerror.h" -#include "qapi/qmp/qlist.h" -#include "qapi/qmp/qstring.h" +#include "qobject/qlist.h" +#include "qobject/qstring.h" #include "crypto/hash.h" #define HASH_LENGTH 32
block/rbd.c +4 -4
@@ -24,10 +24,10 @@#include "crypto/secret.h" #include "qemu/cutils.h" #include "system/replay.h" -#include "qapi/qmp/qstring.h" -#include "qapi/qmp/qdict.h" -#include "qapi/qmp/qjson.h" -#include "qapi/qmp/qlist.h" +#include "qobject/qstring.h" +#include "qobject/qdict.h" +#include "qobject/qjson.h" +#include "qobject/qlist.h" #include "qapi/qobject-input-visitor.h" #include "qapi/qapi-visit-block-core.h"
block/replication.c +1 -1
@@ -21,7 +21,7 @@#include "block/block_backup.h" #include "system/block-backend.h" #include "qapi/error.h" -#include "qapi/qmp/qdict.h" +#include "qobject/qdict.h" #include "block/replication.h" typedef enum {
block/snapshot.c +2 -2
@@ -27,8 +27,8 @@#include "block/block_int.h" #include "block/qdict.h" #include "qapi/error.h" -#include "qapi/qmp/qdict.h" -#include "qapi/qmp/qstring.h" +#include "qobject/qdict.h" +#include "qobject/qstring.h" #include "qemu/option.h" #include "system/block-backend.h"
block/ssh.c +2 -2
@@ -39,8 +39,8 @@#include "qemu/sockets.h" #include "qapi/qapi-visit-sockets.h" #include "qapi/qapi-visit-block-core.h" -#include "qapi/qmp/qdict.h" -#include "qapi/qmp/qstring.h" +#include "qobject/qdict.h" +#include "qobject/qstring.h" #include "qapi/qobject-input-visitor.h" #include "qapi/qobject-output-visitor.h" #include "trace.h"
block/stream.c +1 -1
@@ -16,7 +16,7 @@#include "block/block_int.h" #include "block/blockjob_int.h" #include "qapi/error.h" -#include "qapi/qmp/qdict.h" +#include "qobject/qdict.h" #include "qemu/ratelimit.h" #include "system/block-backend.h" #include "block/copy-on-read.h"
block/vhdx.c +1 -1
@@ -29,7 +29,7 @@#include "vhdx.h" #include "migration/blocker.h" #include "qemu/uuid.h" -#include "qapi/qmp/qdict.h" +#include "qobject/qdict.h" #include "qapi/qobject-input-visitor.h" #include "qapi/qapi-visit-block-core.h"
block/vmdk.c +1 -1
@@ -27,7 +27,7 @@#include "qapi/error.h" #include "block/block_int.h" #include "system/block-backend.h" -#include "qapi/qmp/qdict.h" +#include "qobject/qdict.h" #include "qemu/error-report.h" #include "qemu/module.h" #include "qemu/option.h"
block/vpc.c +1 -1
@@ -34,7 +34,7 @@#include "qemu/bswap.h" #include "qemu/uuid.h" #include "qemu/memalign.h" -#include "qapi/qmp/qdict.h" +#include "qobject/qdict.h" #include "qapi/qobject-input-visitor.h" #include "qapi/qapi-visit-block-core.h"
block/vvfat.c +2 -2
@@ -34,8 +34,8 @@#include "qemu/option.h" #include "qemu/bswap.h" #include "migration/blocker.h" -#include "qapi/qmp/qdict.h" -#include "qapi/qmp/qstring.h" +#include "qobject/qdict.h" +#include "qobject/qstring.h" #include "qemu/ctype.h" #include "qemu/cutils.h" #include "qemu/error-report.h"
blockdev.c +4 -4
@@ -46,12 +46,12 @@#include "qapi/qapi-commands-block.h" #include "qapi/qapi-commands-transaction.h" #include "qapi/qapi-visit-block-core.h" -#include "qapi/qmp/qdict.h" -#include "qapi/qmp/qnum.h" -#include "qapi/qmp/qstring.h" +#include "qobject/qdict.h" +#include "qobject/qnum.h" +#include "qobject/qstring.h" #include "qapi/error.h" #include "qapi/qmp/qerror.h" -#include "qapi/qmp/qlist.h" +#include "qobject/qlist.h" #include "qapi/qobject-output-visitor.h" #include "system/system.h" #include "system/iothread.h"
chardev/char-hmp-cmds.c +1 -1
@@ -19,7 +19,7 @@#include "monitor/monitor.h" #include "qapi/error.h" #include "qapi/qapi-commands-char.h" -#include "qapi/qmp/qdict.h" +#include "qobject/qdict.h" #include "qemu/config-file.h" #include "qemu/option.h"
dump/dump-hmp-cmds.c +1 -1
@@ -10,7 +10,7 @@#include "monitor/monitor.h" #include "qapi/error.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) {
hw/arm/aspeed_ast27x0.c +1 -1
@@ -20,7 +20,7 @@#include "net/net.h" #include "system/system.h" #include "hw/intc/arm_gicv3.h" -#include "qapi/qmp/qlist.h" +#include "qobject/qlist.h" #include "qemu/log.h" static const hwaddr aspeed_soc_ast2700_memmap[] = {
hw/arm/mps2-tz.c +1 -1
@@ -48,7 +48,7 @@#include "qemu/units.h" #include "qemu/cutils.h" #include "qapi/error.h" -#include "qapi/qmp/qlist.h" +#include "qobject/qlist.h" #include "qemu/error-report.h" #include "hw/arm/boot.h" #include "hw/arm/armv7m.h"
hw/arm/mps2.c +1 -1
@@ -48,7 +48,7 @@#include "net/net.h" #include "hw/watchdog/cmsdk-apb-watchdog.h" #include "hw/qdev-clock.h" -#include "qapi/qmp/qlist.h" +#include "qobject/qlist.h" #include "qom/object.h" typedef enum MPS2FPGAType {
hw/arm/mps3r.c +1 -1
@@ -27,7 +27,7 @@#include "qemu/osdep.h" #include "qemu/units.h" #include "qapi/error.h" -#include "qapi/qmp/qlist.h" +#include "qobject/qlist.h" #include "exec/address-spaces.h" #include "cpu.h" #include "system/system.h"
hw/arm/sbsa-ref.c +1 -1
@@ -48,7 +48,7 @@#include "hw/char/pl011.h" #include "hw/watchdog/sbsa_gwdt.h" #include "net/net.h" -#include "qapi/qmp/qlist.h" +#include "qobject/qlist.h" #include "qom/object.h" #include "target/arm/cpu-qom.h" #include "target/arm/gtimer.h"
hw/arm/stellaris.c +1 -1
@@ -32,7 +32,7 @@#include "hw/timer/stellaris-gptm.h" #include "hw/qdev-clock.h" #include "qom/object.h" -#include "qapi/qmp/qlist.h" +#include "qobject/qlist.h" #include "ui/input.h" #define GPIO_A 0
hw/arm/vexpress.c +1 -1
@@ -42,7 +42,7 @@#include "hw/cpu/a15mpcore.h" #include "hw/i2c/arm_sbcon_i2c.h" #include "hw/sd/sd.h" -#include "qapi/qmp/qlist.h" +#include "qobject/qlist.h" #include "qom/object.h" #include "audio/audio.h" #include "target/arm/cpu-qom.h"
hw/arm/virt.c +1 -1
@@ -70,7 +70,7 @@#include "hw/firmware/smbios.h" #include "qapi/visitor.h" #include "qapi/qapi-visit-common.h" -#include "qapi/qmp/qlist.h" +#include "qobject/qlist.h" #include "standard-headers/linux/input.h" #include "hw/arm/smmuv3.h" #include "hw/acpi/acpi.h"
hw/arm/xlnx-versal.c +1 -1
@@ -12,7 +12,7 @@#include "qemu/osdep.h" #include "qemu/units.h" #include "qapi/error.h" -#include "qapi/qmp/qlist.h" +#include "qobject/qlist.h" #include "qemu/module.h" #include "hw/sysbus.h" #include "net/net.h"
hw/block/xen-block.c +2 -2
@@ -16,8 +16,8 @@#include "qapi/qapi-visit-block-core.h" #include "qapi/qobject-input-visitor.h" #include "qapi/visitor.h" -#include "qapi/qmp/qdict.h" -#include "qapi/qmp/qstring.h" +#include "qobject/qdict.h" +#include "qobject/qstring.h" #include "qom/object_interfaces.h" #include "hw/block/xen_blkif.h" #include "hw/qdev-properties.h"
hw/core/machine-hmp-cmds.c +1 -1
@@ -19,7 +19,7 @@#include "qapi/error.h" #include "qapi/qapi-builtin-visit.h" #include "qapi/qapi-commands-machine.h" -#include "qapi/qmp/qdict.h" +#include "qobject/qdict.h" #include "qapi/string-output-visitor.h" #include "qemu/error-report.h" #include "system/numa.h"
hw/core/machine-qmp-cmds.c +1 -1
@@ -15,7 +15,7 @@#include "qapi/error.h" #include "qapi/qapi-builtin-visit.h" #include "qapi/qapi-commands-machine.h" -#include "qapi/qmp/qobject.h" +#include "qobject/qobject.h" #include "qapi/qobject-input-visitor.h" #include "qapi/type-helpers.h" #include "qemu/uuid.h"
hw/core/qdev-properties.c +1 -1
@@ -2,7 +2,7 @@#include "hw/qdev-properties.h" #include "qapi/error.h" #include "qapi/qapi-types-misc.h" -#include "qapi/qmp/qlist.h" +#include "qobject/qlist.h" #include "qemu/ctype.h" #include "qemu/error-report.h" #include "qapi/visitor.h"
hw/core/qdev.c +1 -1
@@ -28,7 +28,7 @@#include "qemu/osdep.h" #include "qapi/error.h" #include "qapi/qapi-events-qdev.h" -#include "qapi/qmp/qdict.h" +#include "qobject/qdict.h" #include "qapi/visitor.h" #include "qemu/error-report.h" #include "qemu/option.h"
hw/hyperv/hv-balloon.c +1 -1
@@ -26,7 +26,7 @@#include "qapi/qapi-commands-machine.h" #include "qapi/qapi-events-machine.h" #include "qapi/qapi-types-machine.h" -#include "qapi/qmp/qdict.h" +#include "qobject/qdict.h" #include "qapi/visitor.h" #include "qemu/error-report.h" #include "qemu/module.h"
hw/i386/acpi-build.c +1 -1
@@ -22,7 +22,7 @@#include "qemu/osdep.h" #include "qapi/error.h" -#include "qapi/qmp/qnum.h" +#include "qobject/qnum.h" #include "acpi-build.h" #include "acpi-common.h" #include "qemu/bitmap.h"
hw/i386/kvm/xen_evtchn.c +1 -1
@@ -20,7 +20,7 @@#include "monitor/hmp.h" #include "qapi/error.h" #include "qapi/qapi-commands-misc-target.h" -#include "qapi/qmp/qdict.h" +#include "qobject/qdict.h" #include "qom/object.h" #include "exec/target_page.h" #include "exec/address-spaces.h"
hw/i386/monitor.c +1 -1
@@ -24,7 +24,7 @@#include "qemu/osdep.h" #include "monitor/monitor.h" -#include "qapi/qmp/qdict.h" +#include "qobject/qdict.h" #include "qapi/error.h" #include "qapi/qapi-commands-misc-target.h" #include "hw/i386/x86.h"
hw/i386/pc.c +1 -1
@@ -44,7 +44,7 @@#include "system/reset.h" #include "kvm/kvm_i386.h" #include "hw/xen/xen.h" -#include "qapi/qmp/qlist.h" +#include "qobject/qlist.h" #include "qemu/error-report.h" #include "hw/acpi/cpu_hotplug.h" #include "acpi-build.h"
hw/net/rocker/rocker-hmp-cmds.c +1 -1
@@ -18,7 +18,7 @@#include "monitor/monitor.h" #include "net/eth.h" #include "qapi/qapi-commands-rocker.h" -#include "qapi/qmp/qdict.h" +#include "qobject/qdict.h" void hmp_rocker (Monitor *mon,const QDict *qdict) {
hw/net/virtio-net.c +1 -1
@@ -26,7 +26,7 @@#include "qemu/option.h" #include "qemu/option_int.h" #include "qemu/config-file.h" -#include "qapi/qmp/qdict.h" +#include "qobject/qdict.h" #include "hw/virtio/virtio-net.h" #include "net/vhost_net.h" #include "net/announce.h"
hw/net/xen_nic.c +1 -1
@@ -24,7 +24,7 @@#include "qemu/cutils.h" #include "qemu/log.h" #include "qemu/qemu-print.h" -#include "qapi/qmp/qdict.h" +#include "qobject/qdict.h" #include "qapi/error.h" #include <sys/socket.h>
hw/pci/pci-hmp-cmds.c +1 -1
@@ -20,7 +20,7 @@#include "monitor/monitor.h" #include "pci-internal.h" #include "qapi/error.h" -#include "qapi/qmp/qdict.h" +#include "qobject/qdict.h" #include "qapi/qapi-commands-pci.h" #include "qemu/cutils.h"
hw/ppc/pegasos2.c +1 -1
@@ -33,7 +33,7 @@#include "kvm_ppc.h" #include "exec/address-spaces.h" #include "qom/qom-qobject.h" -#include "qapi/qmp/qdict.h" +#include "qobject/qdict.h" #include "trace.h" #include "qemu/datadir.h" #include "system/device_tree.h"
hw/ppc/spapr_drc.c +1 -1
@@ -12,7 +12,7 @@#include "qemu/osdep.h" #include "qapi/error.h" -#include "qapi/qmp/qnull.h" +#include "qobject/qnull.h" #include "qemu/cutils.h" #include "hw/ppc/spapr_drc.h" #include "qom/object.h"
hw/rx/rx62n.c +1 -1
@@ -29,7 +29,7 @@#include "hw/sysbus.h" #include "hw/qdev-properties.h" #include "system/system.h" -#include "qapi/qmp/qlist.h" +#include "qobject/qlist.h" #include "qom/object.h" /*
hw/s390x/s390-skeys.c +1 -1
@@ -16,7 +16,7 @@#include "hw/s390x/storage-keys.h" #include "qapi/error.h" #include "qapi/qapi-commands-misc-target.h" -#include "qapi/qmp/qdict.h" +#include "qobject/qdict.h" #include "qemu/error-report.h" #include "system/memory_mapping.h" #include "exec/address-spaces.h"
hw/s390x/s390-stattrib.c +1 -1
@@ -18,7 +18,7 @@#include "qemu/error-report.h" #include "exec/ram_addr.h" #include "qapi/error.h" -#include "qapi/qmp/qdict.h" +#include "qobject/qdict.h" #include "cpu.h" /* 512KiB cover 2GB of guest memory */
hw/usb/xen-usb.c +2 -2
@@ -30,8 +30,8 @@#include "hw/xen/xen-legacy-backend.h" #include "monitor/qdev.h" #include "qapi/error.h" -#include "qapi/qmp/qdict.h" -#include "qapi/qmp/qstring.h" +#include "qobject/qdict.h" +#include "qobject/qstring.h" #include "hw/xen/interface/io/usbif.h"
hw/vfio/pci.c +1 -1
@@ -30,7 +30,7 @@#include "hw/qdev-properties.h" #include "hw/qdev-properties-system.h" #include "migration/vmstate.h" -#include "qapi/qmp/qdict.h" +#include "qobject/qdict.h" #include "qemu/error-report.h" #include "qemu/main-loop.h" #include "qemu/module.h"
hw/virtio/virtio-hmp-cmds.c +1 -1
@@ -9,7 +9,7 @@#include "monitor/hmp.h" #include "monitor/monitor.h" #include "qapi/qapi-commands-virtio.h" -#include "qapi/qmp/qdict.h" +#include "qobject/qdict.h" static void hmp_virtio_dump_protocols(Monitor *mon,
hw/virtio/virtio-qmp.c +2 -2
@@ -15,8 +15,8 @@#include "qapi/error.h" #include "qapi/qapi-commands-virtio.h" #include "qapi/qapi-commands-qom.h" -#include "qapi/qmp/qobject.h" -#include "qapi/qmp/qjson.h" +#include "qobject/qobject.h" +#include "qobject/qjson.h" #include "hw/virtio/vhost-user.h" #include "standard-headers/linux/virtio_ids.h"
hw/xen/xen-bus.c +1 -1
@@ -18,7 +18,7 @@#include "hw/xen/xen-bus-helper.h" #include "monitor/monitor.h" #include "qapi/error.h" -#include "qapi/qmp/qdict.h" +#include "qobject/qdict.h" #include "system/system.h" #include "net/net.h" #include "trace.h"
migration/dirtyrate.c +1 -1
@@ -24,7 +24,7 @@#include "dirtyrate.h" #include "monitor/hmp.h" #include "monitor/monitor.h" -#include "qapi/qmp/qdict.h" +#include "qobject/qdict.h" #include "system/kvm.h" #include "system/runstate.h" #include "exec/memory.h"
migration/migration-hmp-cmds.c +1 -1
@@ -21,7 +21,7 @@#include "qapi/error.h" #include "qapi/qapi-commands-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-output-visitor.h" #include "qemu/cutils.h"
migration/migration.c +1 -1
@@ -45,7 +45,7 @@#include "qapi/qapi-commands-migration.h" #include "qapi/qapi-events-migration.h" #include "qapi/qmp/qerror.h" -#include "qapi/qmp/qnull.h" +#include "qobject/qnull.h" #include "qemu/rcu.h" #include "postcopy-ram.h" #include "qemu/thread.h"
migration/options.c +1 -1
@@ -19,7 +19,7 @@#include "qapi/qapi-commands-migration.h" #include "qapi/qapi-visit-migration.h" #include "qapi/qmp/qerror.h" -#include "qapi/qmp/qnull.h" +#include "qobject/qnull.h" #include "system/runstate.h" #include "migration/colo.h" #include "migration/cpr.h"
migration/vmstate.c +1 -1
@@ -15,7 +15,7 @@#include "migration/vmstate.h" #include "savevm.h" #include "qapi/error.h" -#include "qapi/qmp/json-writer.h" +#include "qobject/json-writer.h" #include "qemu-file.h" #include "qemu/bitops.h" #include "qemu/error-report.h"
monitor/hmp-cmds-target.c +1 -1
@@ -29,7 +29,7 @@#include "monitor/hmp-target.h" #include "monitor/monitor-internal.h" #include "qapi/error.h" -#include "qapi/qmp/qdict.h" +#include "qobject/qdict.h" #include "system/hw_accel.h" /* Set the current CPU defined by the user. Callers must hold BQL. */
monitor/hmp-cmds.c +1 -1
@@ -25,7 +25,7 @@#include "qapi/qapi-commands-control.h" #include "qapi/qapi-commands-machine.h" #include "qapi/qapi-commands-misc.h" -#include "qapi/qmp/qdict.h" +#include "qobject/qdict.h" #include "qemu/cutils.h" #include "qemu/log.h" #include "system/system.h"
monitor/hmp.c +2 -2
@@ -27,8 +27,8 @@#include "hw/qdev-core.h" #include "monitor-internal.h" #include "monitor/hmp.h" -#include "qapi/qmp/qdict.h" -#include "qapi/qmp/qnum.h" +#include "qobject/qdict.h" +#include "qobject/qnum.h" #include "qemu/config-file.h" #include "qemu/ctype.h" #include "qemu/cutils.h"
monitor/monitor.c +1 -1
@@ -28,7 +28,7 @@#include "qapi/opts-visitor.h" #include "qapi/qapi-emit-events.h" #include "qapi/qapi-visit-control.h" -#include "qapi/qmp/qdict.h" +#include "qobject/qdict.h" #include "qemu/error-report.h" #include "qemu/option.h" #include "system/qtest.h"
monitor/qemu-config-qmp.c +1 -1
@@ -2,7 +2,7 @@#include "qemu/osdep.h" #include "qapi/error.h" #include "qapi/qapi-commands-misc.h" -#include "qapi/qmp/qlist.h" +#include "qobject/qlist.h" #include "qemu/option.h" #include "qemu/config-file.h" #include "hw/boards.h"
monitor/qmp.c +3 -3
@@ -28,9 +28,9 @@#include "monitor-internal.h" #include "qapi/error.h" #include "qapi/qapi-commands-control.h" -#include "qapi/qmp/qdict.h" -#include "qapi/qmp/qjson.h" -#include "qapi/qmp/qlist.h" +#include "qobject/qdict.h" +#include "qobject/qjson.h" +#include "qobject/qlist.h" #include "trace.h" /*
net/net-hmp-cmds.c +1 -1
@@ -22,7 +22,7 @@#include "qapi/clone-visitor.h" #include "qapi/qapi-commands-net.h" #include "qapi/qapi-visit-net.h" -#include "qapi/qmp/qdict.h" +#include "qobject/qdict.h" #include "qemu/config-file.h" #include "qemu/help_option.h" #include "qemu/option.h"
net/net.c +1 -1
@@ -36,7 +36,7 @@#include "qemu/help_option.h" #include "qapi/qapi-commands-net.h" #include "qapi/qapi-visit-net.h" -#include "qapi/qmp/qdict.h" +#include "qobject/qdict.h" #include "qapi/qmp/qerror.h" #include "qemu/error-report.h" #include "qemu/sockets.h"
net/slirp.c +1 -1
@@ -43,7 +43,7 @@#include "system/system.h" #include "qemu/cutils.h" #include "qapi/error.h" -#include "qapi/qmp/qdict.h" +#include "qobject/qdict.h" #include "util.h" #include "migration/register.h" #include "migration/vmstate.h"
qapi/qapi-clone-visitor.c +1 -1
@@ -12,7 +12,7 @@#include "qapi/clone-visitor.h" #include "qapi/visitor-impl.h" #include "qapi/error.h" -#include "qapi/qmp/qnull.h" +#include "qobject/qnull.h" struct QapiCloneVisitor {Visitor visitor;
qapi/qapi-dealloc-visitor.c +1 -1
@@ -14,7 +14,7 @@#include "qemu/osdep.h" #include "qapi/dealloc-visitor.h" -#include "qapi/qmp/qnull.h" +#include "qobject/qnull.h" #include "qapi/visitor-impl.h" struct QapiDeallocVisitor
qapi/qapi-forward-visitor.c +7 -7
@@ -14,14 +14,14 @@#include "qapi/forward-visitor.h" #include "qapi/visitor-impl.h" #include "qemu/queue.h" -#include "qapi/qmp/qjson.h" -#include "qapi/qmp/qbool.h" -#include "qapi/qmp/qdict.h" +#include "qobject/qjson.h" +#include "qobject/qbool.h" +#include "qobject/qdict.h" #include "qapi/qmp/qerror.h" -#include "qapi/qmp/qlist.h" -#include "qapi/qmp/qnull.h" -#include "qapi/qmp/qnum.h" -#include "qapi/qmp/qstring.h" +#include "qobject/qlist.h" +#include "qobject/qnull.h" +#include "qobject/qnum.h" +#include "qobject/qstring.h" #include "qemu/cutils.h" struct ForwardFieldVisitor {
qapi/qmp-dispatch.c +3 -3
@@ -17,11 +17,11 @@#include "qapi/compat-policy.h" #include "qapi/error.h" #include "qapi/qmp/dispatch.h" -#include "qapi/qmp/qdict.h" -#include "qapi/qmp/qjson.h" +#include "qobject/qdict.h" +#include "qobject/qjson.h" #include "qapi/qobject-input-visitor.h" #include "qapi/qobject-output-visitor.h" -#include "qapi/qmp/qbool.h" +#include "qobject/qbool.h" #include "qemu/coroutine.h" #include "qemu/main-loop.h"
qapi/qmp-event.c +3 -3
@@ -14,9 +14,9 @@#include "qemu/osdep.h" #include "qapi/qmp-event.h" -#include "qapi/qmp/qstring.h" -#include "qapi/qmp/qdict.h" -#include "qapi/qmp/qjson.h" +#include "qobject/qstring.h" +#include "qobject/qdict.h" +#include "qobject/qjson.h" static void timestamp_put (QDict *qdict) {
qapi/qobject-input-visitor.c +7 -7
@@ -19,14 +19,14 @@#include "qapi/qobject-input-visitor.h" #include "qapi/visitor-impl.h" #include "qemu/queue.h" -#include "qapi/qmp/qjson.h" -#include "qapi/qmp/qbool.h" -#include "qapi/qmp/qdict.h" +#include "qobject/qjson.h" +#include "qobject/qbool.h" +#include "qobject/qdict.h" #include "qapi/qmp/qerror.h" -#include "qapi/qmp/qlist.h" -#include "qapi/qmp/qnull.h" -#include "qapi/qmp/qnum.h" -#include "qapi/qmp/qstring.h" +#include "qobject/qlist.h" +#include "qobject/qnull.h" +#include "qobject/qnum.h" +#include "qobject/qstring.h" #include "qemu/cutils.h" #include "qemu/keyval.h"
qapi/qobject-output-visitor.c +6 -6
@@ -17,12 +17,12 @@#include "qapi/qobject-output-visitor.h" #include "qapi/visitor-impl.h" #include "qemu/queue.h" -#include "qapi/qmp/qbool.h" -#include "qapi/qmp/qdict.h" -#include "qapi/qmp/qlist.h" -#include "qapi/qmp/qnull.h" -#include "qapi/qmp/qnum.h" -#include "qapi/qmp/qstring.h" +#include "qobject/qbool.h" +#include "qobject/qdict.h" +#include "qobject/qlist.h" +#include "qobject/qnull.h" +#include "qobject/qnum.h" +#include "qobject/qstring.h" typedef struct QStackEntry { QObject *value;
qapi/string-input-visitor.c +1 -1
@@ -15,7 +15,7 @@#include "qapi/string-input-visitor.h" #include "qapi/visitor-impl.h" #include "qapi/qmp/qerror.h" -#include "qapi/qmp/qnull.h" +#include "qobject/qnull.h" #include "qemu/option.h" #include "qemu/cutils.h"
qemu-img.c +2 -2
@@ -32,8 +32,8 @@#include "qapi/qapi-commands-block-core.h" #include "qapi/qapi-visit-block-core.h" #include "qapi/qobject-output-visitor.h" -#include "qapi/qmp/qjson.h" -#include "qapi/qmp/qdict.h" +#include "qobject/qjson.h" +#include "qobject/qdict.h" #include "qemu/cutils.h" #include "qemu/config-file.h" #include "qemu/option.h"
qemu-io-cmds.c +1 -1
@@ -10,7 +10,7 @@#include "qemu/osdep.h" #include "qapi/error.h" -#include "qapi/qmp/qdict.h" +#include "qobject/qdict.h" #include "qemu-io.h" #include "system/block-backend.h" #include "block/block.h"
qemu-io.c +2 -2
@@ -27,8 +27,8 @@#include "qemu/readline.h" #include "qemu/log.h" #include "qemu/sockets.h" -#include "qapi/qmp/qstring.h" -#include "qapi/qmp/qdict.h" +#include "qobject/qstring.h" +#include "qobject/qdict.h" #include "qom/object_interfaces.h" #include "system/block-backend.h" #include "block/block_int.h"
qemu-nbd.c +2 -2
@@ -37,8 +37,8 @@#include "qemu/log.h" #include "qemu/systemd.h" #include "block/snapshot.h" -#include "qapi/qmp/qdict.h" -#include "qapi/qmp/qstring.h" +#include "qobject/qdict.h" +#include "qobject/qstring.h" #include "qom/object_interfaces.h" #include "io/channel-socket.h" #include "io/net-listener.h"
qga/main.c +3 -3
@@ -19,9 +19,9 @@#include <sys/wait.h> #endif #include "qemu/help-texts.h" -#include "qapi/qmp/json-parser.h" -#include "qapi/qmp/qdict.h" -#include "qapi/qmp/qjson.h" +#include "qobject/json-parser.h" +#include "qobject/qdict.h" +#include "qobject/qjson.h" #include "guest-agent-core.h" #include "qga-qapi-init-commands.h" #include "qapi/error.h"
qobject/block-qdict.c +4 -4
@@ -9,10 +9,10 @@#include "qemu/osdep.h" #include "block/qdict.h" -#include "qapi/qmp/qbool.h" -#include "qapi/qmp/qlist.h" -#include "qapi/qmp/qnum.h" -#include "qapi/qmp/qstring.h" +#include "qobject/qbool.h" +#include "qobject/qlist.h" +#include "qobject/qnum.h" +#include "qobject/qstring.h" #include "qapi/qobject-input-visitor.h" #include "qemu/cutils.h" #include "qapi/error.h"
qobject/json-parser.c +6 -6
@@ -16,12 +16,12 @@#include "qemu/cutils.h" #include "qemu/unicode.h" #include "qapi/error.h" -#include "qapi/qmp/qbool.h" -#include "qapi/qmp/qdict.h" -#include "qapi/qmp/qlist.h" -#include "qapi/qmp/qnull.h" -#include "qapi/qmp/qnum.h" -#include "qapi/qmp/qstring.h" +#include "qobject/qbool.h" +#include "qobject/qdict.h" +#include "qobject/qlist.h" +#include "qobject/qnull.h" +#include "qobject/qnum.h" +#include "qobject/qstring.h" #include "json-parser-int.h" struct JSONToken {
qobject/json-writer.c +1 -1
@@ -14,7 +14,7 @@*/ #include "qemu/osdep.h" -#include "qapi/qmp/json-writer.h" +#include "qobject/json-writer.h" #include "qemu/unicode.h" struct JSONWriter {
qobject/qbool.c +1 -1
@@ -12,7 +12,7 @@*/ #include "qemu/osdep.h" -#include "qapi/qmp/qbool.h" +#include "qobject/qbool.h" #include "qobject-internal.h" /**
qobject/qdict.c +5 -5
@@ -11,11 +11,11 @@*/ #include "qemu/osdep.h" -#include "qapi/qmp/qnum.h" -#include "qapi/qmp/qdict.h" -#include "qapi/qmp/qbool.h" -#include "qapi/qmp/qnull.h" -#include "qapi/qmp/qstring.h" +#include "qobject/qnum.h" +#include "qobject/qdict.h" +#include "qobject/qbool.h" +#include "qobject/qnull.h" +#include "qobject/qstring.h" #include "qobject-internal.h" /**
qobject/qjson.c +8 -8
@@ -13,14 +13,14 @@#include "qemu/osdep.h" #include "qapi/error.h" -#include "qapi/qmp/json-parser.h" -#include "qapi/qmp/json-writer.h" -#include "qapi/qmp/qjson.h" -#include "qapi/qmp/qbool.h" -#include "qapi/qmp/qdict.h" -#include "qapi/qmp/qlist.h" -#include "qapi/qmp/qnum.h" -#include "qapi/qmp/qstring.h" +#include "qobject/json-parser.h" +#include "qobject/json-writer.h" +#include "qobject/qjson.h" +#include "qobject/qbool.h" +#include "qobject/qdict.h" +#include "qobject/qlist.h" +#include "qobject/qnum.h" +#include "qobject/qstring.h" typedef struct JSONParsingState { JSONMessageParser parser;
qobject/qlist.c +5 -5
@@ -11,11 +11,11 @@*/ #include "qemu/osdep.h" -#include "qapi/qmp/qbool.h" -#include "qapi/qmp/qlist.h" -#include "qapi/qmp/qnull.h" -#include "qapi/qmp/qnum.h" -#include "qapi/qmp/qstring.h" +#include "qobject/qbool.h" +#include "qobject/qlist.h" +#include "qobject/qnull.h" +#include "qobject/qnum.h" +#include "qobject/qstring.h" #include "qemu/queue.h" #include "qobject-internal.h"
qobject/qlit.c +7 -7
@@ -15,13 +15,13 @@#include "qemu/osdep.h" -#include "qapi/qmp/qlit.h" -#include "qapi/qmp/qbool.h" -#include "qapi/qmp/qlist.h" -#include "qapi/qmp/qnum.h" -#include "qapi/qmp/qdict.h" -#include "qapi/qmp/qstring.h" -#include "qapi/qmp/qnull.h" +#include "qobject/qlit.h" +#include "qobject/qbool.h" +#include "qobject/qlist.h" +#include "qobject/qnum.h" +#include "qobject/qdict.h" +#include "qobject/qstring.h" +#include "qobject/qnull.h" static bool qlit_equal_qdict (const QLitObject *lhs,const QDict *qdict) {
qobject/qnull.c +1 -1
@@ -11,7 +11,7 @@*/ #include "qemu/osdep.h" -#include "qapi/qmp/qnull.h" +#include "qobject/qnull.h" #include "qobject-internal.h" QNull qnull_ = {
qobject/qnum.c +1 -1
@@ -13,7 +13,7 @@*/ #include "qemu/osdep.h" -#include "qapi/qmp/qnum.h" +#include "qobject/qnum.h" #include "qobject-internal.h" /**
qobject/qobject.c +6 -6
@@ -8,12 +8,12 @@*/ #include "qemu/osdep.h" -#include "qapi/qmp/qbool.h" -#include "qapi/qmp/qnull.h" -#include "qapi/qmp/qnum.h" -#include "qapi/qmp/qdict.h" -#include "qapi/qmp/qlist.h" -#include "qapi/qmp/qstring.h" +#include "qobject/qbool.h" +#include "qobject/qnull.h" +#include "qobject/qnum.h" +#include "qobject/qdict.h" +#include "qobject/qlist.h" +#include "qobject/qstring.h" #include "qobject-internal.h" QEMU_BUILD_BUG_MSG(
qobject/qstring.c +1 -1
@@ -11,7 +11,7 @@*/ #include "qemu/osdep.h" -#include "qapi/qmp/qstring.h" +#include "qobject/qstring.h" #include "qobject-internal.h" /**
qom/object.c +5 -5
@@ -23,16 +23,16 @@#include "qapi/qobject-input-visitor.h" #include "qapi/forward-visitor.h" #include "qapi/qapi-builtin-visit.h" -#include "qapi/qmp/qjson.h" +#include "qobject/qjson.h" #include "trace.h" /* TODO: replace QObject with a simpler visitor to avoid a dependency * of the QOM core on QObject? */ #include "qom/qom-qobject.h" -#include "qapi/qmp/qbool.h" -#include "qapi/qmp/qlist.h" -#include "qapi/qmp/qnum.h" -#include "qapi/qmp/qstring.h" +#include "qobject/qbool.h" +#include "qobject/qlist.h" +#include "qobject/qnum.h" +#include "qobject/qstring.h" #include "qemu/error-report.h" #define MAX_INTERFACES 32
qom/object_interfaces.c +3 -3
@@ -3,10 +3,10 @@#include "qemu/cutils.h" #include "qapi/error.h" #include "qapi/qapi-visit-qom.h" -#include "qapi/qmp/qobject.h" -#include "qapi/qmp/qdict.h" +#include "qobject/qobject.h" +#include "qobject/qdict.h" #include "qapi/qmp/qerror.h" -#include "qapi/qmp/qjson.h" +#include "qobject/qjson.h" #include "qapi/qobject-input-visitor.h" #include "qapi/qobject-output-visitor.h" #include "qom/object_interfaces.h"
qom/qom-hmp-cmds.c +2 -2
@@ -11,8 +11,8 @@#include "monitor/monitor.h" #include "qapi/error.h" #include "qapi/qapi-commands-qom.h" -#include "qapi/qmp/qdict.h" -#include "qapi/qmp/qjson.h" +#include "qobject/qdict.h" +#include "qobject/qjson.h" #include "qemu/readline.h" #include "qom/object.h" #include "qom/object_interfaces.h"
qom/qom-qmp-cmds.c +1 -1
@@ -20,7 +20,7 @@#include "qapi/qapi-commands-qdev.h" #include "qapi/qapi-commands-qom.h" #include "qapi/qapi-visit-qom.h" -#include "qapi/qmp/qdict.h" +#include "qobject/qdict.h" #include "qapi/qmp/qerror.h" #include "qapi/qobject-input-visitor.h" #include "qapi/qobject-output-visitor.h"
replay/replay-debugging.c +1 -1
@@ -17,7 +17,7 @@#include "monitor/hmp.h" #include "monitor/monitor.h" #include "qapi/qapi-commands-replay.h" -#include "qapi/qmp/qdict.h" +#include "qobject/qdict.h" #include "qemu/timer.h" #include "block/snapshot.h" #include "migration/snapshot.h"
replay/replay-snapshot.c +1 -1
@@ -14,7 +14,7 @@#include "system/replay.h" #include "replay-internal.h" #include "monitor/monitor.h" -#include "qapi/qmp/qstring.h" +#include "qobject/qstring.h" #include "qemu/error-report.h" #include "migration/vmstate.h" #include "migration/snapshot.h"
scsi/qemu-pr-helper.c +1 -1
@@ -47,7 +47,7 @@#include "qemu/log.h" #include "qemu/systemd.h" #include "qapi/util.h" -#include "qapi/qmp/qstring.h" +#include "qobject/qstring.h" #include "io/channel-socket.h" #include "trace/control.h" #include "qemu-version.h"
stats/stats-hmp-cmds.c +1 -1
@@ -11,7 +11,7 @@#include "monitor/monitor.h" #include "qemu/cutils.h" #include "hw/core/cpu.h" -#include "qapi/qmp/qdict.h" +#include "qobject/qdict.h" #include "qapi/error.h" static void print_stats_schema_value (Monitor *mon,StatsSchemaValue *value)
storage-daemon/qemu-storage-daemon.c +2 -2
@@ -38,8 +38,8 @@#include "qapi/qapi-visit-block-core.h" #include "qapi/qapi-visit-block-export.h" #include "qapi/qapi-visit-control.h" -#include "qapi/qmp/qdict.h" -#include "qapi/qmp/qstring.h" +#include "qobject/qdict.h" +#include "qobject/qstring.h" #include "qapi/qobject-input-visitor.h" #include "qemu/help-texts.h"
system/device_tree.c +1 -1
@@ -28,7 +28,7 @@#include "hw/boards.h" #include "qemu/config-file.h" #include "qapi/qapi-commands-machine.h" -#include "qapi/qmp/qdict.h" +#include "qobject/qdict.h" #include "monitor/hmp.h" #include <libfdt.h>
system/dirtylimit.c +1 -1
@@ -13,7 +13,7 @@#include "qemu/osdep.h" #include "qemu/main-loop.h" #include "qapi/qapi-commands-migration.h" -#include "qapi/qmp/qdict.h" +#include "qobject/qdict.h" #include "qapi/error.h" #include "system/dirtyrate.h" #include "system/dirtylimit.h"
system/qdev-monitor.c +2 -2
@@ -27,9 +27,9 @@#include "qapi/error.h" #include "qapi/qapi-commands-qdev.h" #include "qapi/qmp/dispatch.h" -#include "qapi/qmp/qdict.h" +#include "qobject/qdict.h" #include "qapi/qmp/qerror.h" -#include "qapi/qmp/qstring.h" +#include "qobject/qstring.h" #include "qapi/qobject-input-visitor.h" #include "qemu/config-file.h" #include "qemu/error-report.h"
system/runstate-hmp-cmds.c +1 -1
@@ -19,7 +19,7 @@#include "monitor/monitor.h" #include "qapi/error.h" #include "qapi/qapi-commands-run-state.h" -#include "qapi/qmp/qdict.h" +#include "qobject/qdict.h" #include "qemu/accel.h" void hmp_info_status (Monitor *mon,const QDict *qdict)
system/vl.c +3 -3
@@ -31,9 +31,9 @@#include "hw/qdev-properties.h" #include "qapi/compat-policy.h" #include "qapi/error.h" -#include "qapi/qmp/qdict.h" -#include "qapi/qmp/qstring.h" -#include "qapi/qmp/qjson.h" +#include "qobject/qdict.h" +#include "qobject/qstring.h" +#include "qobject/qjson.h" #include "qemu-version.h" #include "qemu/cutils.h" #include "qemu/help_option.h"
target/arm/arm-qmp-cmds.c +1 -1
@@ -28,7 +28,7 @@#include "qapi/qobject-input-visitor.h" #include "qapi/qapi-commands-machine-target.h" #include "qapi/qapi-commands-misc-target.h" -#include "qapi/qmp/qdict.h" +#include "qobject/qdict.h" #include "qom/qom-qobject.h" static GICCapability *gic_cap_new (int version)
target/i386/cpu-apic.c +1 -1
@@ -7,7 +7,7 @@*/ #include "qemu/osdep.h" -#include "qapi/qmp/qdict.h" +#include "qobject/qdict.h" #include "qapi/error.h" #include "monitor/monitor.h" #include "monitor/hmp-target.h"
target/i386/cpu-system.c +1 -1
@@ -21,7 +21,7 @@#include "cpu.h" #include "qapi/error.h" #include "qapi/qapi-visit-run-state.h" -#include "qapi/qmp/qdict.h" +#include "qobject/qdict.h" #include "qapi/qobject-input-visitor.h" #include "qom/qom-qobject.h" #include "qapi/qapi-commands-machine-target.h"
target/i386/monitor.c +1 -1
@@ -27,7 +27,7 @@#include "monitor/monitor.h" #include "monitor/hmp-target.h" #include "monitor/hmp.h" -#include "qapi/qmp/qdict.h" +#include "qobject/qdict.h" #include "qapi/error.h" #include "qapi/qapi-commands-misc-target.h" #include "qapi/qapi-commands-misc.h"
target/loongarch/loongarch-qmp-cmds.c +1 -1
@@ -10,7 +10,7 @@#include "qapi/error.h" #include "qapi/qapi-commands-machine-target.h" #include "cpu.h" -#include "qapi/qmp/qdict.h" +#include "qobject/qdict.h" #include "qapi/qobject-input-visitor.h" #include "qom/qom-qobject.h"
target/ppc/cpu_init.c +1 -1
@@ -32,7 +32,7 @@#include "qemu/module.h" #include "qemu/qemu-print.h" #include "qapi/error.h" -#include "qapi/qmp/qnull.h" +#include "qobject/qnull.h" #include "qapi/visitor.h" #include "hw/qdev-properties.h" #include "hw/ppc/ppc.h"
target/riscv/riscv-qmp-cmds.c +2 -2
@@ -26,8 +26,8 @@#include "qapi/error.h" #include "qapi/qapi-commands-machine-target.h" -#include "qapi/qmp/qbool.h" -#include "qapi/qmp/qdict.h" +#include "qobject/qbool.h" +#include "qobject/qdict.h" #include "qapi/qobject-input-visitor.h" #include "qapi/visitor.h" #include "qom/qom-qobject.h"
target/s390x/cpu_models_system.c +1 -1
@@ -18,7 +18,7 @@#include "qapi/error.h" #include "qapi/visitor.h" #include "qapi/qobject-input-visitor.h" -#include "qapi/qmp/qdict.h" +#include "qobject/qdict.h" #include "qapi/qapi-commands-machine-target.h" static void list_add_feat (const char *name,void *opaque);
tests/qtest/adm1266-test.c +2 -2
@@ -13,8 +13,8 @@#include "libqtest-single.h" #include "libqos/qgraph.h" #include "libqos/i2c.h" -#include "qapi/qmp/qdict.h" -#include "qapi/qmp/qnum.h" +#include "qobject/qdict.h" +#include "qobject/qnum.h" #include "qemu/bitops.h" #define TEST_ID "adm1266-test"
tests/qtest/adm1272-test.c +2 -2
@@ -12,8 +12,8 @@#include "libqtest-single.h" #include "libqos/qgraph.h" #include "libqos/i2c.h" -#include "qapi/qmp/qdict.h" -#include "qapi/qmp/qnum.h" +#include "qobject/qdict.h" +#include "qobject/qnum.h" #include "qemu/bitops.h" #define TEST_ID "adm1272-test"
tests/qtest/ahci-test.c +1 -1
@@ -30,7 +30,7 @@#include "libqos/ahci.h" #include "libqos/pci-pc.h" -#include "qapi/qmp/qdict.h" +#include "qobject/qdict.h" #include "qemu/host-utils.h" #include "hw/pci/pci_ids.h"
tests/qtest/arm-cpu-features.c +2 -2
@@ -11,8 +11,8 @@#include "qemu/osdep.h" #include "qemu/bitops.h" #include "libqtest.h" -#include "qapi/qmp/qdict.h" -#include "qapi/qmp/qjson.h" +#include "qobject/qdict.h" +#include "qobject/qjson.h" /* * We expect the SVE max-vq to be 16. Also it must be <= 64
tests/qtest/aspeed_gpio-test.c +1 -1
@@ -25,7 +25,7 @@#include "qemu/osdep.h" #include "qemu/bitops.h" #include "qemu/timer.h" -#include "qapi/qmp/qdict.h" +#include "qobject/qdict.h" #include "libqtest-single.h" #define AST2600_GPIO_BASE 0x1E780000
tests/qtest/ast2700-gpio-test.c +1 -1
@@ -8,7 +8,7 @@#include "qemu/osdep.h" #include "qemu/bitops.h" #include "qemu/timer.h" -#include "qapi/qmp/qdict.h" +#include "qobject/qdict.h" #include "libqtest-single.h" #define AST2700_GPIO_BASE 0x14C0B000
tests/qtest/boot-order-test.c +1 -1
@@ -13,7 +13,7 @@#include "qemu/osdep.h" #include "libqos/fw_cfg.h" #include "libqtest.h" -#include "qapi/qmp/qdict.h" +#include "qobject/qdict.h" #include "standard-headers/linux/qemu_fw_cfg.h" typedef struct {
tests/qtest/cdrom-test.c +1 -1
@@ -13,7 +13,7 @@#include "qemu/osdep.h" #include "libqtest.h" #include "boot-sector.h" -#include "qapi/qmp/qdict.h" +#include "qobject/qdict.h" static char isoimage[] ="cdrom-boot-iso-XXXXXX" ;
tests/qtest/cpu-plug-test.c +2 -2
@@ -10,8 +10,8 @@#include "qemu/osdep.h" #include "libqtest-single.h" -#include "qapi/qmp/qdict.h" -#include "qapi/qmp/qlist.h" +#include "qobject/qdict.h" +#include "qobject/qlist.h" struct PlugTestData {char *machine;
tests/qtest/device-introspect-test.c +3 -3
@@ -18,9 +18,9 @@*/ #include "qemu/osdep.h" -#include "qapi/qmp/qstring.h" -#include "qapi/qmp/qdict.h" -#include "qapi/qmp/qlist.h" +#include "qobject/qstring.h" +#include "qobject/qdict.h" +#include "qobject/qlist.h" #include "libqtest.h" const char common_args[] ="-nodefaults -machine none" ;
tests/qtest/device-plug-test.c +2 -2
@@ -12,8 +12,8 @@#include "qemu/osdep.h" #include "libqtest.h" -#include "qapi/qmp/qdict.h" -#include "qapi/qmp/qstring.h" +#include "qobject/qdict.h" +#include "qobject/qstring.h" static void wait_device_deleted_event (QTestState *qtest,const char *id) {
tests/qtest/drive_del-test.c +2 -2
@@ -13,8 +13,8 @@#include "qemu/osdep.h" #include "libqtest.h" #include "libqos/virtio.h" -#include "qapi/qmp/qdict.h" -#include "qapi/qmp/qlist.h" +#include "qobject/qdict.h" +#include "qobject/qlist.h" static const char *qvirtio_get_dev_type (void );
tests/qtest/emc141x-test.c +1 -1
@@ -10,7 +10,7 @@#include "libqtest-single.h" #include "libqos/qgraph.h" #include "libqos/i2c.h" -#include "qapi/qmp/qdict.h" +#include "qobject/qdict.h" #include "hw/sensor/emc141x_regs.h" #define EMC1414_TEST_ID "emc1414-test"
tests/qtest/fdc-test.c +1 -1
@@ -26,7 +26,7 @@#include "libqtest-single.h" -#include "qapi/qmp/qdict.h" +#include "qobject/qdict.h" #define DRIVE_FLOPPY_BLANK \ "-drive if=floppy,file=null-co://,file.read-zeroes=on,format=raw,size=1440k"
tests/qtest/hd-geo-test.c +1 -1
@@ -17,7 +17,7 @@#include "qemu/osdep.h" #include "qemu/bswap.h" -#include "qapi/qmp/qlist.h" +#include "qobject/qlist.h" #include "libqtest.h" #include "libqos/fw_cfg.h" #include "libqos/libqos.h"
tests/qtest/ide-test.c +1 -1
@@ -29,7 +29,7 @@#include "libqos/libqos.h" #include "libqos/pci-pc.h" #include "libqos/malloc-pc.h" -#include "qapi/qmp/qdict.h" +#include "qobject/qdict.h" #include "qemu/bswap.h" #include "hw/pci/pci_ids.h" #include "hw/pci/pci_regs.h"
tests/qtest/isl_pmbus_vr-test.c +2 -2
@@ -21,8 +21,8 @@#include "libqtest-single.h" #include "libqos/qgraph.h" #include "libqos/i2c.h" -#include "qapi/qmp/qdict.h" -#include "qapi/qmp/qnum.h" +#include "qobject/qdict.h" +#include "qobject/qnum.h" #include "qemu/bitops.h" #define TEST_ID "isl_pmbus_vr-test"
tests/qtest/libqmp.c +2 -2
@@ -25,8 +25,8 @@#include "qemu/cutils.h" #include "qemu/sockets.h" #include "qapi/error.h" -#include "qapi/qmp/json-parser.h" -#include "qapi/qmp/qjson.h" +#include "qobject/json-parser.h" +#include "qobject/qjson.h" #define SOCKET_MAX_FDS 16
tests/qtest/libqos/generic-pcihost.c +1 -1
@@ -13,7 +13,7 @@#include "qemu/osdep.h" #include "../libqtest.h" #include "generic-pcihost.h" -#include "qapi/qmp/qdict.h" +#include "qobject/qdict.h" #include "hw/pci/pci_regs.h" #include "qemu/host-utils.h"
tests/qtest/libqos/libqos.c +1 -1
@@ -2,7 +2,7 @@#include "../libqtest.h" #include "libqos.h" #include "pci.h" -#include "qapi/qmp/qdict.h" +#include "qobject/qdict.h" /*** Test Setup & Teardown ***/
tests/qtest/libqos/pci-pc.c +1 -1
@@ -13,7 +13,7 @@#include "qemu/osdep.h" #include "../libqtest.h" #include "pci-pc.h" -#include "qapi/qmp/qdict.h" +#include "qobject/qdict.h" #include "hw/pci/pci_regs.h" #include "qemu/module.h"
tests/qtest/libqos/qos_external.c +4 -4
@@ -19,11 +19,11 @@#include "qemu/osdep.h" #include <getopt.h> #include "../libqtest.h" -#include "qapi/qmp/qdict.h" -#include "qapi/qmp/qbool.h" -#include "qapi/qmp/qstring.h" +#include "qobject/qdict.h" +#include "qobject/qbool.h" +#include "qobject/qstring.h" #include "qemu/module.h" -#include "qapi/qmp/qlist.h" +#include "qobject/qlist.h" #include "libqos-malloc.h" #include "qgraph.h" #include "qgraph_internal.h"
tests/qtest/libqtest.c +5 -5
@@ -34,11 +34,11 @@#include "qemu/ctype.h" #include "qemu/cutils.h" #include "qemu/sockets.h" -#include "qapi/qmp/qdict.h" -#include "qapi/qmp/qjson.h" -#include "qapi/qmp/qlist.h" -#include "qapi/qmp/qstring.h" -#include "qapi/qmp/qbool.h" +#include "qobject/qdict.h" +#include "qobject/qjson.h" +#include "qobject/qlist.h" +#include "qobject/qstring.h" +#include "qobject/qbool.h" #define MAX_IRQ 256
tests/qtest/lsm303dlhc-mag-test.c +1 -1
@@ -13,7 +13,7 @@#include "libqtest-single.h" #include "libqos/qgraph.h" #include "libqos/i2c.h" -#include "qapi/qmp/qdict.h" +#include "qobject/qdict.h" #define LSM303DLHC_MAG_TEST_ID "lsm303dlhc_mag-test"#define LSM303DLHC_MAG_REG_CRA 0x00
tests/qtest/machine-none-test.c +1 -1
@@ -14,7 +14,7 @@#include "qemu/cutils.h" #include "libqtest.h" -#include "qapi/qmp/qdict.h" +#include "qobject/qdict.h" struct arch2cpu {
tests/qtest/max34451-test.c +2 -2
@@ -11,8 +11,8 @@#include "libqtest-single.h" #include "libqos/qgraph.h" #include "libqos/i2c.h" -#include "qapi/qmp/qdict.h" -#include "qapi/qmp/qnum.h" +#include "qobject/qdict.h" +#include "qobject/qnum.h" #include "qemu/bitops.h" #define TEST_ID "max34451-test"
tests/qtest/migration-helpers.c new file +530 -0
530 lines not on this page · raw message
tests/qtest/migration/file-tests.c +1 -1
@@ -15,7 +15,7 @@#include "migration/framework.h" #include "migration/migration-qmp.h" #include "migration/migration-util.h" -#include "qapi/qmp/qlist.h" +#include "qobject/qlist.h" static char *tmpfs;
tests/qtest/migration/framework.c +2 -2
@@ -19,8 +19,8 @@#include "migration/migration-util.h" #include "ppc-util.h" #include "qapi/error.h" -#include "qapi/qmp/qjson.h" -#include "qapi/qmp/qlist.h" +#include "qobject/qjson.h" +#include "qobject/qlist.h" #include "qemu/module.h" #include "qemu/option.h" #include "qemu/range.h"
tests/qtest/migration/migration-qmp.c +3 -3
@@ -17,9 +17,9 @@#include "qapi/error.h" #include "qapi/qapi-types-migration.h" #include "qapi/qapi-visit-migration.h" -#include "qapi/qmp/qdict.h" -#include "qapi/qmp/qjson.h" -#include "qapi/qmp/qlist.h" +#include "qobject/qdict.h" +#include "qobject/qjson.h" +#include "qobject/qlist.h" #include "qapi/qobject-input-visitor.h" #include "qapi/qobject-output-visitor.h"
tests/qtest/migration/migration-util.c +1 -1
@@ -15,7 +15,7 @@#include "qapi/qapi-visit-sockets.h" #include "qapi/qobject-input-visitor.h" #include "qapi/error.h" -#include "qapi/qmp/qlist.h" +#include "qobject/qlist.h" #include "qemu/cutils.h" #include "qemu/memalign.h"
tests/qtest/migration/misc-tests.c +1 -1
@@ -12,7 +12,7 @@#include "qemu/osdep.h" #include "qapi/error.h" -#include "qapi/qmp/qjson.h" +#include "qobject/qjson.h" #include "libqtest.h" #include "migration/framework.h" #include "migration/migration-qmp.h"
tests/qtest/migration/postcopy-tests.c +1 -1
@@ -14,7 +14,7 @@#include "libqtest.h" #include "migration/framework.h" #include "migration/migration-util.h" -#include "qapi/qmp/qlist.h" +#include "qobject/qlist.h" #include "qemu/module.h" #include "qemu/option.h" #include "qemu/range.h"
tests/qtest/migration/precopy-tests.c +1 -1
@@ -19,7 +19,7 @@#include "migration/migration-qmp.h" #include "migration/migration-util.h" #include "ppc-util.h" -#include "qapi/qmp/qlist.h" +#include "qobject/qlist.h" #include "qemu/module.h" #include "qemu/option.h" #include "qemu/range.h"
tests/qtest/netdev-socket.c +1 -1
@@ -11,7 +11,7 @@#include <glib/gstdio.h> #include "../unit/socket-helpers.h" #include "libqtest.h" -#include "qapi/qmp/qstring.h" +#include "qobject/qstring.h" #include "qemu/sockets.h" #include "qapi/qobject-input-visitor.h" #include "qapi/qapi-visit-sockets.h"
tests/qtest/npcm7xx_adc-test.c +1 -1
@@ -18,7 +18,7 @@#include "qemu/bitops.h" #include "qemu/timer.h" #include "libqtest.h" -#include "qapi/qmp/qdict.h" +#include "qobject/qdict.h" #define REF_HZ (25000000)
tests/qtest/npcm7xx_emc-test.c +2 -2
@@ -16,8 +16,8 @@#include "qemu/osdep.h" #include "libqos/libqos.h" -#include "qapi/qmp/qdict.h" -#include "qapi/qmp/qnum.h" +#include "qobject/qdict.h" +#include "qobject/qnum.h" #include "qemu/bitops.h" #include "qemu/iov.h"
tests/qtest/npcm7xx_pwm-test.c +2 -2
@@ -17,8 +17,8 @@#include "qemu/osdep.h" #include "qemu/bitops.h" #include "libqtest.h" -#include "qapi/qmp/qdict.h" -#include "qapi/qmp/qnum.h" +#include "qobject/qdict.h" +#include "qobject/qnum.h" static int verbosity_level;
tests/qtest/npcm7xx_watchdog_timer-test.c +1 -1
@@ -18,7 +18,7 @@#include "qemu/timer.h" #include "libqtest.h" -#include "qapi/qmp/qdict.h" +#include "qobject/qdict.h" #define WTCR_OFFSET 0x1c#define REF_HZ (25000000)
tests/qtest/numa-test.c +2 -2
@@ -11,8 +11,8 @@#include "qemu/osdep.h" #include "libqtest.h" -#include "qapi/qmp/qdict.h" -#include "qapi/qmp/qlist.h" +#include "qobject/qdict.h" +#include "qobject/qlist.h" static char *make_cli (const GString *generic_cli,const char *test_cli) {
tests/qtest/pvpanic-pci-test.c +1 -1
@@ -13,7 +13,7 @@#include "qemu/osdep.h" #include "libqtest.h" -#include "qapi/qmp/qdict.h" +#include "qobject/qdict.h" #include "libqos/pci.h" #include "libqos/pci-pc.h" #include "hw/misc/pvpanic.h"
tests/qtest/pvpanic-test.c +1 -1
@@ -9,7 +9,7 @@#include "qemu/osdep.h" #include "libqtest.h" -#include "qapi/qmp/qdict.h" +#include "qobject/qdict.h" #include "hw/misc/pvpanic.h" static void test_panic_nopause (void )
tests/qtest/q35-test.c +1 -1
@@ -14,7 +14,7 @@#include "libqos/pci.h" #include "libqos/pci-pc.h" #include "hw/pci-host/q35.h" -#include "qapi/qmp/qdict.h" +#include "qobject/qdict.h" #define TSEG_SIZE_TEST_GUEST_RAM_MBYTES 128
tests/qtest/qmp-cmd-test.c +1 -1
@@ -14,7 +14,7 @@#include "libqtest.h" #include "qapi/error.h" #include "qapi/qapi-visit-introspect.h" -#include "qapi/qmp/qdict.h" +#include "qobject/qdict.h" #include "qapi/qobject-input-visitor.h" const char common_args[] ="-nodefaults -machine none" ;
tests/qtest/qmp-test.c +3 -3
@@ -14,10 +14,10 @@#include "libqtest.h" #include "qapi/error.h" #include "qapi/qapi-visit-control.h" -#include "qapi/qmp/qdict.h" -#include "qapi/qmp/qlist.h" +#include "qobject/qdict.h" +#include "qobject/qlist.h" #include "qapi/qobject-input-visitor.h" -#include "qapi/qmp/qstring.h" +#include "qobject/qstring.h" const char common_args[] ="-nodefaults -machine none" ;
tests/qtest/qom-test.c +2 -2
@@ -9,8 +9,8 @@#include "qemu/osdep.h" -#include "qapi/qmp/qdict.h" -#include "qapi/qmp/qlist.h" +#include "qobject/qdict.h" +#include "qobject/qlist.h" #include "qemu/cutils.h" #include "libqtest.h"
tests/qtest/qos-test.c +1 -1
@@ -20,7 +20,7 @@#include <getopt.h> #include "libqtest-single.h" #include "qapi/error.h" -#include "qapi/qmp/qdict.h" +#include "qobject/qdict.h" #include "qemu/module.h" #include "qapi/qobject-input-visitor.h" #include "qapi/qapi-visit-machine.h"
tests/qtest/readconfig-test.c +3 -3
@@ -13,10 +13,10 @@#include "qapi/qapi-visit-machine.h" #include "qapi/qapi-visit-qom.h" #include "qapi/qapi-visit-ui.h" -#include "qapi/qmp/qdict.h" -#include "qapi/qmp/qlist.h" +#include "qobject/qdict.h" +#include "qobject/qlist.h" #include "qapi/qobject-input-visitor.h" -#include "qapi/qmp/qstring.h" +#include "qobject/qstring.h" #include "qemu/units.h" static QTestState *qtest_init_with_config (const char *cfgdata)
tests/qtest/tco-test.c +1 -1
@@ -12,7 +12,7 @@#include "libqtest.h" #include "libqos/pci.h" #include "libqos/pci-pc.h" -#include "qapi/qmp/qdict.h" +#include "qobject/qdict.h" #include "hw/pci/pci_regs.h" #include "hw/southbridge/ich9.h" #include "hw/acpi/ich9.h"
tests/qtest/test-filter-mirror.c +1 -1
@@ -10,7 +10,7 @@#include "qemu/osdep.h" #include "libqtest.h" -#include "qapi/qmp/qdict.h" +#include "qobject/qdict.h" #include "qemu/iov.h" #include "qemu/sockets.h" #include "qemu/error-report.h"
tests/qtest/test-filter-redirector.c +1 -1
@@ -52,7 +52,7 @@#include "qemu/osdep.h" #include "libqtest.h" -#include "qapi/qmp/qdict.h" +#include "qobject/qdict.h" #include "qemu/iov.h" #include "qemu/sockets.h" #include "qemu/error-report.h"
tests/qtest/test-netfilter.c +1 -1
@@ -10,7 +10,7 @@#include "qemu/osdep.h" #include "libqtest-single.h" -#include "qapi/qmp/qdict.h" +#include "qobject/qdict.h" /* add a netfilter to a netdev and then remove it */ static void add_one_netfilter (void )
tests/qtest/test-x86-cpuid-compat.c +4 -4
@@ -1,8 +1,8 @@#include "qemu/osdep.h" -#include "qapi/qmp/qdict.h" -#include "qapi/qmp/qlist.h" -#include "qapi/qmp/qnum.h" -#include "qapi/qmp/qbool.h" +#include "qobject/qdict.h" +#include "qobject/qlist.h" +#include "qobject/qnum.h" +#include "qobject/qbool.h" #include "libqtest-single.h" static char *get_cpu0_qom_path (void )
tests/qtest/tmp105-test.c +1 -1
@@ -12,7 +12,7 @@#include "libqtest-single.h" #include "libqos/qgraph.h" #include "libqos/i2c.h" -#include "qapi/qmp/qdict.h" +#include "qobject/qdict.h" #include "hw/sensor/tmp105_regs.h" #define TMP105_TEST_ID "tmp105-test"
tests/qtest/tpm-emu.c +2 -2
@@ -16,8 +16,8 @@#include "backends/tpm/tpm_ioctl.h" #include "io/channel-socket.h" #include "qapi/error.h" -#include "qapi/qmp/qlist.h" -#include "qapi/qmp/qstring.h" +#include "qobject/qlist.h" +#include "qobject/qstring.h" #include "tpm-emu.h" void tpm_emu_test_wait_cond (TPMTestState *s)
tests/qtest/tpm-util.c +1 -1
@@ -18,7 +18,7 @@#include "hw/acpi/tpm.h" #include "libqtest.h" #include "tpm-util.h" -#include "qapi/qmp/qdict.h" +#include "qobject/qdict.h" void tpm_util_crb_transfer(QTestState *s, const unsigned char *req, size_t req_size,
tests/qtest/vhost-user-test.c +1 -1
@@ -12,7 +12,7 @@#include "libqtest-single.h" #include "qapi/error.h" -#include "qapi/qmp/qdict.h" +#include "qobject/qdict.h" #include "qemu/config-file.h" #include "qemu/option.h" #include "qemu/range.h"
tests/qtest/virtio-net-failover.c +3 -3
@@ -13,9 +13,9 @@#include "libqos/pci-pc.h" #include "migration/migration-qmp.h" #include "migration/migration-util.h" -#include "qapi/qmp/qdict.h" -#include "qapi/qmp/qlist.h" -#include "qapi/qmp/qjson.h" +#include "qobject/qdict.h" +#include "qobject/qlist.h" +#include "qobject/qjson.h" #include "libqos/malloc-pc.h" #include "libqos/virtio-pci.h" #include "hw/pci/pci.h"
tests/qtest/virtio-net-test.c +1 -1
@@ -11,7 +11,7 @@#include "libqtest-single.h" #include "qemu/iov.h" #include "qemu/module.h" -#include "qapi/qmp/qdict.h" +#include "qobject/qdict.h" #include "hw/virtio/virtio-net.h" #include "libqos/qgraph.h" #include "libqos/virtio-net.h"
tests/qtest/vmgenid-test.c +1 -1
@@ -15,7 +15,7 @@#include "boot-sector.h" #include "acpi-utils.h" #include "libqtest.h" -#include "qapi/qmp/qdict.h" +#include "qobject/qdict.h" #define VGID_GUID "324e6eaf-d1d1-4bf6-bf41-b9bb6c91fb87"#define VMGENID_GUID_OFFSET 40/* allow space for
tests/qtest/wdt_ib700-test.c +1 -1
@@ -9,7 +9,7 @@#include "qemu/osdep.h" #include "libqtest.h" -#include "qapi/qmp/qdict.h" +#include "qobject/qdict.h" #include "qemu/timer.h" static void qmp_check_no_event (QTestState *s)
tests/unit/check-block-qdict.c +2 -2
@@ -9,8 +9,8 @@#include "qemu/osdep.h" #include "block/qdict.h" -#include "qapi/qmp/qlist.h" -#include "qapi/qmp/qnum.h" +#include "qobject/qlist.h" +#include "qobject/qnum.h" #include "qapi/error.h" static void qdict_defaults_test (void )
tests/unit/check-qdict.c +3 -3
@@ -11,9 +11,9 @@*/ #include "qemu/osdep.h" -#include "qapi/qmp/qdict.h" -#include "qapi/qmp/qnum.h" -#include "qapi/qmp/qstring.h" +#include "qobject/qdict.h" +#include "qobject/qnum.h" +#include "qobject/qstring.h" /* * Public Interface test-cases
tests/unit/check-qjson.c +6 -6
@@ -14,12 +14,12 @@#include "qemu/osdep.h" #include "qapi/error.h" -#include "qapi/qmp/qbool.h" -#include "qapi/qmp/qjson.h" -#include "qapi/qmp/qlit.h" -#include "qapi/qmp/qnull.h" -#include "qapi/qmp/qnum.h" -#include "qapi/qmp/qstring.h" +#include "qobject/qbool.h" +#include "qobject/qjson.h" +#include "qobject/qlit.h" +#include "qobject/qnull.h" +#include "qobject/qnum.h" +#include "qobject/qstring.h" #include "qemu/unicode.h" static QString *from_json_str (const char *jstr,bool single,Error **errp)
tests/unit/check-qlist.c +2 -2
@@ -11,8 +11,8 @@*/ #include "qemu/osdep.h" -#include "qapi/qmp/qnum.h" -#include "qapi/qmp/qlist.h" +#include "qobject/qnum.h" +#include "qobject/qlist.h" /* * Public Interface test-cases
tests/unit/check-qlit.c +6 -6
@@ -9,12 +9,12 @@#include "qemu/osdep.h" -#include "qapi/qmp/qbool.h" -#include "qapi/qmp/qdict.h" -#include "qapi/qmp/qlist.h" -#include "qapi/qmp/qlit.h" -#include "qapi/qmp/qnum.h" -#include "qapi/qmp/qstring.h" +#include "qobject/qbool.h" +#include "qobject/qdict.h" +#include "qobject/qlist.h" +#include "qobject/qlit.h" +#include "qobject/qnum.h" +#include "qobject/qstring.h" static QLitObject qlit = QLIT_QDICT(((QLitDictEntry[]) { { "foo", QLIT_QNUM(42) },
tests/unit/check-qnull.c +1 -1
@@ -8,7 +8,7 @@*/ #include "qemu/osdep.h" -#include "qapi/qmp/qnull.h" +#include "qobject/qnull.h" #include "qapi/qobject-input-visitor.h" #include "qapi/qobject-output-visitor.h" #include "qapi/error.h"
tests/unit/check-qnum.c +1 -1
@@ -14,7 +14,7 @@#include "qemu/osdep.h" -#include "qapi/qmp/qnum.h" +#include "qobject/qnum.h" /* * Public Interface test-cases
tests/unit/check-qobject.c +6 -6
@@ -9,12 +9,12 @@#include "qemu/osdep.h" #include "qapi/error.h" -#include "qapi/qmp/qbool.h" -#include "qapi/qmp/qdict.h" -#include "qapi/qmp/qlist.h" -#include "qapi/qmp/qnull.h" -#include "qapi/qmp/qnum.h" -#include "qapi/qmp/qstring.h" +#include "qobject/qbool.h" +#include "qobject/qdict.h" +#include "qobject/qlist.h" +#include "qobject/qnull.h" +#include "qobject/qnum.h" +#include "qobject/qstring.h" #include <math.h>
tests/unit/check-qom-proplist.c +2 -2
@@ -22,8 +22,8 @@#include "qapi/error.h" #include "qapi/qobject-input-visitor.h" -#include "qapi/qmp/qdict.h" -#include "qapi/qmp/qobject.h" +#include "qobject/qdict.h" +#include "qobject/qobject.h" #include "qom/object.h" #include "qemu/module.h" #include "qemu/option.h"
tests/unit/check-qstring.c +1 -1
@@ -11,7 +11,7 @@*/ #include "qemu/osdep.h" -#include "qapi/qmp/qstring.h" +#include "qobject/qstring.h" /* * Public Interface test-cases
tests/unit/test-block-iothread.c +1 -1
@@ -28,7 +28,7 @@#include "block/blockjob_int.h" #include "system/block-backend.h" #include "qapi/error.h" -#include "qapi/qmp/qdict.h" +#include "qobject/qdict.h" #include "qemu/clang-tsa.h" #include "qemu/main-loop.h" #include "iothread.h"
tests/unit/test-blockjob-txn.c +1 -1
@@ -15,7 +15,7 @@#include "qemu/main-loop.h" #include "block/blockjob_int.h" #include "system/block-backend.h" -#include "qapi/qmp/qdict.h" +#include "qobject/qdict.h" typedef struct { BlockJob common;
tests/unit/test-blockjob.c +1 -1
@@ -15,7 +15,7 @@#include "qemu/main-loop.h" #include "block/blockjob_int.h" #include "system/block-backend.h" -#include "qapi/qmp/qdict.h" +#include "qobject/qdict.h" #include "iothread.h" static const BlockJobDriver test_block_job_driver = {
tests/unit/test-char.c +1 -1
@@ -10,7 +10,7 @@#include "system/system.h" #include "qapi/error.h" #include "qapi/qapi-commands-char.h" -#include "qapi/qmp/qdict.h" +#include "qobject/qdict.h" #include "qom/qom-qobject.h" #include "io/channel-socket.h" #include "qapi/qobject-input-visitor.h"
tests/unit/test-forward-visitor.c +2 -2
@@ -12,8 +12,8 @@#include "qapi/forward-visitor.h" #include "qapi/qobject-input-visitor.h" #include "qapi/error.h" -#include "qapi/qmp/qobject.h" -#include "qapi/qmp/qdict.h" +#include "qobject/qobject.h" +#include "qobject/qdict.h" #include "test-qapi-visit.h" #include "qemu/keyval.h"
tests/unit/test-image-locking.c +1 -1
@@ -28,7 +28,7 @@#include "block/block.h" #include "system/block-backend.h" #include "qapi/error.h" -#include "qapi/qmp/qdict.h" +#include "qobject/qdict.h" #include "qemu/main-loop.h" static BlockBackend *open_image(const char *path,
tests/unit/test-keyval.c +3 -3
@@ -13,9 +13,9 @@#include "qemu/osdep.h" #include "qemu/units.h" #include "qapi/error.h" -#include "qapi/qmp/qdict.h" -#include "qapi/qmp/qlist.h" -#include "qapi/qmp/qstring.h" +#include "qobject/qdict.h" +#include "qobject/qlist.h" +#include "qobject/qstring.h" #include "qapi/qobject-input-visitor.h" #include "test-qapi-visit.h" #include "qemu/cutils.h"
tests/unit/test-qemu-opts.c +2 -2
@@ -12,8 +12,8 @@#include "qemu/option.h" #include "qemu/option_int.h" #include "qapi/error.h" -#include "qapi/qmp/qdict.h" -#include "qapi/qmp/qstring.h" +#include "qobject/qdict.h" +#include "qobject/qstring.h" #include "qemu/config-file.h"
tests/unit/test-qga.c +2 -2
@@ -5,8 +5,8 @@#include <sys/un.h> #include "../qtest/libqtest.h" -#include "qapi/qmp/qdict.h" -#include "qapi/qmp/qlist.h" +#include "qobject/qdict.h" +#include "qobject/qlist.h" typedef struct { char *test_dir;
tests/unit/test-qmp-cmds.c +4 -4
@@ -1,9 +1,9 @@#include "qemu/osdep.h" #include "qapi/compat-policy.h" -#include "qapi/qmp/qdict.h" -#include "qapi/qmp/qjson.h" -#include "qapi/qmp/qnum.h" -#include "qapi/qmp/qstring.h" +#include "qobject/qdict.h" +#include "qobject/qjson.h" +#include "qobject/qnum.h" +#include "qobject/qstring.h" #include "qapi/error.h" #include "qapi/qobject-input-visitor.h" #include "tests/test-qapi-types.h"
tests/unit/test-qmp-event.c +5 -5
@@ -15,11 +15,11 @@#include "qapi/compat-policy.h" #include "qapi/error.h" -#include "qapi/qmp/qbool.h" -#include "qapi/qmp/qdict.h" -#include "qapi/qmp/qjson.h" -#include "qapi/qmp/qnum.h" -#include "qapi/qmp/qstring.h" +#include "qobject/qbool.h" +#include "qobject/qdict.h" +#include "qobject/qjson.h" +#include "qobject/qnum.h" +#include "qobject/qstring.h" #include "qapi/qmp-event.h" #include "test-qapi-events.h" #include "test-qapi-emit-events.h"
tests/unit/test-qobject-input-visitor.c +6 -6
@@ -17,12 +17,12 @@#include "qapi/qapi-visit-introspect.h" #include "qapi/qobject-input-visitor.h" #include "test-qapi-visit.h" -#include "qapi/qmp/qbool.h" -#include "qapi/qmp/qdict.h" -#include "qapi/qmp/qnull.h" -#include "qapi/qmp/qnum.h" -#include "qapi/qmp/qstring.h" -#include "qapi/qmp/qjson.h" +#include "qobject/qbool.h" +#include "qobject/qdict.h" +#include "qobject/qnull.h" +#include "qobject/qnum.h" +#include "qobject/qstring.h" +#include "qobject/qjson.h" #include "test-qapi-introspect.h" #include "qapi/qapi-introspect.h"
tests/unit/test-qobject-output-visitor.c +6 -6
@@ -15,12 +15,12 @@#include "qapi/error.h" #include "qapi/qobject-output-visitor.h" #include "test-qapi-visit.h" -#include "qapi/qmp/qbool.h" -#include "qapi/qmp/qdict.h" -#include "qapi/qmp/qlist.h" -#include "qapi/qmp/qnull.h" -#include "qapi/qmp/qnum.h" -#include "qapi/qmp/qstring.h" +#include "qobject/qbool.h" +#include "qobject/qdict.h" +#include "qobject/qlist.h" +#include "qobject/qnull.h" +#include "qobject/qnum.h" +#include "qobject/qstring.h" typedef struct TestOutputVisitorData { Visitor *ov;
tests/unit/test-replication.c +1 -1
@@ -11,7 +11,7 @@#include "qemu/osdep.h" #include "qapi/error.h" -#include "qapi/qmp/qdict.h" +#include "qobject/qdict.h" #include "qemu/option.h" #include "qemu/main-loop.h" #include "block/replication.h"
tests/unit/test-visitor-serialization.c +2 -2
@@ -16,8 +16,8 @@#include "test-qapi-visit.h" #include "qapi/error.h" -#include "qapi/qmp/qjson.h" -#include "qapi/qmp/qstring.h" +#include "qobject/qjson.h" +#include "qobject/qstring.h" #include "qapi/qobject-input-visitor.h" #include "qapi/qobject-output-visitor.h" #include "qapi/string-input-visitor.h"
trace/trace-hmp-cmds.c +1 -1
@@ -27,7 +27,7 @@#include "monitor/monitor.h" #include "qapi/error.h" #include "qapi/qapi-commands-trace.h" -#include "qapi/qmp/qdict.h" +#include "qobject/qdict.h" #include "trace/control.h" #ifdef CONFIG_TRACE_SIMPLE #include "trace/simple.h"
ui/ui-hmp-cmds.c +1 -1
@@ -21,7 +21,7 @@#include "monitor/monitor-internal.h" #include "qapi/error.h" #include "qapi/qapi-commands-ui.h" -#include "qapi/qmp/qdict.h" +#include "qobject/qdict.h" #include "qemu/cutils.h" #include "ui/console.h" #include "ui/input.h"
util/keyval.c +3 -3
@@ -91,9 +91,9 @@#include "qemu/osdep.h" #include "qapi/error.h" -#include "qapi/qmp/qdict.h" -#include "qapi/qmp/qlist.h" -#include "qapi/qmp/qstring.h" +#include "qobject/qdict.h" +#include "qobject/qlist.h" +#include "qobject/qstring.h" #include "qemu/cutils.h" #include "qemu/keyval.h" #include "qemu/help_option.h"
util/qemu-config.c +2 -2
@@ -1,8 +1,8 @@#include "qemu/osdep.h" #include "block/qdict.h" /* for qdict_extract_subqdict() */ #include "qapi/error.h" -#include "qapi/qmp/qdict.h" -#include "qapi/qmp/qlist.h" +#include "qobject/qdict.h" +#include "qobject/qlist.h" #include "qemu/error-report.h" #include "qemu/option.h" #include "qemu/config-file.h"
util/qemu-option.c +4 -4
@@ -27,10 +27,10 @@#include "qapi/error.h" #include "qemu/error-report.h" -#include "qapi/qmp/qbool.h" -#include "qapi/qmp/qdict.h" -#include "qapi/qmp/qnum.h" -#include "qapi/qmp/qstring.h" +#include "qobject/qbool.h" +#include "qobject/qdict.h" +#include "qobject/qnum.h" +#include "qobject/qstring.h" #include "qapi/qmp/qerror.h" #include "qemu/option_int.h" #include "qemu/cutils.h"
scripts/qapi/commands.py +2 -2
@@ -320,7 +320,7 @@ def _begin_user_module(self, name: str) -> None: #include "qemu/osdep.h" #include "qapi/compat-policy.h" #include "qapi/visitor.h" -#include "qapi/qmp/qdict.h" +#include "qobject/qdict.h" #include "qapi/dealloc-visitor.h" #include "qapi/error.h" #include "%(visit)s.h"
@@ -330,7 +330,7 @@ def _begin_user_module(self, name: str) -> None: if self._gen_tracing and commands != 'qapi-commands': self._genc.add(mcgen(''' -#include "qapi/qmp/qjson.h" +#include "qobject/qjson.h" #include "trace/trace-%(nm)s_trace_events.h" ''', nm=c_name(commands, protect=False)))
scripts/qapi/events.py +1 -1
@@ -194,7 +194,7 @@ def _begin_user_module(self, name: str) -> None: #include "%(visit)s.h" #include "qapi/compat-policy.h" #include "qapi/error.h" -#include "qapi/qmp/qdict.h" +#include "qobject/qdict.h" #include "qapi/qmp-event.h" ''', events=events, visit=visit,
scripts/qapi/introspect.py +1 -1
@@ -197,7 +197,7 @@ def visit_end(self) -> None: # generate C name = c_name(self._prefix, protect=False) + 'qmp_schema_qlit' self._genh.add(mcgen(''' -#include "qapi/qmp/qlit.h" +#include "qobject/qlit.h" extern const QLitObject %(c_name)s; ''',
Signature · 1 line
2.48.1
[PULL v2 4/8] qapi/ui: Fix documentation of upper bound value in InputMoveEvent
In reply to Markus ArmbrusterFrom: Zhang Boyang <[email protected]>
The upper bound of pointer position in InputMoveEvent should be 0x7fff, according to INPUT_EVENT_ABS_MAX.
Message-ID: <[email protected]>
--- qapi/ui.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
qapi/ui.json +1 -1
@@ -1133,7 +1133,7 @@ # @axis: Which axis is referenced by @value. # # @value: Pointer position. For absolute coordinates the valid range -# is 0 -> 0x7ffff +# is 0 to 0x7fff. # # Since: 2.0 ##
Signature · 1 line
2.48.1
[PULL v2 7/8] qapi: rename 'special_features' to 'features'
In reply to Markus ArmbrusterFrom: Daniel P. Berrangé <[email protected]>
This updates the QAPI code generation to refer to 'features' instead of 'special_features', in preparation for generalizing their exposure.
Message-ID: <[email protected]>
--- scripts/qapi/commands.py | 4 ++-- scripts/qapi/gen.py | 8 ++++---- scripts/qapi/types.py | 14 +++++--------- scripts/qapi/visit.py | 18 +++++++----------- 4 files changed, 18 insertions(+), 26 deletions(-)
scripts/qapi/commands.py +2 -2
@@ -25,7 +25,7 @@ QAPIGenC, QAPISchemaModularCVisitor, build_params, - gen_special_features, + gen_features, ifcontext, ) from .schema import (
@@ -298,7 +298,7 @@ def gen_register_command(name: str, ''', name=name, c_name=c_name(name), opts=' | '.join(options) or 0, - feats=gen_special_features(features)) + feats=gen_features(features)) return ret
scripts/qapi/gen.py +4 -4
@@ -41,10 +41,10 @@ from .source import QAPISourceInfo -def gen_special_features(features: Sequence[QAPISchemaFeature]) -> str: - special_features = [f"1u << {c_enum_const('qapi', feat.name)}" - for feat in features if feat.is_special()] - return ' | '.join(special_features) or '0' +def gen_features(features: Sequence[QAPISchemaFeature]) -> str: + featenum = [f"1u << {c_enum_const('qapi', feat.name)}" + for feat in features if feat.is_special()] + return ' | '.join(featenum) or '0' class QAPIGen:
scripts/qapi/types.py +5 -9
@@ -16,11 +16,7 @@ from typing import List, Optional from .common import c_enum_const, c_name, mcgen -from .gen import ( - QAPISchemaModularCVisitor, - gen_special_features, - ifcontext, -) +from .gen import QAPISchemaModularCVisitor, gen_features, ifcontext from .schema import ( QAPISchema, QAPISchemaAlternatives,
@@ -61,12 +57,12 @@ def gen_enum_lookup(name: str, index=index, name=memb.name) ret += memb.ifcond.gen_endif() - special_features = gen_special_features(memb.features) - if special_features != '0': + features = gen_features(memb.features) + if features != '0': feats += mcgen(''' - [%(index)s] = %(special_features)s, + [%(index)s] = %(features)s, ''', - index=index, special_features=special_features) + index=index, features=features) if feats: ret += mcgen('''
scripts/qapi/visit.py +7 -11
@@ -21,11 +21,7 @@ indent, mcgen, ) -from .gen import ( - QAPISchemaModularCVisitor, - gen_special_features, - ifcontext, -) +from .gen import QAPISchemaModularCVisitor, gen_features, ifcontext from .schema import ( QAPISchema, QAPISchemaAlternatives,
@@ -103,15 +99,15 @@ def gen_visit_object_members(name: str, ''', name=memb.name, has=has) indent.increase() - special_features = gen_special_features(memb.features) - if special_features != '0': + features = gen_features(memb.features) + if features != '0': ret += mcgen(''' - if (visit_policy_reject(v, "%(name)s", %(special_features)s, errp)) { + if (visit_policy_reject(v, "%(name)s", %(features)s, errp)) { return false; } - if (!visit_policy_skip(v, "%(name)s", %(special_features)s)) { + if (!visit_policy_skip(v, "%(name)s", %(features)s)) { ''', - name=memb.name, special_features=special_features) + name=memb.name, features=features) indent.increase() ret += mcgen(''' if (!visit_type_%(c_type)s(v, "%(name)s", &obj->%(c_name)s, errp)) {
@@ -120,7 +116,7 @@ def gen_visit_object_members(name: str, ''', c_type=memb.type.c_name(), name=memb.name, c_name=c_name(memb.name)) - if special_features != '0': + if features != '0': indent.decrease() ret += mcgen(''' }
Signature · 1 line
2.48.1
[PULL v2 6/8] qapi: change 'unsigned special_features' to 'uint64_t features'
In reply to Markus ArmbrusterFrom: Daniel P. Berrangé <[email protected]>
The "special_features" field / parameter holds the subset of schema features that are for internal code use. Specifically 'DEPRECATED' and 'UNSTABLE'.
This special casing of internal features is going to be removed, so prepare for that by renaming to 'features'. Using a fixed size type is also best practice for bit fields.
Message-ID: <[email protected]>
--- include/qapi/compat-policy.h | 2 +- include/qapi/qmp-registry.h | 4 ++-- include/qapi/util.h | 2 +- include/qapi/visitor-impl.h | 4 ++-- include/qapi/visitor.h | 12 ++++++------ qapi/qapi-forward-visitor.c | 8 ++++---- qapi/qapi-util.c | 6 +++--- qapi/qapi-visit-core.c | 12 ++++++------ qapi/qmp-dispatch.c | 2 +- qapi/qmp-registry.c | 4 ++-- qapi/qobject-input-visitor.c | 4 ++-- qapi/qobject-output-visitor.c | 6 +++--- scripts/qapi/types.py | 2 +- 13 files changed, 34 insertions(+), 34 deletions(-)
include/qapi/compat-policy.h +1 -1
@@ -18,7 +18,7 @@extern CompatPolicy compat_policy; -bool compat_policy_input_ok(unsigned special_features, +bool compat_policy_input_ok(uint64_t features, const CompatPolicy *policy, ErrorClass error_class, const char *kind, const char *name,
include/qapi/qmp-registry.h +2 -2
@@ -33,7 +33,7 @@ typedef struct QmpCommand/* Runs in coroutine context if QCO_COROUTINE is set */ QmpCommandFunc *fn;QmpCommandOptions options; -unsigned special_features; +uint64_t features;QTAILQ_ENTRY (QmpCommand) node;bool enabled;const char *disable_reason;
@@ -43,7 +43,7 @@ typedef QTAILQ_HEAD(QmpCommandList, QmpCommand) QmpCommandList;void qmp_register_command (QmpCommandList *cmds,const char *name,QmpCommandFunc *fn,QmpCommandOptions options, -unsigned special_features); +uint64_t features);const QmpCommand *qmp_find_command (const QmpCommandList *cmds,const char *name); void qmp_disable_command(QmpCommandList *cmds, const char *name,
include/qapi/util.h +1 -1
@@ -18,7 +18,7 @@ typedef enum {typedef struct QEnumLookup {const char *const *array; -const unsigned char *const special_features; +const uint64_t *const features;const int size; }QEnumLookup ;
include/qapi/visitor-impl.h +2 -2
@@ -115,11 +115,11 @@ struct Visitor/* Optional */ bool (*policy_reject)(Visitor *v,const char *name, -unsigned special_features,Error **errp); +uint64_t features,Error **errp);/* Optional */ bool (*policy_skip)(Visitor *v,const char *name, -unsigned special_features); +uint64_t features);/* Must be set */ VisitorType type;
include/qapi/visitor.h +6 -6
@@ -463,29 +463,29 @@ bool visit_optional(Visitor *v, const char *name, bool *present);/* * Should we reject member @name due to policy? * -* @special_features is the member's special features encoded as a -* bitset of QapiSpecialFeature. +* @features is the member's special features encoded as a +* bitset of QapiFeature. * * @name must not be NULL. This function is only useful between * visit_start_struct() and visit_end_struct(), since only objects * have deprecated members. */ 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? * -* @special_features is the member's special features encoded as a -* bitset of QapiSpecialFeature. +* @features is the member's special features encoded as a +* bitset of QapiFeature. * * @name must not be NULL. This function is only useful between * visit_start_struct() and visit_end_struct(), since only objects * have deprecated members. */ bool visit_policy_skip (Visitor *v,const char *name, -unsigned special_features); +uint64_t features);/* * Set policy for handling deprecated management interfaces.
qapi/qapi-forward-visitor.c +4 -4
@@ -246,7 +246,7 @@ static void forward_field_optional(Visitor *v, const char *name, bool *present) }static bool forward_field_policy_reject (Visitor *v,const char *name, -unsigned special_features, +uint64_t features,Error **errp) {ForwardFieldVisitor *ffv =to_ffv (v);
@@ -254,18 +254,18 @@ static bool forward_field_policy_reject(Visitor *v, const char *name,if (!forward_field_translate_name (ffv, &name, errp)) {return true; } -return visit_policy_reject (ffv->target, name, special_features, errp); +return visit_policy_reject (ffv->target, name, features, errp); }static bool forward_field_policy_skip (Visitor *v,const char *name, -unsigned special_features) +uint64_t features) {ForwardFieldVisitor *ffv =to_ffv (v);if (!forward_field_translate_name (ffv, &name,NULL )) {return true; } -return visit_policy_skip (ffv->target, name, special_features); +return visit_policy_skip (ffv->target, name, features); }static void forward_field_complete (Visitor *v,void *opaque)
qapi/qapi-util.c +3 -3
@@ -37,19 +37,19 @@ static bool compat_policy_input_ok1(const char *adjective, } } -bool compat_policy_input_ok (unsigned special_features, +bool compat_policy_input_ok (uint64_t features,const CompatPolicy *policy,ErrorClass error_class,const char *kind,const char *name,Error **errp) { -if ((special_features &1u <<QAPI_DEPRECATED ) +if ((features &1u <<QAPI_DEPRECATED ) && !compat_policy_input_ok1 ("Deprecated" , policy->deprecated_input, error_class, kind, name, errp)) {return false; } -if ((special_features & (1u <<QAPI_UNSTABLE )) +if ((features & (1u <<QAPI_UNSTABLE )) && !compat_policy_input_ok1 ("Unstable" , policy->unstable_input, error_class, kind, name, errp)) {
qapi/qapi-visit-core.c +6 -6
@@ -141,21 +141,21 @@ bool visit_optional(Visitor *v, const char *name, bool *present) }bool visit_policy_reject (Visitor *v,const char *name, -unsigned special_features,Error **errp) +uint64_t features,Error **errp) {trace_visit_policy_reject (v, name);if (v->policy_reject) { -return v->policy_reject (v, name, special_features, errp); +return v->policy_reject (v, name, features, errp); }return false; }bool visit_policy_skip (Visitor *v,const char *name, -unsigned special_features) +uint64_t features) {trace_visit_policy_skip (v, name);if (v->policy_skip) { -return v->policy_skip (v, name, special_features); +return v->policy_skip (v, name, features); }return false; }
@@ -409,8 +409,8 @@ static bool input_type_enum(Visitor *v, const char *name, int *obj,return false; } -if (lookup->special_features - && !compat_policy_input_ok (lookup->special_features[value], +if (lookup->features + && !compat_policy_input_ok (lookup->features[value], &v->compat_policy,ERROR_CLASS_GENERIC_ERROR ,"value" , enum_str, errp)) {
qapi/qmp-dispatch.c +1 -1
@@ -173,7 +173,7 @@ QDict *coroutine_mixed_fn qmp_dispatch(const QmpCommandList *cmds, QObject *requ "The command %s has not been found", command); goto out; } -if (!compat_policy_input_ok (cmd->special_features, &compat_policy, +if (!compat_policy_input_ok (cmd->features, &compat_policy,ERROR_CLASS_COMMAND_NOT_FOUND ,"command" , command, &err)) { goto out;
qapi/qmp-registry.c +2 -2
@@ -17,7 +17,7 @@void qmp_register_command (QmpCommandList *cmds,const char *name,QmpCommandFunc *fn,QmpCommandOptions options, -unsigned special_features) +uint64_t features) {QmpCommand *cmd =g_malloc0 (sizeof (*cmd));
@@ -28,7 +28,7 @@ void qmp_register_command(QmpCommandList *cmds, const char *name, cmd->fn = fn; cmd->enabled = true; cmd->options = options; - cmd->special_features = special_features; + cmd->features = features;QTAILQ_INSERT_TAIL (cmds, cmd, node); }
qapi/qobject-input-visitor.c +2 -2
@@ -664,10 +664,10 @@ static void qobject_input_optional(Visitor *v, const char *name, bool *present) }static bool qobject_input_policy_reject (Visitor *v,const char *name, -unsigned special_features, +uint64_t features,Error **errp) { -return !compat_policy_input_ok (special_features, &v->compat_policy, +return !compat_policy_input_ok (features, &v->compat_policy,ERROR_CLASS_GENERIC_ERROR ,"parameter" , name, errp); }
qapi/qobject-output-visitor.c +3 -3
@@ -210,13 +210,13 @@ static bool qobject_output_type_null(Visitor *v, const char *name, }static bool qobject_output_policy_skip (Visitor *v,const char *name, -unsigned special_features) +uint64_t features) {CompatPolicy *pol = &v->compat_policy; -return ((special_features &1u <<QAPI_DEPRECATED ) +return ((features &1u <<QAPI_DEPRECATED ) && pol->deprecated_output ==COMPAT_POLICY_OUTPUT_HIDE ) - || ((special_features &1u <<QAPI_UNSTABLE ) + || ((features &1u <<QAPI_UNSTABLE ) && pol->unstable_output ==COMPAT_POLICY_OUTPUT_HIDE ); }
scripts/qapi/types.py +1 -1
@@ -71,7 +71,7 @@ def gen_enum_lookup(name: str, if feats: ret += mcgen(''' }, - .special_features = (const unsigned char[%(max_index)s]) { + .features = (const uint64_t[%(max_index)s]) { ''', max_index=max_index) ret += feats
Signature · 1 line
2.48.1
[PULL v2 2/8] qapi: Move and rename qapi/qmp/dispatch.h to qapi/qmp-registry.h
In reply to Markus ArmbrusterFrom: Daniel P. Berrangé <[email protected]>
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.
include/qapi/qmp/dispatch.h corresponds mostly to qapi/qmp-registry.c. Move and rename it to include/qapi/qmp-registry.h.
Now just qerror.h is left in include/qapi/qmp/. Since it's deprecated & (slowly) getting eliminated anyway, it isn't worth moving.
Message-ID: <[email protected]>
---
docs/devel/qapi-code-gen.rst | 2 +-
include/qapi/{qmp/dispatch.h => qmp-registry.h} | 0
monitor/monitor-internal.h | 2 +-
qga/guest-agent-core.h | 2 +-
qapi/qmp-dispatch.c | 2 +-
qapi/qmp-registry.c | 2 +-
stubs/qmp-command-available.c | 2 +-
stubs/qmp-quit.c | 2 +-
system/qdev-monitor.c | 2 +-
scripts/qapi/commands.py | 2 +-
10 files changed, 9 insertions(+), 9 deletions(-)
rename include/qapi/{qmp/dispatch.h => qmp-registry.h} (100%)docs/devel/qapi-code-gen.rst +1 -1
@@ -1855,7 +1855,7 @@ Example:: #ifndef 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);
include/qapi/qmp-registry.h renamed from include/qapi/qmp/dispatch.h +0 -0
monitor/monitor-internal.h +1 -1
@@ -28,7 +28,7 @@#include "chardev/char-fe.h" #include "monitor/monitor.h" #include "qapi/qapi-types-control.h" -#include "qapi/qmp/dispatch.h" +#include "qapi/qmp-registry.h" #include "qobject/json-parser.h" #include "qemu/readline.h" #include "system/iothread.h"
qga/guest-agent-core.h +1 -1
@@ -13,7 +13,7 @@#ifndef GUEST_AGENT_CORE_H #define GUEST_AGENT_CORE_H -#include "qapi/qmp/dispatch.h" +#include "qapi/qmp-registry.h" #include "qga-qapi-types.h" #define QGA_READ_COUNT_DEFAULT 4096
qapi/qmp-dispatch.c +1 -1
@@ -16,7 +16,7 @@#include "block/aio.h" #include "qapi/compat-policy.h" #include "qapi/error.h" -#include "qapi/qmp/dispatch.h" +#include "qapi/qmp-registry.h" #include "qobject/qdict.h" #include "qobject/qjson.h" #include "qapi/qobject-input-visitor.h"
qapi/qmp-registry.c +1 -1
@@ -13,7 +13,7 @@*/ #include "qemu/osdep.h" -#include "qapi/qmp/dispatch.h" +#include "qapi/qmp-registry.h" void qmp_register_command(QmpCommandList *cmds, const char *name, QmpCommandFunc *fn, QmpCommandOptions options,
stubs/qmp-command-available.c +1 -1
@@ -1,5 +1,5 @@#include "qemu/osdep.h" -#include "qapi/qmp/dispatch.h" +#include "qapi/qmp-registry.h" bool qmp_command_available (const QmpCommand *cmd,Error **errp) {
stubs/qmp-quit.c +1 -1
@@ -1,6 +1,6 @@#include "qemu/osdep.h" #include "qapi/qapi-commands-control.h" -#include "qapi/qmp/dispatch.h" +#include "qapi/qmp-registry.h" void qmp_quit (Error **errp) {
system/qdev-monitor.c +1 -1
@@ -26,7 +26,7 @@#include "system/runstate.h" #include "qapi/error.h" #include "qapi/qapi-commands-qdev.h" -#include "qapi/qmp/dispatch.h" +#include "qapi/qmp-registry.h" #include "qobject/qdict.h" #include "qapi/qmp/qerror.h" #include "qobject/qstring.h"
scripts/qapi/commands.py +1 -1
@@ -346,7 +346,7 @@ def _begin_user_module(self, name: str) -> None: def visit_begin(self, schema: QAPISchema) -> None: self._add_module('./init', ' * QAPI Commands initialization') self._genh.add(mcgen(''' -#include "qapi/qmp/dispatch.h" +#include "qapi/qmp-registry.h" void %(c_prefix)sqmp_init_marshal(QmpCommandList *cmds); ''',
Signature · 1 line
2.48.1
Stefan Hajnoczi
AppliedApplied, thanks.
Please update the changelog at https://wiki.qemu.org/ChangeLog/10.0 for any user-visible changes.