diff mbox series

[v1,1/3] hyperv: vmbus: Remove the 2nd IRQ

Message ID 20200617110304.636666-2-arilou@gmail.com
State New
Headers show
Series hyperv: vmbus: ACPI various corrections | expand

Commit Message

Jon Doron June 17, 2020, 11:03 a.m. UTC
It seems like Windows does not really require 2 IRQs to have a
functioning VMBus.

Signed-off-by: Jon Doron <arilou@gmail.com>
---
 hw/hyperv/vmbus.c                | 1 -
 hw/i386/acpi-build.c             | 2 --
 include/hw/hyperv/vmbus-bridge.h | 1 -
 3 files changed, 4 deletions(-)
diff mbox series

Patch

diff --git a/hw/hyperv/vmbus.c b/hw/hyperv/vmbus.c
index f371240176..1a3738a03b 100644
--- a/hw/hyperv/vmbus.c
+++ b/hw/hyperv/vmbus.c
@@ -2742,7 +2742,6 @@  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_END_OF_LIST()
 };
 
diff --git a/hw/i386/acpi-build.c b/hw/i386/acpi-build.c
index 900f786d08..dce680e97c 100644
--- a/hw/i386/acpi-build.c
+++ b/hw/i386/acpi-build.c
@@ -1083,8 +1083,6 @@  static Aml *build_vmbus_device_aml(VMBusBridge *vmbus_bridge)
 
     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(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..0369dabc03 100644
--- a/include/hw/hyperv/vmbus-bridge.h
+++ b/include/hw/hyperv/vmbus-bridge.h
@@ -20,7 +20,6 @@  typedef struct VMBusBridge {
     SysBusDevice parent_obj;
 
     uint8_t irq0;
-    uint8_t irq1;
 
     VMBus *bus;
 } VMBusBridge;