-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1
Il 08/09/2014 12:56, Stefan Hajnoczi ha scritto:
> On Tue, Sep 02, 2014 at 11:42:14AM +0800, Fam Zheng wrote:
>> v2: Import virtio_vring.h.
>>
>> Fam Zheng (2):
>> virtio: Import virtio_vring.h
>> block: Always compile virtio-blk dataplane
>>
>> configure | 21 +----
>> hw/block/Makefile.objs | 2 +-
>> hw/block/virtio-blk.c | 20 +----
>> hw/net/vhost_net.c | 2 +-
>> hw/virtio/Makefile.objs | 2 +-
>> include/hw/virtio/dataplane/vring.h | 2 +-
>> include/hw/virtio/virtio-blk.h | 2 -
>> include/hw/virtio/virtio_ring.h | 167
>> ++++++++++++++++++++++++++++++++++++
>> linux-headers/linux/vhost.h | 2 +-
>> 9 files changed, 176 insertions(+), 44 deletions(-)
>> create mode 100644 include/hw/virtio/virtio_ring.h
>
> This breaks win32 builds:
>
> /home/petmay01/linaro/qemu-for-merges/hw/virtio/dataplane/vring.c: In
> function ‘get_desc’:
> /home/petmay01/linaro/qemu-for-merges/hw/virtio/dataplane/vring.c:184: error:
> ‘ENOBUFS’ undeclared (first use in this function)
> /home/petmay01/linaro/qemu-for-merges/hw/virtio/dataplane/vring.c:184: error:
> (Each undeclared identifier is reported only once
> /home/petmay01/linaro/qemu-for-merges/hw/virtio/dataplane/vring.c:184: error:
> for each function it appears in.)
>
> Dropped from block pull request.
>
> Please fix if you want to get the series merged.
Could you please squash in this?
diff --git a/hw/virtio/dataplane/vring.c b/hw/virtio/dataplane/vring.c
index d6026c2..f384619 100644
- --- a/hw/virtio/dataplane/vring.c
+++ b/hw/virtio/dataplane/vring.c
@@ -187,7 +187,7 @@ static int get_desc(Vring *vring, VirtQueueElement *elem,
/* Stop for now if there are not enough iovecs available. */
if (*num >= VIRTQUEUE_MAX_SIZE) {
- - return -ENOBUFS;
+ return -EINVAL;
}
/* TODO handle non-contiguous memory across region boundaries */
Thanks,
Paolo
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v2
iQIcBAEBAgAGBQJUDY2dAAoJEBvWZb6bTYbyCVYQAJc5OihhQIvhiCYUG7HjPxgE
CpKr+faIxbKrl5gP6+bhlmqz0T9TLA/+1QTRumIfufIRBACXkZrN5Czc6US/ZzqR
Qhvmi/J6Ux3CuEomE1U4LXqXntbtxOUgP5z1+l00QjBrdEmrgaxC+FvV/1oVkgyw
mZ+ENhnoAs9Os530B5CudAiTqlFdFUUaWnLqML3GA7Zo2ZxzuIjNxIaU7RD+uYSE
GIrvmycf9icHkOQU71DxH8c6Fgc7kUV43xBpBL/BOpqAeu/9ddeclVubxgWKoIKu
a0kq9MEtAbO/p74oGeIduIq63p9EoaZIXwNkehjt0N6KeODaUfby7blnbv0O9z09
WqLfIGlLRzFsz2kqw9CiWFrP2D/nGjmO1xKVnS0dG8fxol9x+mTFvCCyClCAbO41
UZyF9CRpvltfZFrzskJ805KgA4Lp61H05kw66VE1NFJba29Q7JwQ8vUkhSt38IE0
4PlKbleCX65tpPM8y4agNAO8SecnMOtEoS44Xd2tuG4bf8Sgu95DfhHfIjSoVg19
5N0XFZT7GW7PPejWSJzPtdE2UlPI6p4OzHPzopxiRd+m76J8+wZIfD6g4dT4i/n+
cDfkBYfW1o5OLzdHyK67s3c+PgkAXrOKAQqkRPemNmHoQnfkLq/VJAm+xv+xbYT6
o24thB4ZcNs1yxWy6c6A
=RBgu
-----END PGP SIGNATURE-----
