[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
Re: [Qemu-devel] [PULL 0/4] Block patches
From: |
Paolo Bonzini |
Subject: |
Re: [Qemu-devel] [PULL 0/4] Block patches |
Date: |
Mon, 18 Jul 2016 16:57:31 +0200 |
User-agent: |
Mozilla/5.0 (X11; Linux x86_64; rv:45.0) Gecko/20100101 Thunderbird/45.1.1 |
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
- [Qemu-devel] [PULL 0/4] Block patches, Stefan Hajnoczi, 2016/07/15
- [Qemu-devel] [PULL 1/4] spec/parallels: fix a mistake, Stefan Hajnoczi, 2016/07/15
- [Qemu-devel] [PULL 3/4] aio_ctx_check: follow CODING_STYLE, Stefan Hajnoczi, 2016/07/15
- [Qemu-devel] [PULL 2/4] linux-aio: share one LinuxAioState within an AioContext, Stefan Hajnoczi, 2016/07/15
- [Qemu-devel] [PULL 4/4] linux-aio: prevent submitting more than MAX_EVENTS, Stefan Hajnoczi, 2016/07/15
- Re: [Qemu-devel] [PULL 0/4] Block patches, Peter Maydell, 2016/07/18
- Re: [Qemu-devel] [PULL 0/4] Block patches,
Paolo Bonzini <=
- [Qemu-devel] [PULL 0/4] Block patches, Max Reitz, 2016/07/19
- [Qemu-devel] [PULL 1/4] qcow2: do not allocate extra memory, Max Reitz, 2016/07/19
- [Qemu-devel] [PULL 2/4] AioContext: correct comments, Max Reitz, 2016/07/19
- [Qemu-devel] [PULL 3/4] crypto: add support for querying parameters for block encryption, Max Reitz, 2016/07/19
- [Qemu-devel] [PULL 4/4] block: export LUKS specific data to qemu-img info, Max Reitz, 2016/07/19
- Re: [Qemu-devel] [PULL 0/4] Block patches, Peter Maydell, 2016/07/20