Re: [PATCH 01/29] include: move include/qapi/qmp/ to include/qobject/

[Markus Armbruster]

Markus Armbruster <armbru@redhat.com> writes:

> I just realized I dropped this on the floor.  I apologize for the delay.
>
> Daniel P. Berrangé <berrange@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, ...

Funny:

    commit 7b1b5d191385ca52e96caae2a05c64f3a63855d9
    Author: Paolo Bonzini <pbonzini@redhat.com>
    Date:   Mon Dec 17 18:19:43 2012 +0100

        qapi: move include files to include/qobject/

That's what you want!  However, ...

        Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>

     [...]

     qapi/qmp-core.h => include/qapi/qmp/dispatch.h         |  6 +++---
     json-lexer.h => include/qapi/qmp/json-lexer.h          |  4 ++--
     json-parser.h => include/qapi/qmp/json-parser.h        |  4 ++--
     json-streamer.h => include/qapi/qmp/json-streamer.h    |  4 ++--
     qbool.h => include/qapi/qmp/qbool.h                    |  2 +-
     qdict.h => include/qapi/qmp/qdict.h                    |  4 ++--
     qerror.h => include/qapi/qmp/qerror.h                  |  6 +++---
     qfloat.h => include/qapi/qmp/qfloat.h                  |  2 +-
     qint.h => include/qapi/qmp/qint.h                      |  2 +-
     qjson.h => include/qapi/qmp/qjson.h                    |  4 ++--
     qlist.h => include/qapi/qmp/qlist.h                    |  2 +-
     qobject.h => include/qapi/qmp/qobject.h                |  0
     qstring.h => include/qapi/qmp/qstring.h                |  2 +-
     qemu-objects.h => include/qapi/qmp/types.h             | 16 
++++++++--------

     [...]

... it's not what the patch does %-}

[...]