[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PULL 06/11] hw/scsi/lsi53c895a: Use deposit32 rather than
From: |
Paolo Bonzini |
Subject: |
[Qemu-devel] [PULL 06/11] hw/scsi/lsi53c895a: Use deposit32 rather than handcoded shift/mask |
Date: |
Thu, 12 Sep 2013 13:17:09 +0200 |
From: Peter Maydell <address@hidden>
Use deposit32() rather than handcoded shifts/masks to update the
scratch registers. This is cleaner and incidentally avoids a clang
sanitizer complaint ("runtime error: left shift of 255 by 24 places
cannot be represented in type 'int'").
Signed-off-by: Peter Maydell <address@hidden>
Signed-off-by: Paolo Bonzini <address@hidden>
---
hw/scsi/lsi53c895a.c | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)
diff --git a/hw/scsi/lsi53c895a.c b/hw/scsi/lsi53c895a.c
index a26b20b..5affc82 100644
--- a/hw/scsi/lsi53c895a.c
+++ b/hw/scsi/lsi53c895a.c
@@ -1870,8 +1870,7 @@ static void lsi_reg_writeb(LSIState *s, int offset,
uint8_t val)
int shift;
n = (offset - 0x58) >> 2;
shift = (offset & 3) * 8;
- s->scratch[n] &= ~(0xff << shift);
- s->scratch[n] |= (val & 0xff) << shift;
+ s->scratch[n] = deposit32(s->scratch[n], shift, 8, val);
} else {
BADF("Unhandled writeb 0x%x = 0x%x\n", offset, val);
}
--
1.8.3.1
- [Qemu-devel] [PULL 00/11] SCSI patches for 2013-09-11, Paolo Bonzini, 2013/09/12
- [Qemu-devel] [PULL 02/11] spapr-vscsi: add task management, Paolo Bonzini, 2013/09/12
- [Qemu-devel] [PULL 04/11] scsi: Fix scsi_bus_legacy_add_drive() scsi-generic with serial, Paolo Bonzini, 2013/09/12
- [Qemu-devel] [PULL 05/11] hw/scsi/lsi53c895a: Use sextract32 for sign-extension, Paolo Bonzini, 2013/09/12
- [Qemu-devel] [PULL 01/11] scsi: prefer UUID to VM name for the initiator name, Paolo Bonzini, 2013/09/12
- [Qemu-devel] [PULL 06/11] hw/scsi/lsi53c895a: Use deposit32 rather than handcoded shift/mask,
Paolo Bonzini <=
- [Qemu-devel] [PULL 03/11] virtio-scsi: Make type virtio-scsi-common abstract, Paolo Bonzini, 2013/09/12
- [Qemu-devel] [PULL 07/11] iscsi: add logical block provisioning information to iscsilun, Paolo Bonzini, 2013/09/12
- [Qemu-devel] [PULL 08/11] iscsi: add .bdrv_get_block_status, Paolo Bonzini, 2013/09/12
[Qemu-devel] [PULL 09/11] iscsi: split discard requests in multiple parts, Paolo Bonzini, 2013/09/12
[Qemu-devel] [PULL 11/11] spapr-vscsi: Report error on unsupported MAD requests, Paolo Bonzini, 2013/09/12
[Qemu-devel] [PULL 10/11] spapr-vscsi: Adding VSCSI capabilities, Paolo Bonzini, 2013/09/12