aboutsummaryrefslogtreecommitdiff
path: root/scripts/qapi/commands.py
diff options
context:
space:
mode:
authorDaniel P. Berrangé <berrange@redhat.com>2024-11-18 16:12:34 +0100
committerMarkus Armbruster <armbru@redhat.com>2025-02-10 15:33:16 +0100
commit407bc4bf9027f7ac4333e47cd900d773b99a23e3 (patch)
tree6f617801cce2d4715d586e15a2523488bdd68711 /scripts/qapi/commands.py
parent04d3d0e9f54d4c42759f3810aa135ce314d98dc4 (diff)
downloadqemu-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 'scripts/qapi/commands.py')
-rw-r--r--scripts/qapi/commands.py4
1 files changed, 2 insertions, 2 deletions
diff --git a/scripts/qapi/commands.py b/scripts/qapi/commands.py
index 79951a8..f0aa13b 100644
--- a/scripts/qapi/commands.py
+++ b/scripts/qapi/commands.py
@@ -320,7 +320,7 @@ class QAPISchemaGenCommandVisitor(QAPISchemaModularCVisitor):
#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 @@ class QAPISchemaGenCommandVisitor(QAPISchemaModularCVisitor):
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)))