vmxnet3: Support reading IMR registers on bar0
authorShmulik Ladkani <shmulik.ladkani@ravellosystems.com>
Mon, 21 Sep 2015 14:09:02 +0000 (17:09 +0300)
committerJason Wang <jasowang@redhat.com>
Mon, 12 Oct 2015 05:19:29 +0000 (13:19 +0800)
Instead of asserting, return the actual IMR register value.
This is aligned with what's returned on ESXi.

Signed-off-by: Shmulik Ladkani <shmulik.ladkani@ravellosystems.com>
Tested-by: Dana Rubin <dana.rubin@ravellosystems.com>
Signed-off-by: Jason Wang <jasowang@redhat.com>
hw/net/vmxnet3.c

index 48ced71d07731cd01b8a24c86acf09c58bd6964f..057f0dc9c0a617ef52495948c68469af5851c4e2 100644 (file)
@@ -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);