diff options
| author | Peter Maydell | 2018-06-28 17:28:22 +0200 |
|---|---|---|
| committer | Peter Maydell | 2018-06-28 17:28:22 +0200 |
| commit | 7106a87d96c58a2ad7a4669781e58b22a3081004 (patch) | |
| tree | 4c8993ddea1c98a759470b35374f18d7827fec6e /hw/net/virtio-net.c | |
| parent | Merge remote-tracking branch 'remotes/juanquintela/tags/migration/20180627' i... (diff) | |
| parent | linux-aio: properly bubble up errors from initialization (diff) | |
| download | qemu-7106a87d96c58a2ad7a4669781e58b22a3081004.tar.gz qemu-7106a87d96c58a2ad7a4669781e58b22a3081004.tar.xz qemu-7106a87d96c58a2ad7a4669781e58b22a3081004.zip | |
Merge remote-tracking branch 'remotes/stefanha/tags/block-pull-request' into staging
Pull request
* Gracefully handle Linux AIO init failure
# gpg: Signature made Wed 27 Jun 2018 15:48:28 BST
# gpg: using RSA key 9CA4ABB381AB73C8
# gpg: Good signature from "Stefan Hajnoczi <stefanha@redhat.com>"
# gpg: aka "Stefan Hajnoczi <stefanha@gmail.com>"
# Primary key fingerprint: 8695 A8BF D3F9 7CDA AC35 775A 9CA4 ABB3 81AB 73C8
* remotes/stefanha/tags/block-pull-request:
linux-aio: properly bubble up errors from initialization
compiler: add a sizeof_field() macro
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Diffstat (limited to 'hw/net/virtio-net.c')
| -rw-r--r-- | hw/net/virtio-net.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/hw/net/virtio-net.c b/hw/net/virtio-net.c index 90502fca7c..f154756e85 100644 --- a/hw/net/virtio-net.c +++ b/hw/net/virtio-net.c @@ -46,7 +46,7 @@ * 'container'. */ #define endof(container, field) \ - (offsetof(container, field) + sizeof(((container *)0)->field)) + (offsetof(container, field) + sizeof_field(container, field)) typedef struct VirtIOFeature { uint64_t flags; |