diff options
| author | Peter Maydell <peter.maydell@linaro.org> | 2018-06-28 16:28:22 +0100 |
|---|---|---|
| committer | Peter Maydell <peter.maydell@linaro.org> | 2018-06-28 16:28:22 +0100 |
| commit | 7106a87d96c58a2ad7a4669781e58b22a3081004 (patch) | |
| tree | 4c8993ddea1c98a759470b35374f18d7827fec6e /target/i386/kvm.c | |
| parent | 4a83bf2f339d4b63ecd5ef48b9816c3b7ee24553 (diff) | |
| parent | ed6e2161715c527330f936d44af4c547f25f687e (diff) | |
| download | qemu-7106a87d96c58a2ad7a4669781e58b22a3081004.zip qemu-7106a87d96c58a2ad7a4669781e58b22a3081004.tar.gz qemu-7106a87d96c58a2ad7a4669781e58b22a3081004.tar.bz2 | |
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 'target/i386/kvm.c')
| -rw-r--r-- | target/i386/kvm.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/target/i386/kvm.c b/target/i386/kvm.c index 2d174f3..5116a8a 100644 --- a/target/i386/kvm.c +++ b/target/i386/kvm.c @@ -1533,7 +1533,7 @@ static int kvm_put_fpu(X86CPU *cpu) #define XSAVE_PKRU 672 #define XSAVE_BYTE_OFFSET(word_offset) \ - ((word_offset) * sizeof(((struct kvm_xsave *)0)->region[0])) + ((word_offset) * sizeof_field(struct kvm_xsave, region[0])) #define ASSERT_OFFSET(word_offset, field) \ QEMU_BUILD_BUG_ON(XSAVE_BYTE_OFFSET(word_offset) != \ |