On Mon, 7 Jul 2025 at 18:14, Philippe Mathieu-Daudé <phi...@linaro.org> wrote: > > "qemu/typedefs.h" is already included by "qemu/osdep.h". > > Signed-off-by: Philippe Mathieu-Daudé <phi...@linaro.org> > --- > hw/vfio/vfio-migration-internal.h | 1 - > include/system/os-win32.h | 1 - > hw/intc/loongarch_extioi_kvm.c | 1 - > 3 files changed, 3 deletions(-)
> diff --git a/include/system/os-win32.h b/include/system/os-win32.h > index 3aa6cee4c23..662cfabc5e7 100644 > --- a/include/system/os-win32.h > +++ b/include/system/os-win32.h > @@ -29,7 +29,6 @@ > #include <winsock2.h> > #include <windows.h> > #include <ws2tcpip.h> > -#include "qemu/typedefs.h" > > #ifdef HAVE_AFUNIX_H > #include <afunix.h> This one's tricky -- osdep.h includes system/os-win32.h *before* it includes typedefs.h. If you want to remove this include I think you need to move the include of typedefs.h a bit further up in osdep.h (taking care that it's still wrapped in an "extern C"). (Or we could declare the functions in os-win32.h which use the Error type somewhere else. That header I think is intended to be "Windows specifics and compatibility wrappers that everywhere needs to have sorted out", not "this function happens to only be needed on Windows": a lot of the functions declared in it are only used in a handful of files and don't need to be declared to every source file in the project. But that's a bit more effort.) The other two changes here are fine. thanks -- PMM
