aboutsummaryrefslogtreecommitdiff
path: root/hw
diff options
context:
space:
mode:
authorJon Doron <arilou@gmail.com>2020-06-17 19:09:02 +0300
committerPaolo Bonzini <pbonzini@redhat.com>2020-06-26 09:39:40 -0400
commit8f06f22f38246ea7a6b0b20013fd9a7a87e23569 (patch)
treeeb150f67f3024fd0e7d95cfa7390283f45ddbf51 /hw
parent74aaddc6283ff789923127f3b95f781796fe3f39 (diff)
hyperv: vmbus: Remove the 2nd IRQ
It seems like Windows does not really require 2 IRQs to have a functioning VMBus. Signed-off-by: Jon Doron <arilou@gmail.com> Message-Id: <20200617160904.681845-2-arilou@gmail.com> Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
Diffstat (limited to 'hw')
-rw-r--r--hw/hyperv/vmbus.c3
-rw-r--r--hw/i386/acpi-build.c4
2 files changed, 2 insertions, 5 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 378515df66..b7bcbbbb2a 100644
--- a/hw/i386/acpi-build.c
+++ b/hw/i386/acpi-build.c
@@ -967,9 +967,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;