From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:36843) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ZhL4z-0003dS-EJ for qemu-devel@nongnu.org; Wed, 30 Sep 2015 13:22:10 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1ZhL4u-0007EK-Iu for qemu-devel@nongnu.org; Wed, 30 Sep 2015 13:22:09 -0400 Received: from mx1.redhat.com ([209.132.183.28]:37263) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ZhL4u-0007EB-De for qemu-devel@nongnu.org; Wed, 30 Sep 2015 13:22:04 -0400 From: Paolo Bonzini Date: Wed, 30 Sep 2015 19:22:01 +0200 Message-Id: <1443633721-28162-1-git-send-email-pbonzini@redhat.com> Subject: [Qemu-devel] [PATCH v2] megasas: fix megasas_get_sata_addr List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: hare@suse.de There are two bugs here. First, the 16-bit id loses the high 8 bits when shifted left by 24. Second, the address must be combined with an "or" or we just get zero. Signed-off-by: Paolo Bonzini --- hw/scsi/megasas.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/hw/scsi/megasas.c b/hw/scsi/megasas.c index a04369c..dcd724e 100644 --- a/hw/scsi/megasas.c +++ b/hw/scsi/megasas.c @@ -431,7 +431,7 @@ static uint64_t megasas_fw_time(void) static uint64_t megasas_get_sata_addr(uint16_t id) { uint64_t addr = (0x1221ULL << 48); - return addr & (id << 24); + return addr | ((uint64_t)id << 24); } /* -- 2.5.0