From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:47149) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1a49IZ-0005oL-Go for qemu-devel@nongnu.org; Wed, 02 Dec 2015 10:26:33 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1a49IV-0002mw-C3 for qemu-devel@nongnu.org; Wed, 02 Dec 2015 10:26:27 -0500 Received: from mail-wm0-x236.google.com ([2a00:1450:400c:c09::236]:34314) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1a49IV-0002ms-78 for qemu-devel@nongnu.org; Wed, 02 Dec 2015 10:26:23 -0500 Received: by wmvv187 with SMTP id v187so260349839wmv.1 for ; Wed, 02 Dec 2015 07:26:22 -0800 (PST) From: Shmulik Ladkani Date: Wed, 2 Dec 2015 17:26:28 +0200 Message-Id: <1449069991-6109-3-git-send-email-shmulik.ladkani@ravellosystems.com> In-Reply-To: <1449069991-6109-1-git-send-email-shmulik.ladkani@ravellosystems.com> References: <1449069991-6109-1-git-send-email-shmulik.ladkani@ravellosystems.com> Subject: [Qemu-devel] [PATCH v2 2/5] vmxnet3: Change the offset of the MSIX PBA table List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: Dmitry Fleytman , Jason Wang Cc: Marcel Apfelbaum , idan.brown@ravellosystems.com, qemu-devel@nongnu.org, Shmulik Ladkani Place the PBA table at 0x1000, as placed by VMware virtual hardware. The 'x-old-msi-offsets' property is used for backwards compatability. Signed-off-by: Shmulik Ladkani --- hw/net/vmxnet3.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/hw/net/vmxnet3.c b/hw/net/vmxnet3.c index 1985dcf..b176138 100644 --- a/hw/net/vmxnet3.c +++ b/hw/net/vmxnet3.c @@ -51,7 +51,8 @@ #define VMXNET3_MSIX_BAR_IDX (2) #define VMXNET3_OFF_MSIX_TABLE (0x000) -#define VMXNET3_OFF_MSIX_PBA (0x800) +#define VMXNET3_OFF_MSIX_PBA(s) \ + ((s)->compat_flags & VMXNET3_COMPAT_FLAG_OLD_MSI_OFFSETS ? 0x800 : 0x1000) /* Link speed in Mbps should be shifted by 16 */ #define VMXNET3_LINK_SPEED (1000 << 16) @@ -2115,7 +2116,7 @@ vmxnet3_init_msix(VMXNET3State *s) &s->msix_bar, VMXNET3_MSIX_BAR_IDX, VMXNET3_OFF_MSIX_TABLE, &s->msix_bar, - VMXNET3_MSIX_BAR_IDX, VMXNET3_OFF_MSIX_PBA, + VMXNET3_MSIX_BAR_IDX, VMXNET3_OFF_MSIX_PBA(s), VMXNET3_MSIX_OFFSET(s)); if (0 > res) { -- 1.9.1