• Markus Armbruster's avatar
    include/qemu/osdep.h: Don't include qapi/error.h · da34e65c
    Markus Armbruster authored
    Commit 57cb38b3 included qapi/error.h into qemu/osdep.h to get the
    Error typedef.  Since then, we've moved to include qemu/osdep.h
    everywhere.  Its file comment explains: "To avoid getting into
    possible circular include dependencies, this file should not include
    any other QEMU headers, with the exceptions of config-host.h,
    compiler.h, os-posix.h and os-win32.h, all of which are doing a
    similar job to this file and are under similar constraints."
    qapi/error.h doesn't do a similar job, and it doesn't adhere to
    similar constraints: it includes qapi-types.h.  That's in excess of
    100KiB of crap most .c files don't actually need.
    
    Add the typedef to qemu/typedefs.h, and include that instead of
    qapi/error.h.  Include qapi/error.h in .c files that need it and don't
    get it now.  Include qapi-types.h in qom/object.h for uint16List.
    
    Update scripts/clean-includes accordingly.  Update it further to match
    reality: replace config.h by config-target.h, add sysemu/os-posix.h,
    sysemu/os-win32.h.  Update the list of includes in the qemu/osdep.h
    comment quoted above similarly.
    
    This reduces the number of objects depending on qapi/error.h from "all
    of them" to less than a third.  Unfortunately, the number depending on
    qapi-types.h shrinks only a little.  More work is needed for that one.
    Signed-off-by: 's avatarMarkus Armbruster <armbru@redhat.com>
    [Fix compilation without the spice devel packages. - Paolo]
    Signed-off-by: 's avatarPaolo Bonzini <pbonzini@redhat.com>
    da34e65c
cpu64.c 11.7 KB