[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PULL 02/14] vmxnet3: Support reading IMR registers on bar0
From: |
Jason Wang |
Subject: |
[Qemu-devel] [PULL 02/14] vmxnet3: Support reading IMR registers on bar0 |
Date: |
Mon, 12 Oct 2015 16:17:04 +0800 |
From: Shmulik Ladkani <address@hidden>
Instead of asserting, return the actual IMR register value.
This is aligned with what's returned on ESXi.
Signed-off-by: Shmulik Ladkani <address@hidden>
Tested-by: Dana Rubin <address@hidden>
Signed-off-by: Jason Wang <address@hidden>
---
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
- [Qemu-devel] [PULL 00/14] Net patches, Jason Wang, 2015/10/12
- [Qemu-devel] [PULL 01/14] net/vmxnet3: Refine l2 header validation, Jason Wang, 2015/10/12
- [Qemu-devel] [PULL 03/14] e1000: use alias for default model, Jason Wang, 2015/10/12
- [Qemu-devel] [PULL 07/14] netfilter: hook packets before net queue send, Jason Wang, 2015/10/12
- [Qemu-devel] [PULL 09/14] net/queue: introduce NetQueueDeliverFunc, Jason Wang, 2015/10/12
- [Qemu-devel] [PULL 10/14] netfilter: add an API to pass the packet to next filter, Jason Wang, 2015/10/12
- [Qemu-devel] [PULL 13/14] netfilter: add a netbuffer filter, Jason Wang, 2015/10/12
- [Qemu-devel] [PULL 14/14] tests: add test cases for netfilter object, Jason Wang, 2015/10/12
- Re: [Qemu-devel] [PULL 00/14] Net patches, Peter Maydell, 2015/10/12
- [Qemu-devel] [PULL 02/14] vmxnet3: Support reading IMR registers on bar0,
Jason Wang <=
- [Qemu-devel] [PULL 04/14] vmxnet3: Add support for VMXNET3_CMD_GET_ADAPTIVE_RING_INFO command, Jason Wang, 2015/10/15
- [Qemu-devel] [PULL 06/14] init/cleanup of netfilter object, Jason Wang, 2015/10/15
- [Qemu-devel] [PULL 08/14] net: merge qemu_deliver_packet and qemu_deliver_packet_iov, Jason Wang, 2015/10/15
- [Qemu-devel] [PULL 05/14] vl.c: init delayed object after net_init_clients, Jason Wang, 2015/10/15
- [Qemu-devel] [PULL 12/14] net/queue: export qemu_net_queue_append_iov, Jason Wang, 2015/10/15
- [Qemu-devel] [PULL 11/14] netfilter: print filter info associate with the netdev, Jason Wang, 2015/10/15