On 18/07/2016 12:23, Peter Maydell wrote: > I'm afraid this fails to build for w32: > > /home/petmay01/linaro/qemu-for-merges/block/win32-aio.c:30:21: fatal > error: raw-aio.h: No such file or directory > #include "raw-aio.h" > ^ > compilation terminated. > > Looks like that should be "block/raw-aio.h".
But that's in the patch: diff --git a/block/raw-win32.c b/block/raw-win32.c index 62edb1a..9b813d9 100644 --- a/block/raw-win32.c +++ b/block/raw-win32.c @@ -27,7 +27,7 @@ #include "qemu/timer.h" #include "block/block_int.h" #include "qemu/module.h" -#include "raw-aio.h" +#include "block/raw-aio.h" #include "trace.h" #include "block/thread-pool.h" #include "qemu/iov.h" Did you get a conflict, or did git screw up some resolution? Paolo
