I just realized I dropped this on the floor. I apologize for the delay.
Daniel P. Berrangé <berra...@redhat.com> writes:
> On Mon, Jan 08, 2024 at 06:23:37PM +0000, Daniel P. Berrangé wrote:
>> 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/.
Yes, there's inconsistency, but is it worth cleaning up? Since you did
the work already, and sunk cost doesn't count, ...
>> The only outlier is include/qapi/qmp/dispatch.h which gets renamed
>> to include/qapi/qmp-registry.h.
Good, as "QMP registry" is a more accurate description than "QMP
dispatch".
>> 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.
Only necessary to let you split the patch updating #include directives.
The update is entirely mechanical, isn't it? I doubt splitting is worth
the trouble then.
>> 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}/qerror.h | 0
>
> Of course just after sending this I decided that moving qerror.h
> to qobject/ is probably not optimal. It only contains a set of
> (deprecated) error message strings. Perhaps it could just move
> from qapi/qmp/qerror.h to just qapi/qerror.h ? Other suggestions ?
qapi/qerror.h works for me.
Could use the opportunity to rename it to qapi/deprecated-qerror.h.
>> 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
>
> With regards,
> Daniel
