Commit 34bec7a8 authored by Li Qiang's avatar Li Qiang Committed by Laurent Vivier
Browse files

ioapic: use TYPE_FOO MACRO than constant string 



Make them more QOMConventional.
Cc:qemu-trivial@nongnu.org

Signed-off-by: default avatarLi Qiang <liq3ea@163.com>
Reviewed-by: default avatarLaurent Vivier <laurent@vivier.eu>
Message-Id: <20190105023831.66910-1-liq3ea@163.com>
Signed-off-by: default avatarLaurent Vivier <laurent@vivier.eu>
parent 0cd0589e

hw/i386/kvm/ioapic.c

+1 −1
Original line number Diff line number Diff line
@@ -163,7 +163,7 @@ static void kvm_ioapic_class_init(ObjectClass *klass, void *data) 
}



static const TypeInfo kvm_ioapic_info = {

    .name  = "kvm-ioapic",

    .name  = TYPE_KVM_IOAPIC,

    .parent = TYPE_IOAPIC_COMMON,

    .instance_size = sizeof(KVMIOAPICState),

    .class_init = kvm_ioapic_class_init,

hw/i386/pc.c

+2 −2
Original line number Diff line number Diff line
@@ -2339,9 +2339,9 @@ void ioapic_init_gsi(GSIState *gsi_state, const char *parent_name) 
    unsigned int i;



    if (kvm_ioapic_in_kernel()) {

        dev = qdev_create(NULL, "kvm-ioapic");

        dev = qdev_create(NULL, TYPE_KVM_IOAPIC);

    } else {

        dev = qdev_create(NULL, "ioapic");

        dev = qdev_create(NULL, TYPE_IOAPIC);

    }

    if (parent_name) {

        object_property_add_child(object_resolve_path(parent_name, NULL),

hw/intc/ioapic.c

+1 −1
Original line number Diff line number Diff line
@@ -429,7 +429,7 @@ static void ioapic_class_init(ObjectClass *klass, void *data) 
}



static const TypeInfo ioapic_info = {

    .name          = "ioapic",

    .name          = TYPE_IOAPIC,

    .parent        = TYPE_IOAPIC_COMMON,

    .instance_size = sizeof(IOAPICCommonState),

    .class_init    = ioapic_class_init,

include/hw/i386/ioapic.h

+3 −0
Original line number Diff line number Diff line
@@ -23,6 +23,9 @@ 
#define IOAPIC_NUM_PINS 24

#define IO_APIC_DEFAULT_ADDRESS 0xfec00000



#define TYPE_KVM_IOAPIC "kvm-ioapic"

#define TYPE_IOAPIC "ioapic"



void ioapic_eoi_broadcast(int vector);



#endif /* HW_IOAPIC_H */