Daniel P. Berrangé <berra...@redhat.com> writes:
> 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>
[...]
> diff --git a/MAINTAINERS b/MAINTAINERS
> index c21d6a2f9e..656482b2a4 100644
> --- a/MAINTAINERS
> +++ b/MAINTAINERS
> @@ -3153,8 +3153,6 @@ S: Supported
> F: qapi/
> X: qapi/*.json
> F: include/qapi/
> -X: include/qapi/qmp/
> -F: include/qapi/qmp/dispatch.h
This tried to have add just include/qapi/qmp/dispatch.h from this
subdirectory. It didn't work:
$ scripts/get_maintainer.pl -f include/qapi/qmp/dispatch.h
get_maintainer.pl: No maintainers found, printing recent contributors.
get_maintainer.pl: Do not blindly cc: them on patches! Use common sense.
qemu-devel@nongnu.org (open list:All patches CC here)
The patch moved and renames the header to include/qapi/qmp-registry.h,
which also fixes attribution:
$ scripts/get_maintainer.pl -f include/qapi/qmp-registry.h
Markus Armbruster <arm...@redhat.com> (supporter:QAPI)
Michael Roth <michael.r...@amd.com> (supporter:QAPI)
qemu-devel@nongnu.org (open list:All patches CC here)
Mentioning this in the commit message wouldn't hurt. Not worth a
respin.
> F: tests/qapi-schema/
> F: tests/unit/test-*-visitor.c
> F: tests/unit/test-qapi-*.c
> @@ -3178,8 +3176,7 @@ QObject
> M: Markus Armbruster <arm...@redhat.com>
> 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
[...]
