Commit 8f06f22f authored by Jon Doron's avatar Jon Doron Committed by Paolo Bonzini
Browse files

hyperv: vmbus: Remove the 2nd IRQ 



It seems like Windows does not really require 2 IRQs to have a
functioning VMBus.

Signed-off-by: default avatarJon Doron <arilou@gmail.com>
Message-Id: <20200617160904.681845-2-arilou@gmail.com>
Signed-off-by: default avatarPaolo Bonzini <pbonzini@redhat.com>
parent 74aaddc6

hw/hyperv/vmbus.c

+1 −2
Original line number Diff line number Diff line
@@ -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()

};

hw/i386/acpi-build.c

+1 −3
Original line number Diff line number Diff line
@@ -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;

include/hw/hyperv/vmbus-bridge.h

+1 −2
Original line number Diff line number Diff line
@@ -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;