Re: [PATCH v3 1/3] hyperv: vmbus: Remove the 2nd IRQ

[Igor Mammedov <imammedo@redhat.com>]

On Thu, 18 Jun 2020 06:00:25 +0300
Jon Doron <arilou@gmail.com> wrote:

> It seems like Windows does not really require 2 IRQs to have a
> functioning VMBus.
> 
> Signed-off-by: Jon Doron <arilou@gmail.com>

Reviewed-by: Igor Mammedov <imammedo@redhat.com>

> ---
>  hw/hyperv/vmbus.c                | 3 +--
>  hw/i386/acpi-build.c             | 4 +---
>  include/hw/hyperv/vmbus-bridge.h | 3 +--
>  3 files changed, 3 insertions(+), 7 deletions(-)
> 
> diff --git a/hw/hyperv/vmbus.c b/hw/hyperv/vmbus.c
> index f371240176..a8bcb41026 100644
> --- a/hw/hyperv/vmbus.c
> +++ b/hw/hyperv/vmbus.c
> @@ -2741,8 +2741,7 @@ static const VMStateDescription vmstate_vmbus_bridge = {
>  };
>  
>  static Property vmbus_bridge_props[] = {
> -    DEFINE_PROP_UINT8("irq0", VMBusBridge, irq0, 7),
> -    DEFINE_PROP_UINT8("irq1", VMBusBridge, irq1, 13),
> +    DEFINE_PROP_UINT8("irq", VMBusBridge, irq, 7),
>      DEFINE_PROP_END_OF_LIST()
>  };
>  
> diff --git a/hw/i386/acpi-build.c b/hw/i386/acpi-build.c
> index 900f786d08..91af0d2d0d 100644
> --- a/hw/i386/acpi-build.c
> +++ b/hw/i386/acpi-build.c
> @@ -1082,9 +1082,7 @@ static Aml *build_vmbus_device_aml(VMBusBridge *vmbus_bridge)
>      aml_append(dev, aml_name_decl("_PS3", aml_int(0x0)));
>  
>      crs = aml_resource_template();
> -    aml_append(crs, aml_irq_no_flags(vmbus_bridge->irq0));
> -    /* FIXME: newer HyperV gets by with only one IRQ */
> -    aml_append(crs, aml_irq_no_flags(vmbus_bridge->irq1));
> +    aml_append(crs, aml_irq_no_flags(vmbus_bridge->irq));
>      aml_append(dev, aml_name_decl("_CRS", crs));
>  
>      return dev;
> diff --git a/include/hw/hyperv/vmbus-bridge.h b/include/hw/hyperv/vmbus-bridge.h
> index c0a06d832c..33f93de64d 100644
> --- a/include/hw/hyperv/vmbus-bridge.h
> +++ b/include/hw/hyperv/vmbus-bridge.h
> @@ -19,8 +19,7 @@ typedef struct VMBus VMBus;
>  typedef struct VMBusBridge {
>      SysBusDevice parent_obj;
>  
> -    uint8_t irq0;
> -    uint8_t irq1;
> +    uint8_t irq;
>  
>      VMBus *bus;
>  } VMBusBridge;