diff mbox

vmxnet3: Support reading IMR registers on bar0

Message ID 1442844542-16216-1-git-send-email-shmulik.ladkani@ravellosystems.com
State New
Headers show

Commit Message

Shmulik Ladkani Sept. 21, 2015, 2:09 p.m. UTC 
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>

---
 hw/net/vmxnet3.c | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

Comments

Dmitry Fleytman Sept. 22, 2015, 8:16 a.m. UTC | #1 
> On Sep 21, 2015, at 17:09 PM, Shmulik Ladkani <shmulik.ladkani@ravellosystems.com> wrote:
> 
> 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>
> 

ACK.

> ---
> 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 04159c8..97f19dc 100644
> --- a/hw/net/vmxnet3.c
> +++ b/hw/net/vmxnet3.c
> @@ -1165,9 +1165,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);
> -- 
> 1.9.1
>
Jason Wang Sept. 24, 2015, 4:41 a.m. UTC | #2 
On 09/21/2015 10:09 PM, Shmulik Ladkani wrote:
> 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>
>
> ---
>  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 04159c8..97f19dc 100644
> --- a/hw/net/vmxnet3.c
> +++ b/hw/net/vmxnet3.c
> @@ -1165,9 +1165,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);

Applied in https://github.com/jasowang/qemu/commits/net

Thanks.
diff mbox

Patch

diff --git a/hw/net/vmxnet3.c b/hw/net/vmxnet3.c
index 04159c8..97f19dc 100644
--- a/hw/net/vmxnet3.c
+++ b/hw/net/vmxnet3.c
@@ -1165,9 +1165,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);