qemu-commits
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

[Qemu-commits] [qemu/qemu] 5993e3: crypto/block: remove redundant struct


From: Peter Maydell
Subject: [Qemu-commits] [qemu/qemu] 5993e3: crypto/block: remove redundant struct packing to f...
Date: Thu, 21 Mar 2019 06:01:52 -0700

  Branch: refs/heads/master
  Home:   https://github.com/qemu/qemu
  Commit: 5993e3be1d9ff5395c0b753c638760bff4a8360f
      
https://github.com/qemu/qemu/commit/5993e3be1d9ff5395c0b753c638760bff4a8360f
  Author: Greg Kurz <address@hidden>
  Date:   2019-03-21 (Thu, 21 Mar 2019)

  Changed paths:
    M crypto/block-luks.c

  Log Message:
  -----------
  crypto/block: remove redundant struct packing to fix build with gcc 9

Build fails with gcc 9:

crypto/block-luks.c:689:18: error: taking address of packed member of ‘struct 
QCryptoBlockLUKSHeader’ may result in an unaligned pointer value 
[-Werror=address-of-packed-member]
  689 |     be32_to_cpus(&luks->header.payload_offset);
      |                  ^~~~~~~~~~~~~~~~~~~~~~~~~~~~
crypto/block-luks.c:690:18: error: taking address of packed member of ‘struct 
QCryptoBlockLUKSHeader’ may result in an unaligned pointer value 
[-Werror=address-of-packed-member]
  690 |     be32_to_cpus(&luks->header.key_bytes);
      |                  ^~~~~~~~~~~~~~~~~~~~~~~
crypto/block-luks.c:691:18: error: taking address of packed member of ‘struct 
QCryptoBlockLUKSHeader’ may result in an unaligned pointer value 
[-Werror=address-of-packed-member]
  691 |     be32_to_cpus(&luks->header.master_key_iterations);
      |                  ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~

... a bunch of similar errors...

crypto/block-luks.c:1288:22: error: taking address of packed member of ‘struct 
QCryptoBlockLUKSKeySlot’ may result in an unaligned pointer value 
[-Werror=address-of-packed-member]
 1288 |         be32_to_cpus(&luks->header.key_slots[i].stripes);
      |                      ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
cc1: all warnings being treated as errors

All members of the QCryptoBlockLUKSKeySlot and QCryptoBlockLUKSHeader are
naturally aligned and we already check at build time there isn't any
unwanted padding. Drop the QEMU_PACKED attribute.

Reviewed-by: Eric Blake <address@hidden>
Signed-off-by: Greg Kurz <address@hidden>
Signed-off-by: Daniel P. Berrangé <address@hidden>


  Commit: 9b198f935a7a78ca4962f9ad62bf5f5a9910e6b6
      
https://github.com/qemu/qemu/commit/9b198f935a7a78ca4962f9ad62bf5f5a9910e6b6
  Author: Peter Maydell <address@hidden>
  Date:   2019-03-21 (Thu, 21 Mar 2019)

  Changed paths:
    M crypto/block-luks.c

  Log Message:
  -----------
  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 <address@hidden>" [full]
# gpg:                 aka "Daniel P. Berrange <address@hidden>" [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 <address@hidden>


Compare: https://github.com/qemu/qemu/compare/6532dcebb616...9b198f935a7a



reply via email to

[Prev in Thread] Current Thread [Next in Thread]