From: Paolo Bonzini <pbonzini@redhat.com>
Date: Wed, 30 Sep 2015 17:21:10 +0000 (+0200)
Subject: megasas: fix megasas_get_sata_addr
X-Git-Url: http://git.maquefel.me/?a=commitdiff_plain;h=8ef2eb8d2cad7400236d6b2c152bdb5506761b4d;p=qemu.git

megasas: fix megasas_get_sata_addr

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 <pbonzini@redhat.com>
---

diff --git a/hw/scsi/megasas.c b/hw/scsi/megasas.c
index a04369c5ad..dcd724e6a5 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);
 }
 
 /*