From mboxrd@z Thu Jan  1 00:00:00 1970
Received: from eggs.gnu.org ([208.118.235.92]:51821)
	by lists.gnu.org with esmtp (Exim 4.71)
	(envelope-from <hare@pentland.suse.de>) id 1TXvoN-0004h8-FO
	for qemu-devel@nongnu.org; Mon, 12 Nov 2012 10:20:34 -0500
Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71)
	(envelope-from <hare@pentland.suse.de>) id 1TXvoK-0005lt-Cp
	for qemu-devel@nongnu.org; Mon, 12 Nov 2012 10:20:31 -0500
Received: from nat.nue.novell.com ([195.135.221.2]:55646 helo=pentland.suse.de)
	by eggs.gnu.org with esmtp (Exim 4.71)
	(envelope-from <hare@pentland.suse.de>) id 1TXvoK-0005ln-6G
	for qemu-devel@nongnu.org; Mon, 12 Nov 2012 10:20:28 -0500
From: Hannes Reinecke <hare@suse.de>
Date: Mon, 12 Nov 2012 15:42:42 +0100
Message-Id: <1352731362-19524-1-git-send-email-hare@suse.de>
Subject: [Qemu-devel] [PATCH] megasas: Correct target/lun mapping
List-Id: <qemu-devel.nongnu.org>
List-Unsubscribe: <https://lists.nongnu.org/mailman/options/qemu-devel>,
	<mailto:qemu-devel-request@nongnu.org?subject=unsubscribe>
List-Archive: <http://lists.nongnu.org/archive/html/qemu-devel>
List-Post: <mailto:qemu-devel@nongnu.org>
List-Help: <mailto:qemu-devel-request@nongnu.org?subject=help>
List-Subscribe: <https://lists.nongnu.org/mailman/listinfo/qemu-devel>,
	<mailto:qemu-devel-request@nongnu.org?subject=subscribe>
To: qemu-devel@nongnu.org
Cc: Paolo Bonzini <pbonzini@redhat.com>, Hannes Reinecke <hare@suse.de>, Gerd Hofmann <kraxel@redhat.com>

The structure to reference a logical drive has an unused field,
which can be used to carry the lun ID. This enabled seabios to
establish the proper target/LUN mapping.

Signed-off-by: Hannes Reinecke <hare@suse.de>
Cc: Paolo Bonzini <pbonzini@redhat.com>
Cc: Gerd Hofmann <kraxel@redhat.com>

diff --git a/hw/megasas.c b/hw/megasas.c
index 7a2036e..395feb3 100644
--- a/hw/megasas.c
+++ b/hw/megasas.c
@@ -1080,6 +1080,7 @@ static int megasas_dcmd_ld_get_list(MegasasState *s, MegasasCmd *cmd)
         /* Logical device size is in blocks */
         bdrv_get_geometry(conf->bs, &ld_size);
         info.ld_list[num_ld_disks].ld.v.target_id = sdev->id;
+        info.ld_list[num_ld_disks].ld.v.lun_id = sdev->lun;
         info.ld_list[num_ld_disks].state = MFI_LD_STATE_OPTIMAL;
         info.ld_list[num_ld_disks].size = cpu_to_le64(ld_size);
         num_ld_disks++;
diff --git a/hw/mfi.h b/hw/mfi.h
index 436b690..cd8355b 100644
--- a/hw/mfi.h
+++ b/hw/mfi.h
@@ -1085,7 +1085,7 @@ struct mfi_pd_list {
 union mfi_ld_ref {
     struct {
         uint8_t target_id;
-        uint8_t reserved;
+        uint8_t lun_id;
         uint16_t seq;
     } v;
     uint32_t ref;