On Thu, Oct 17, 2024 at 12:33:13PM +0100, Daniel P. Berrangé wrote:
> Date: Thu, 17 Oct 2024 12:33:13 +0100
> From: "Daniel P. Berrangé" <berra...@redhat.com>
> Subject: [PATCH v2 01/31] include: 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 that inconsistency by creating include/qobject/.
> The only outlier is include/qapi/qmp/dispatch.h which gets renamed
> to include/qapi/qmp-registry.h.
>
> To allow the code to continue to build, symlinks are temporarily
> added in $QEMU/qapi/qmp/ to point to the new location. They will
> be removed in a later commit.
>
> Signed-off-by: Daniel P. Berrangé <berra...@redhat.com>
> ---
> MAINTAINERS | 5 +----
> include/qapi/{qmp/dispatch.h => qmp-registry.h} | 0
> include/{qapi/qmp => qobject}/json-parser.h | 0
> include/{qapi/qmp => qobject}/json-writer.h | 0
> include/{qapi/qmp => qobject}/qbool.h | 0
> include/{qapi/qmp => qobject}/qdict.h | 0
> include/{qapi/qmp => qobject}/qjson.h | 0
> include/{qapi/qmp => qobject}/qlist.h | 0
> include/{qapi/qmp => qobject}/qlit.h | 0
> include/{qapi/qmp => qobject}/qnull.h | 0
> include/{qapi/qmp => qobject}/qnum.h | 0
> include/{qapi/qmp => qobject}/qobject.h | 0
> include/{qapi/qmp => qobject}/qstring.h | 0
> qapi/qmp/dispatch.h | 1 +
> qapi/qmp/json-parser.h | 1 +
> qapi/qmp/json-writer.h | 1 +
> qapi/qmp/qbool.h | 1 +
> qapi/qmp/qdict.h | 1 +
> qapi/qmp/qjson.h | 1 +
> qapi/qmp/qlist.h | 1 +
> qapi/qmp/qlit.h | 1 +
> qapi/qmp/qnull.h | 1 +
> qapi/qmp/qnum.h | 1 +
> qapi/qmp/qobject.h | 1 +
> qapi/qmp/qstring.h | 1 +
> 25 files changed, 13 insertions(+), 4 deletions(-)
> rename include/qapi/{qmp/dispatch.h => qmp-registry.h} (100%)
> 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 (100%)
> rename include/{qapi/qmp => qobject}/qdict.h (100%)
> rename include/{qapi/qmp => qobject}/qjson.h (100%)
> rename include/{qapi/qmp => qobject}/qlist.h (100%)
> rename include/{qapi/qmp => qobject}/qlit.h (100%)
> rename include/{qapi/qmp => qobject}/qnull.h (100%)
> rename include/{qapi/qmp => qobject}/qnum.h (100%)
> rename include/{qapi/qmp => qobject}/qobject.h (100%)
> rename include/{qapi/qmp => qobject}/qstring.h (100%)
> create mode 120000 qapi/qmp/dispatch.h
> create mode 120000 qapi/qmp/json-parser.h
> create mode 120000 qapi/qmp/json-writer.h
> create mode 120000 qapi/qmp/qbool.h
> create mode 120000 qapi/qmp/qdict.h
> create mode 120000 qapi/qmp/qjson.h
> create mode 120000 qapi/qmp/qlist.h
> create mode 120000 qapi/qmp/qlit.h
> create mode 120000 qapi/qmp/qnull.h
> create mode 120000 qapi/qmp/qnum.h
> create mode 120000 qapi/qmp/qobject.h
> create mode 120000 qapi/qmp/qstring.h
>
Reviewed-by: Zhao Liu <zhao1....@intel.com>
