From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:41479) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ZlYIU-0005nR-4g for qemu-devel@nongnu.org; Mon, 12 Oct 2015 04:17:30 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1ZlYIT-0002gS-Bl for qemu-devel@nongnu.org; Mon, 12 Oct 2015 04:17:30 -0400 Received: from mx1.redhat.com ([209.132.183.28]:59100) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ZlYIS-0002gE-No for qemu-devel@nongnu.org; Mon, 12 Oct 2015 04:17:29 -0400 From: Jason Wang Date: Mon, 12 Oct 2015 16:17:04 +0800 Message-Id: <1444637836-12215-3-git-send-email-jasowang@redhat.com> In-Reply-To: <1444637836-12215-1-git-send-email-jasowang@redhat.com> References: <1444637836-12215-1-git-send-email-jasowang@redhat.com> Subject: [Qemu-devel] [PULL 02/14] vmxnet3: Support reading IMR registers on bar0 List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org, peter.maydell@linaro.org Cc: Jason Wang , Shmulik Ladkani From: Shmulik Ladkani Instead of asserting, return the actual IMR register value. This is aligned with what's returned on ESXi. Signed-off-by: Shmulik Ladkani Tested-by: Dana Rubin Signed-off-by: Jason Wang --- hw/net/vmxnet3.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/hw/net/vmxnet3.c b/hw/net/vmxnet3.c index 48ced71..057f0dc 100644 --- a/hw/net/vmxnet3.c +++ b/hw/net/vmxnet3.c @@ -1163,9 +1163,13 @@ vmxnet3_io_bar0_write(void *opaque, hwaddr addr, static uint64_t vmxnet3_io_bar0_read(void *opaque, hwaddr addr, unsigned size) { + VMXNET3State *s = opaque; + if (VMW_IS_MULTIREG_ADDR(addr, VMXNET3_REG_IMR, VMXNET3_MAX_INTRS, VMXNET3_REG_ALIGN)) { - g_assert_not_reached(); + int l = VMW_MULTIREG_IDX_BY_ADDR(addr, VMXNET3_REG_IMR, + VMXNET3_REG_ALIGN); + return s->interrupt_states[l].is_masked; } VMW_CBPRN("BAR0 unknown read [%" PRIx64 "], size %d", addr, size); -- 2.1.4