diff options
| author | Daniel P. Berrangé <berrange@redhat.com> | 2024-11-18 16:12:34 +0100 |
|---|---|---|
| committer | Markus Armbruster <armbru@redhat.com> | 2025-02-10 15:33:16 +0100 |
| commit | 407bc4bf9027f7ac4333e47cd900d773b99a23e3 (patch) | |
| tree | 6f617801cce2d4715d586e15a2523488bdd68711 /system | |
| parent | 04d3d0e9f54d4c42759f3810aa135ce314d98dc4 (diff) | |
| download | qemu-407bc4bf9027f7ac4333e47cd900d773b99a23e3.zip qemu-407bc4bf9027f7ac4333e47cd900d773b99a23e3.tar.gz qemu-407bc4bf9027f7ac4333e47cd900d773b99a23e3.tar.bz2 | |
qapi: Move include/qapi/qmp/ to include/qobject/
The general expectation is that header files should follow the same
file/path naming scheme as the corresponding source file. There are
various historical exceptions to this practice in QEMU, with one of
the most notable being the include/qapi/qmp/ directory. Most of the
headers there correspond to source files in qobject/.
This patch corrects most of that inconsistency by creating
include/qobject/ and moving the headers for qobject/ there.
This also fixes MAINTAINERS for include/qapi/qmp/dispatch.h:
scripts/get_maintainer.pl now reports "QAPI" instead of "No
maintainers found".
Signed-off-by: Daniel P. Berrangé <berrange@redhat.com>
Reviewed-by: Zhao Liu <zhao1.liu@intel.com>
Acked-by: Halil Pasic <pasic@linux.ibm.com> #s390x
Signed-off-by: Markus Armbruster <armbru@redhat.com>
Message-ID: <20241118151235.2665921-2-armbru@redhat.com>
[Rebased]
Diffstat (limited to 'system')
| -rw-r--r-- | system/device_tree.c | 2 | ||||
| -rw-r--r-- | system/dirtylimit.c | 2 | ||||
| -rw-r--r-- | system/qdev-monitor.c | 4 | ||||
| -rw-r--r-- | system/runstate-hmp-cmds.c | 2 | ||||
| -rw-r--r-- | system/vl.c | 6 |
5 files changed, 8 insertions, 8 deletions
diff --git a/system/device_tree.c b/system/device_tree.c index 11f3178..4bc2d61 100644 --- a/system/device_tree.c +++ b/system/device_tree.c @@ -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> diff --git a/system/dirtylimit.c b/system/dirtylimit.c index 7c07124..7dedef8 100644 --- a/system/dirtylimit.c +++ b/system/dirtylimit.c @@ -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" diff --git a/system/qdev-monitor.c b/system/qdev-monitor.c index 861c25c..81fe531 100644 --- a/system/qdev-monitor.c +++ b/system/qdev-monitor.c @@ -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" diff --git a/system/runstate-hmp-cmds.c b/system/runstate-hmp-cmds.c index 2df670f..be1d676 100644 --- a/system/runstate-hmp-cmds.c +++ b/system/runstate-hmp-cmds.c @@ -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) diff --git a/system/vl.c b/system/vl.c index db8e604..ff91af8 100644 --- a/system/vl.c +++ b/system/vl.c @@ -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" |