diff options
| author | Peter Maydell <peter.maydell@linaro.org> | 2015-11-18 17:07:24 +0000 |
|---|---|---|
| committer | Peter Maydell <peter.maydell@linaro.org> | 2015-11-18 17:07:24 +0000 |
| commit | 8f280309030331a912fd8924c129d8bd59e1bdc7 (patch) | |
| tree | 782e835f9f3cc152c3a868746108df551e38f62a /hw | |
| parent | 7199c89d8c6bbd0eda2cadb0d3fc7149934202bf (diff) | |
| parent | ca4fa82fe66076284f702adcfe7c319ebbf909ec (diff) | |
| download | qemu-8f280309030331a912fd8924c129d8bd59e1bdc7.tar.gz qemu-8f280309030331a912fd8924c129d8bd59e1bdc7.tar.bz2 qemu-8f280309030331a912fd8924c129d8bd59e1bdc7.zip | |
Merge remote-tracking branch 'remotes/kevin/tags/for-upstream' into staging
Block layer patches
# gpg: Signature made Wed 18 Nov 2015 15:28:32 GMT using RSA key ID C88F2FD6
# gpg: Good signature from "Kevin Wolf <kwolf@redhat.com>"
* remotes/kevin/tags/for-upstream:
block: Call external_snapshot_clean after blockdev-snapshot
blockdev: Add missing bdrv_unref() in drive-backup
iotests: fix race in 030
nand: fix address overflow
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Diffstat (limited to 'hw')
| -rw-r--r-- | hw/block/nand.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/hw/block/nand.c b/hw/block/nand.c index 61d2cec032..a68266f887 100644 --- a/hw/block/nand.c +++ b/hw/block/nand.c @@ -522,8 +522,8 @@ void nand_setio(DeviceState *dev, uint32_t value) if (s->ale) { unsigned int shift = s->addrlen * 8; - unsigned int mask = ~(0xff << shift); - unsigned int v = value << shift; + uint64_t mask = ~(0xffull << shift); + uint64_t v = (uint64_t)value << shift; s->addr = (s->addr & mask) | v; s->addrlen ++; |