diff options
| author | Peter Maydell <peter.maydell@linaro.org> | 2019-03-21 12:09:38 +0000 |
|---|---|---|
| committer | Peter Maydell <peter.maydell@linaro.org> | 2019-03-21 12:09:38 +0000 |
| commit | 9b198f935a7a78ca4962f9ad62bf5f5a9910e6b6 (patch) | |
| tree | 1a621d5a2facf747c1a4749bb308a435096036d1 | |
| parent | 6532dcebb6160f94b6b278af5e73784164c669f6 (diff) | |
| parent | 5993e3be1d9ff5395c0b753c638760bff4a8360f (diff) | |
| download | qemu-9b198f935a7a78ca4962f9ad62bf5f5a9910e6b6.zip qemu-9b198f935a7a78ca4962f9ad62bf5f5a9910e6b6.tar.gz qemu-9b198f935a7a78ca4962f9ad62bf5f5a9910e6b6.tar.bz2 | |
Merge remote-tracking branch 'remotes/berrange/tags/qcrypto-next-pull-request' into staging
Avoid struct packing warnings with gcc9
# gpg: Signature made Thu 21 Mar 2019 11:55:03 GMT
# gpg: using RSA key BE86EBB415104FDF
# gpg: Good signature from "Daniel P. Berrange <dan@berrange.com>" [full]
# gpg: aka "Daniel P. Berrange <berrange@redhat.com>" [full]
# Primary key fingerprint: DAF3 A6FD B26B 6291 2D0E 8E3F BE86 EBB4 1510 4FDF
* remotes/berrange/tags/qcrypto-next-pull-request:
crypto/block: remove redundant struct packing to fix build with gcc 9
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
| -rw-r--r-- | crypto/block-luks.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/crypto/block-luks.c b/crypto/block-luks.c index 6bac79c..5a69b3c 100644 --- a/crypto/block-luks.c +++ b/crypto/block-luks.c @@ -146,7 +146,7 @@ struct QCryptoBlockLUKSKeySlot { uint32_t key_offset; /* number of anti-forensic stripes */ uint32_t stripes; -} QEMU_PACKED; +}; QEMU_BUILD_BUG_ON(sizeof(struct QCryptoBlockLUKSKeySlot) != 48); @@ -191,7 +191,7 @@ struct QCryptoBlockLUKSHeader { /* key slots */ QCryptoBlockLUKSKeySlot key_slots[QCRYPTO_BLOCK_LUKS_NUM_KEY_SLOTS]; -} QEMU_PACKED; +}; QEMU_BUILD_BUG_ON(sizeof(struct QCryptoBlockLUKSHeader) != 592); |