Richard Henderson <richard.hender...@linaro.org> writes:

> All this is working toward building accel/tcg/translator.c once,
> but it got late and I decided to stop at a convenient milestone.
>
<snip>
>
> I know there is overlap with other in-flight patches, but it
> seemed easiest to just start from master.

I guess that was why the re-base fails with:

  [2210/6843] Compiling C object libcommon.a.p/hw_vfio_migration.c.o
  FAILED: libcommon.a.p/hw_vfio_migration.c.o 
  cc -m64 -Ilibcommon.a.p -I../../common-user/host/x86_64 
-I../../linux-user/include/host/x86_64 -I../../linux-user/include 
-Isubprojects/libvduse -I../../subprojects/libvduse -I/usr/include/capstone 
-I/usr/include/p11-kit-1 -I/usr/include/pixman-1 -I/usr/include/libpng16 
-I/usr/include/spice-server -I/usr/include/spice-1 -I/usr/include/libusb-1.0 
-I/usr/include/SDL2 -I/usr/include/glib-2.0 
-I/usr/lib/x86_64-linux-gnu/glib-2.0/include -I/usr/include/libmount 
-I/usr/include/blkid -I/usr/include/gio-unix-2.0 -I/usr/include/slirp 
-I/usr/include/gtk-3.0 -I/usr/include/pango-1.0 -I/usr/include/harfbuzz 
-I/usr/include/freetype2 -I/usr/include/fribidi -I/usr/include/cairo 
-I/usr/include/gdk-pixbuf-2.0 -I/usr/include/x86_64-linux-gnu 
-I/usr/include/atk-1.0 -I/usr/include/at-spi2-atk/2.0 -I/usr/include/at-spi-2.0 
-I/usr/include/dbus-1.0 -I/usr/lib/x86_64-linux-gnu/dbus-1.0/include 
-I/usr/include/vte-2.91 -I/usr/include/virgl -I/usr/include/cacard 
-I/usr/include/nss -I/usr/include/nspr -I/usr/include/PCSC 
-I/usr/include/pipewire-0.3 -I/usr/include/spa-0.2 -I/usr/include/fuse3 
-I/usr/include/uuid -fdiagnostics-color=auto -Wall -Winvalid-pch -Werror 
-std=gnu11 -O2 -fstack-protector-strong -Wempty-body -Wendif-labels 
-Wexpansion-to-defined -Wformat-security -Wformat-y2k -Wignored-qualifiers 
-Wimplicit-fallthrough=2 -Winit-self -Wmissing-format-attribute 
-Wmissing-prototypes -Wnested-externs -Wold-style-declaration 
-Wold-style-definition -Wredundant-decls -Wshadow=local -Wstrict-prototypes 
-Wtype-limits -Wundef -Wvla -Wwrite-strings -Wno-missing-include-dirs 
-Wno-psabi -Wno-shift-negative-value -isystem 
/home/alex/lsrc/qemu.git/linux-headers -isystem linux-headers -iquote . -iquote 
/home/alex/lsrc/qemu.git -iquote /home/alex/lsrc/qemu.git/include -iquote 
/home/alex/lsrc/qemu.git/host/include/x86_64 -iquote 
/home/alex/lsrc/qemu.git/host/include/generic -iquote 
/home/alex/lsrc/qemu.git/tcg/i386 -pthread -mcx16 -msse2 -D_GNU_SOURCE 
-D_LARGEFILE_SOURCE -fno-strict-aliasing -fno-common -fwrapv 
-ftrivial-auto-var-init=zero -fzero-call-used-regs=used-gpr -fPIE 
-D_FILE_OFFSET_BITS=64 -D__USE_FILE_OFFSET64 -D__USE_LARGEFILE64 
-DUSE_POSIX_ACLS=1 -D_DEFAULT_SOURCE -D_XOPEN_SOURCE=600 -DNCURSES_WIDECHAR=1 
-D_REENTRANT -DSTRUCT_IOVEC_DEFINED -MD -MQ libcommon.a.p/hw_vfio_migration.c.o 
-MF libcommon.a.p/hw_vfio_migration.c.o.d -o 
libcommon.a.p/hw_vfio_migration.c.o -c ../../hw/vfio/migration.c
  In file included from ../../hw/vfio/migration.c:30:
  /home/alex/lsrc/qemu.git/include/system/ram_addr.h:22:10: fatal error: cpu.h: 
No such file or directory
     22 | #include "cpu.h"
        |          ^~~~~~~
  compilation terminated.
  [2211/6843] Compiling C object libcommon.a.p/hw_vfio_iommufd.c.o
  FAILED: libcommon.a.p/hw_vfio_iommufd.c.o 
  cc -m64 -Ilibcommon.a.p -I../../common-user/host/x86_64 
-I../../linux-user/include/host/x86_64 -I../../linux-user/include 
-Isubprojects/libvduse -I../../subprojects/libvduse -I/usr/include/capstone 
-I/usr/include/p11-kit-1 -I/usr/include/pixman-1 -I/usr/include/libpng16 
-I/usr/include/spice-server -I/usr/include/spice-1 -I/usr/include/libusb-1.0 
-I/usr/include/SDL2 -I/usr/include/glib-2.0 
-I/usr/lib/x86_64-linux-gnu/glib-2.0/include -I/usr/include/libmount 
-I/usr/include/blkid -I/usr/include/gio-unix-2.0 -I/usr/include/slirp 
-I/usr/include/gtk-3.0 -I/usr/include/pango-1.0 -I/usr/include/harfbuzz 
-I/usr/include/freetype2 -I/usr/include/fribidi -I/usr/include/cairo 
-I/usr/include/gdk-pixbuf-2.0 -I/usr/include/x86_64-linux-gnu 
-I/usr/include/atk-1.0 -I/usr/include/at-spi2-atk/2.0 -I/usr/include/at-spi-2.0 
-I/usr/include/dbus-1.0 -I/usr/lib/x86_64-linux-gnu/dbus-1.0/include 
-I/usr/include/vte-2.91 -I/usr/include/virgl -I/usr/include/cacard 
-I/usr/include/nss -I/usr/include/nspr -I/usr/include/PCSC 
-I/usr/include/pipewire-0.3 -I/usr/include/spa-0.2 -I/usr/include/fuse3 
-I/usr/include/uuid -fdiagnostics-color=auto -Wall -Winvalid-pch -Werror 
-std=gnu11 -O2 -fstack-protector-strong -Wempty-body -Wendif-labels 
-Wexpansion-to-defined -Wformat-security -Wformat-y2k -Wignored-qualifiers 
-Wimplicit-fallthrough=2 -Winit-self -Wmissing-format-attribute 
-Wmissing-prototypes -Wnested-externs -Wold-style-declaration 
-Wold-style-definition -Wredundant-decls -Wshadow=local -Wstrict-prototypes 
-Wtype-limits -Wundef -Wvla -Wwrite-strings -Wno-missing-include-dirs 
-Wno-psabi -Wno-shift-negative-value -isystem 
/home/alex/lsrc/qemu.git/linux-headers -isystem linux-headers -iquote . -iquote 
/home/alex/lsrc/qemu.git -iquote /home/alex/lsrc/qemu.git/include -iquote 
/home/alex/lsrc/qemu.git/host/include/x86_64 -iquote 
/home/alex/lsrc/qemu.git/host/include/generic -iquote 
/home/alex/lsrc/qemu.git/tcg/i386 -pthread -mcx16 -msse2 -D_GNU_SOURCE 
-D_LARGEFILE_SOURCE -fno-strict-aliasing -fno-common -fwrapv 
-ftrivial-auto-var-init=zero -fzero-call-used-regs=used-gpr -fPIE 
-D_FILE_OFFSET_BITS=64 -D__USE_FILE_OFFSET64 -D__USE_LARGEFILE64 
-DUSE_POSIX_ACLS=1 -D_DEFAULT_SOURCE -D_XOPEN_SOURCE=600 -DNCURSES_WIDECHAR=1 
-D_REENTRANT -DSTRUCT_IOVEC_DEFINED -MD -MQ libcommon.a.p/hw_vfio_iommufd.c.o 
-MF libcommon.a.p/hw_vfio_iommufd.c.o.d -o libcommon.a.p/hw_vfio_iommufd.c.o -c 
../../hw/vfio/iommufd.c
  In file included from ../../hw/vfio/iommufd.c:28:
  /home/alex/lsrc/qemu.git/include/system/ram_addr.h:22:10: fatal error: cpu.h: 
No such file or directory
     22 | #include "cpu.h"
        |          ^~~~~~~
  compilation terminated.

I'll see if I can bisect...

-- 
Alex Bennée
Virtualisation Tech Lead @ Linaro

Reply via email to