| Message ID | 20200504115758.283914-1-laurent@vivier.eu |
|---|---|
| State | New |
| Headers | show |
On Mon, 4 May 2020 at 13:05, Laurent Vivier <laurent@vivier.eu> wrote: > > The following changes since commit 2ef486e76d64436be90f7359a3071fb2a56ce835: > > Merge remote-tracking branch 'remotes/marcel/tags/rdma-pull-request' into s= > taging (2020-05-03 14:12:56 +0100) > > are available in the Git repository at: > > git://github.com/vivier/qemu.git tags/trivial-branch-for-5.1-pull-request > > for you to fetch changes up to 4341a0106781043a708c061b676312e5bb5d4488: > > hw/timer/pxa2xx_timer: Add assertion to silent static analyzer warning (202= > 0-05-04 12:06:21 +0200) > > ---------------------------------------------------------------- > trivial patches (20200504) > > Silent static analyzer warning > Remove dead assignments > Support -chardev serial on macOS > Update MAINTAINERS > Some cosmetic changes Compile failure, OSX: /Users/pm215/src/qemu-for-merges/block/file-posix.c:1620:9: error: unused variable 'ret' [-Werror,-Wunused-variable] int ret; ^ Compile failure, aarch32 (but probably the result of whatever crypto options/dependent libraries are on that setup): In file included from /home/peter.maydell/qemu/crypto/cipher.c:157:0: /home/peter.maydell/qemu/crypto/cipher-builtin.c: In function 'qcrypto_cipher_aes_xts_encrypt': /home/peter.maydell/qemu/crypto/cipher-builtin.c:136:36: error: passing argument 1 of 'qcrypto_cipher_aes_ecb_encrypt' discards 'const' qualifier from pointer target type [-Werror=discarded-qualifiers] qcrypto_cipher_aes_ecb_encrypt(&aesctx->enc, src, dst, length); ^ /home/peter.maydell/qemu/crypto/cipher-builtin.c:77:13: note: expected 'AES_KEY * {aka struct aes_key_st *}' but argument is of type 'const AES_KEY * {aka const struct aes_key_st *}' static void qcrypto_cipher_aes_ecb_encrypt(AES_KEY *key, ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ /home/peter.maydell/qemu/crypto/cipher-builtin.c: In function 'qcrypto_cipher_aes_xts_decrypt': /home/peter.maydell/qemu/crypto/cipher-builtin.c:147:36: error: passing argument 1 of 'qcrypto_cipher_aes_ecb_decrypt' discards 'const' qualifier from pointer target type [-Werror=discarded-qualifiers] qcrypto_cipher_aes_ecb_decrypt(&aesctx->dec, src, dst, length); ^ /home/peter.maydell/qemu/crypto/cipher-builtin.c:103:13: note: expected 'AES_KEY * {aka struct aes_key_st *}' but argument is of type 'const AES_KEY * {aka const struct aes_key_st *}' static void qcrypto_cipher_aes_ecb_decrypt(AES_KEY *key, ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ thanks -- PMM
Le 04/05/2020 à 14:17, Peter Maydell a écrit : > On Mon, 4 May 2020 at 13:05, Laurent Vivier <laurent@vivier.eu> wrote: >> >> The following changes since commit 2ef486e76d64436be90f7359a3071fb2a56ce835: >> >> Merge remote-tracking branch 'remotes/marcel/tags/rdma-pull-request' into s= >> taging (2020-05-03 14:12:56 +0100) >> >> are available in the Git repository at: >> >> git://github.com/vivier/qemu.git tags/trivial-branch-for-5.1-pull-request >> >> for you to fetch changes up to 4341a0106781043a708c061b676312e5bb5d4488: >> >> hw/timer/pxa2xx_timer: Add assertion to silent static analyzer warning (202= >> 0-05-04 12:06:21 +0200) >> >> ---------------------------------------------------------------- >> trivial patches (20200504) >> >> Silent static analyzer warning >> Remove dead assignments >> Support -chardev serial on macOS >> Update MAINTAINERS >> Some cosmetic changes > > > Compile failure, OSX: > /Users/pm215/src/qemu-for-merges/block/file-posix.c:1620:9: error: > unused variable 'ret' [-Werror,-Wunused-variable] > int ret; > ^ > > Compile failure, aarch32 (but probably the result of whatever > crypto options/dependent libraries are on that setup): > > In file included from /home/peter.maydell/qemu/crypto/cipher.c:157:0: > /home/peter.maydell/qemu/crypto/cipher-builtin.c: In function > 'qcrypto_cipher_aes_xts_encrypt': > /home/peter.maydell/qemu/crypto/cipher-builtin.c:136:36: error: > passing argument 1 of 'qcrypto_cipher_aes_ecb_encrypt' discards > 'const' qualifier from pointer target type > [-Werror=discarded-qualifiers] > qcrypto_cipher_aes_ecb_encrypt(&aesctx->enc, src, dst, length); > ^ > /home/peter.maydell/qemu/crypto/cipher-builtin.c:77:13: note: expected > 'AES_KEY * {aka struct aes_key_st *}' but argument is of type 'const > AES_KEY * {aka const struct aes_key_st *}' > static void qcrypto_cipher_aes_ecb_encrypt(AES_KEY *key, > ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ > /home/peter.maydell/qemu/crypto/cipher-builtin.c: In function > 'qcrypto_cipher_aes_xts_decrypt': > /home/peter.maydell/qemu/crypto/cipher-builtin.c:147:36: error: > passing argument 1 of 'qcrypto_cipher_aes_ecb_decrypt' discards > 'const' qualifier from pointer target type > [-Werror=discarded-qualifiers] > qcrypto_cipher_aes_ecb_decrypt(&aesctx->dec, src, dst, length); > ^ > /home/peter.maydell/qemu/crypto/cipher-builtin.c:103:13: note: > expected 'AES_KEY * {aka struct aes_key_st *}' but argument is of type > 'const AES_KEY * {aka const struct aes_key_st *}' > static void qcrypto_cipher_aes_ecb_decrypt(AES_KEY *key, > ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ Thank you. Next time I will wait end of travis-ci job... Laurent
On Mon, May 04, 2020 at 01:17:19PM +0100, Peter Maydell wrote: > On Mon, 4 May 2020 at 13:05, Laurent Vivier <laurent@vivier.eu> wrote: > > > > The following changes since commit 2ef486e76d64436be90f7359a3071fb2a56ce835: > > > > Merge remote-tracking branch 'remotes/marcel/tags/rdma-pull-request' into s= > > taging (2020-05-03 14:12:56 +0100) > > > > are available in the Git repository at: > > > > git://github.com/vivier/qemu.git tags/trivial-branch-for-5.1-pull-request > > > > for you to fetch changes up to 4341a0106781043a708c061b676312e5bb5d4488: > > > > hw/timer/pxa2xx_timer: Add assertion to silent static analyzer warning (202= > > 0-05-04 12:06:21 +0200) > > > > ---------------------------------------------------------------- > > trivial patches (20200504) > > > > Silent static analyzer warning > > Remove dead assignments > > Support -chardev serial on macOS > > Update MAINTAINERS > > Some cosmetic changes > > > Compile failure, OSX: > /Users/pm215/src/qemu-for-merges/block/file-posix.c:1620:9: error: > unused variable 'ret' [-Werror,-Wunused-variable] > int ret; > ^ > > Compile failure, aarch32 (but probably the result of whatever > crypto options/dependent libraries are on that setup): > > In file included from /home/peter.maydell/qemu/crypto/cipher.c:157:0: > /home/peter.maydell/qemu/crypto/cipher-builtin.c: In function > 'qcrypto_cipher_aes_xts_encrypt': > /home/peter.maydell/qemu/crypto/cipher-builtin.c:136:36: error: > passing argument 1 of 'qcrypto_cipher_aes_ecb_encrypt' discards > 'const' qualifier from pointer target type > [-Werror=discarded-qualifiers] > qcrypto_cipher_aes_ecb_encrypt(&aesctx->enc, src, dst, length); > ^ > /home/peter.maydell/qemu/crypto/cipher-builtin.c:77:13: note: expected > 'AES_KEY * {aka struct aes_key_st *}' but argument is of type 'const > AES_KEY * {aka const struct aes_key_st *}' > static void qcrypto_cipher_aes_ecb_encrypt(AES_KEY *key, > ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ > /home/peter.maydell/qemu/crypto/cipher-builtin.c: In function > 'qcrypto_cipher_aes_xts_decrypt': > /home/peter.maydell/qemu/crypto/cipher-builtin.c:147:36: error: > passing argument 1 of 'qcrypto_cipher_aes_ecb_decrypt' discards > 'const' qualifier from pointer target type > [-Werror=discarded-qualifiers] > qcrypto_cipher_aes_ecb_decrypt(&aesctx->dec, src, dst, length); > ^ > /home/peter.maydell/qemu/crypto/cipher-builtin.c:103:13: note: > expected 'AES_KEY * {aka struct aes_key_st *}' but argument is of type > 'const AES_KEY * {aka const struct aes_key_st *}' > static void qcrypto_cipher_aes_ecb_decrypt(AES_KEY *key, > ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ This failure shows that patch 4 is wrong. The cast is not redundant, it is explicitly required in order to discard 'const'. Please just drop patch 4. Regards, Daniel
On Mon, 4 May 2020 at 13:17, Peter Maydell <peter.maydell@linaro.org> wrote: > > On Mon, 4 May 2020 at 13:05, Laurent Vivier <laurent@vivier.eu> wrote: > > > > The following changes since commit 2ef486e76d64436be90f7359a3071fb2a56ce835: > > > > Merge remote-tracking branch 'remotes/marcel/tags/rdma-pull-request' into s= > > taging (2020-05-03 14:12:56 +0100) > > > > are available in the Git repository at: > > > > git://github.com/vivier/qemu.git tags/trivial-branch-for-5.1-pull-request > > > > for you to fetch changes up to 4341a0106781043a708c061b676312e5bb5d4488: > > > > hw/timer/pxa2xx_timer: Add assertion to silent static analyzer warning (202= > > 0-05-04 12:06:21 +0200) > > > > ---------------------------------------------------------------- > > trivial patches (20200504) > > > > Silent static analyzer warning > > Remove dead assignments > > Support -chardev serial on macOS > > Update MAINTAINERS > > Some cosmetic changes > > > Compile failure, OSX: > /Users/pm215/src/qemu-for-merges/block/file-posix.c:1620:9: error: > unused variable 'ret' [-Werror,-Wunused-variable] > int ret; > ^ > This one also shows up on FreeBSD and OpenBSD (and maybe NetBSD, that result hasn't come back yet). thanks -- PMM
Le 04/05/2020 à 14:34, Peter Maydell a écrit : > On Mon, 4 May 2020 at 13:17, Peter Maydell <peter.maydell@linaro.org> wrote: >> >> On Mon, 4 May 2020 at 13:05, Laurent Vivier <laurent@vivier.eu> wrote: >>> >>> The following changes since commit 2ef486e76d64436be90f7359a3071fb2a56ce835: >>> >>> Merge remote-tracking branch 'remotes/marcel/tags/rdma-pull-request' into s= >>> taging (2020-05-03 14:12:56 +0100) >>> >>> are available in the Git repository at: >>> >>> git://github.com/vivier/qemu.git tags/trivial-branch-for-5.1-pull-request >>> >>> for you to fetch changes up to 4341a0106781043a708c061b676312e5bb5d4488: >>> >>> hw/timer/pxa2xx_timer: Add assertion to silent static analyzer warning (202= >>> 0-05-04 12:06:21 +0200) >>> >>> ---------------------------------------------------------------- >>> trivial patches (20200504) >>> >>> Silent static analyzer warning >>> Remove dead assignments >>> Support -chardev serial on macOS >>> Update MAINTAINERS >>> Some cosmetic changes >> >> >> Compile failure, OSX: >> /Users/pm215/src/qemu-for-merges/block/file-posix.c:1620:9: error: >> unused variable 'ret' [-Werror,-Wunused-variable] >> int ret; >> ^ >> > > This one also shows up on FreeBSD and OpenBSD (and maybe NetBSD, that > result hasn't come back yet). I'm going to update PATCH 11 to move the "int ret" inside the #ifdef. Thanks, Laurent
The following changes since commit 2ef486e76d64436be90f7359a3071fb2a56ce835: Merge remote-tracking branch 'remotes/marcel/tags/rdma-pull-request' into s= taging (2020-05-03 14:12:56 +0100) are available in the Git repository at: git://github.com/vivier/qemu.git tags/trivial-branch-for-5.1-pull-request for you to fetch changes up to 4341a0106781043a708c061b676312e5bb5d4488: hw/timer/pxa2xx_timer: Add assertion to silent static analyzer warning (202= 0-05-04 12:06:21 +0200) ---------------------------------------------------------------- trivial patches (20200504) Silent static analyzer warning Remove dead assignments Support -chardev serial on macOS Update MAINTAINERS Some cosmetic changes ---------------------------------------------------------------- Chen Qun (4): scsi/esp-pci: add g_assert() for fix clang analyzer warning in esp_pci_io_write() display/blizzard: use extract16() for fix clang analyzer warning in blizzard_draw_line16_32() timer/exynos4210_mct: Remove redundant statement in exynos4210_mct_write() crypto: Redundant type conversion for AES_KEY pointer Mikhail Gusarov (1): chardev: Add macOS to list of OSes that support -chardev serial Peter Maydell (1): elf_ops: Don't try to g_mapped_file_unref(NULL) Philippe Mathieu-Daud=C3=A9 (11): MAINTAINERS: Mark the LatticeMico32 target as orphan MAINTAINERS: Update Keith Busch's email address block: Avoid dead assignment blockdev: Remove dead assignment hw/i2c/pm_smbus: Remove dead assignment hw/input/adb-kbd: Remove dead assignment hw/ide/sii3112: Remove dead assignment hw/isa/i82378: Remove dead assignment hw/gpio/aspeed_gpio: Remove dead assignment hw/timer/stm32f2xx_timer: Remove dead assignment hw/timer/pxa2xx_timer: Add assertion to silent static analyzer warning Simran Singhal (1): Compress lines for immediate return Wainer dos Santos Moschetta (2): hw/mem/pc-dimm: Print slot number on error at pc_dimm_pre_plug() hw/mem/pc-dimm: Fix line over 80 characters warning MAINTAINERS | 14 +++++++------- block.c | 2 +- block/file-posix.c | 3 +-- block/nfs.c | 3 +-- block/nvme.c | 4 +--- block/vhdx.c | 3 +-- blockdev.c | 2 +- chardev/char-serial.c | 2 +- crypto/cipher-builtin.c | 6 ++---- hw/audio/ac97.c | 4 +--- hw/audio/adlib.c | 5 +---- hw/display/blizzard.c | 10 ++++------ hw/display/cirrus_vga.c | 4 +--- hw/gpio/aspeed_gpio.c | 2 +- hw/i2c/pm_smbus.c | 1 - hw/ide/sii3112.c | 5 +++-- hw/input/adb-kbd.c | 6 +----- hw/isa/i82378.c | 8 ++++---- hw/mem/pc-dimm.c | 7 ++++--- hw/scsi/esp-pci.c | 1 + hw/timer/exynos4210_mct.c | 4 ---- hw/timer/pxa2xx_timer.c | 1 + hw/timer/stm32f2xx_timer.c | 1 - include/hw/elf_ops.h | 4 +++- include/qemu/osdep.h | 2 +- migration/ram.c | 4 +--- ui/gtk.c | 3 +-- util/qemu-sockets.c | 5 +---- 28 files changed, 45 insertions(+), 71 deletions(-) --=20 2.26.2