SYS-OSS/FRET-qemu
4
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

hyperv: vmbus: Remove the 2nd IRQ

Browse Source 
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>
This commit is contained in:
Jon Doron 2020-06-17 19:09:02 +03:00 committed by Paolo Bonzini
parent 74aaddc628
commit 8f06f22f38
3 changed files with 3 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
hw/hyperv/vmbus.c
View File

@ -2741,8 +2741,7 @@ static const VMStateDescription vmstate_vmbus_bridge = {
}; };
static Property vmbus_bridge_props[] = { static Property vmbus_bridge_props[] = {
DEFINE_PROP_UINT8("irq0", VMBusBridge, irq0, 7), DEFINE_PROP_UINT8("irq", VMBusBridge, irq, 7),
DEFINE_PROP_UINT8("irq1", VMBusBridge, irq1, 13),
DEFINE_PROP_END_OF_LIST() DEFINE_PROP_END_OF_LIST()
}; };

4
hw/i386/acpi-build.c
View File

@ -967,9 +967,7 @@ static Aml *build_vmbus_device_aml(VMBusBridge *vmbus_bridge)
aml_append(dev, aml_name_decl("_PS3", aml_int(0x0))); aml_append(dev, aml_name_decl("_PS3", aml_int(0x0)));
crs = aml_resource_template(); crs = aml_resource_template();
aml_append(crs, aml_irq_no_flags(vmbus_bridge->irq0)); aml_append(crs, aml_irq_no_flags(vmbus_bridge->irq));
/* 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)); aml_append(dev, aml_name_decl("_CRS", crs));
return dev; return dev;

3
include/hw/hyperv/vmbus-bridge.h
View File

@ -19,8 +19,7 @@ typedef struct VMBus VMBus;
typedef struct VMBusBridge { typedef struct VMBusBridge {
SysBusDevice parent_obj; SysBusDevice parent_obj;
uint8_t irq0; uint8_t irq;
uint8_t irq1;
VMBus *bus; VMBus *bus;
} VMBusBridge; } VMBusBridge;