Commit c0b5be52 authored by Juan Quintela's avatar Juan Quintela
Browse files

check: Only test pvpanic when it is compiled in 



It was not possible to compile out pvpanic.  Use the same trick
than applesmc.

Signed-off-by: default avatarJuan Quintela <quintela@redhat.com>
Reviewed-by: default avatarThomas Huth <thuth@redhat.com>
parent 7b070650

hw/misc/pvpanic.c

+0 −11
Original line number Diff line number Diff line
@@ -99,17 +99,6 @@ static void pvpanic_isa_realizefn(DeviceState *dev, Error **errp) 
    isa_register_ioport(d, &s->io, s->ioport);

}



#define PVPANIC_IOPORT_PROP "ioport"



uint16_t pvpanic_port(void)

{

    Object *o = object_resolve_path_type("", TYPE_PVPANIC, NULL);

    if (!o) {

        return 0;

    }

    return object_property_get_uint(o, PVPANIC_IOPORT_PROP, NULL);

}



static Property pvpanic_isa_properties[] = {

    DEFINE_PROP_UINT16(PVPANIC_IOPORT_PROP, PVPanicState, ioport, 0x505),

    DEFINE_PROP_END_OF_LIST(),

include/hw/misc/pvpanic.h

+10 −1
Original line number Diff line number Diff line
@@ -16,6 +16,15 @@ 


#define TYPE_PVPANIC "pvpanic"



uint16_t pvpanic_port(void);

#define PVPANIC_IOPORT_PROP "ioport"



static inline uint16_t pvpanic_port(void)

{

    Object *o = object_resolve_path_type("", TYPE_PVPANIC, NULL);

    if (!o) {

        return 0;

    }

    return object_property_get_uint(o, PVPANIC_IOPORT_PROP, NULL);

}



#endif

tests/Makefile.include

+2 −2
Original line number Diff line number Diff line
@@ -276,8 +276,8 @@ check-qtest-i386-$(CONFIG_VMXNET3_PCI) += tests/vmxnet3-test$(EXESUF) 
gcov-files-i386-$(CONFIG_VMXNET3_PCI) += hw/net/vmxnet3.c

gcov-files-i386-y += hw/net/net_rx_pkt.c

gcov-files-i386-y += hw/net/net_tx_pkt.c

check-qtest-i386-y += tests/pvpanic-test$(EXESUF)

gcov-files-i386-y += i386-softmmu/hw/misc/pvpanic.c

check-qtest-i386-$(CONFIG_PVPANIC) += tests/pvpanic-test$(EXESUF)

gcov-files-i386-$(CONFIG_PVPANIC) += i386-softmmu/hw/misc/pvpanic.c

check-qtest-i386-$(CONFIG_I82801B11) += tests/i82801b11-test$(EXESUF)

gcov-files-i386-$(CONFIG_I82801B11) += hw/pci-bridge/i82801b11.c

check-qtest-i386-$(CONFIG_IOH3420) += tests/ioh3420-test$(EXESUF)