Commit 9b198f93 authored by Peter Maydell's avatar Peter Maydell
Browse files

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: default avatarPeter Maydell <peter.maydell@linaro.org>
parents 6532dceb 5993e3be

crypto/block-luks.c

+2 −2
Original line number Diff line number Diff line
@@ -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);