Commit ba31cc72 authored by Thomas Huth's avatar Thomas Huth Committed by Paolo Bonzini
Browse files

Introduce DEVICE_CATEGORY_CPU for CPU devices 



Now that CPUs show up in the help text of "-device ?",
we should group them into an appropriate category.

Signed-off-by: default avatarThomas Huth <thuth@redhat.com>
Reviewed-by: default avatarEduardo Habkost <ehabkost@redhat.com>
Message-Id: <1484917276-7107-1-git-send-email-thuth@redhat.com>
Signed-off-by: default avatarPaolo Bonzini <pbonzini@redhat.com>
parent 1da45e0c

hw/cpu/core.c

+8 −0
Original line number Diff line number Diff line
@@ -72,10 +72,18 @@ static void cpu_core_instance_init(Object *obj) 
    core->nr_threads = smp_threads;

}



static void cpu_core_class_init(ObjectClass *oc, void *data)

{

    DeviceClass *dc = DEVICE_CLASS(oc);



    set_bit(DEVICE_CATEGORY_CPU, dc->categories);

}



static const TypeInfo cpu_core_type_info = {

    .name = TYPE_CPU_CORE,

    .parent = TYPE_DEVICE,

    .abstract = true,

    .class_init = cpu_core_class_init,

    .instance_size = sizeof(CPUCore),

    .instance_init = cpu_core_instance_init,

};

include/hw/qdev-core.h

+1 −0
Original line number Diff line number Diff line
@@ -26,6 +26,7 @@ typedef enum DeviceCategory { 
    DEVICE_CATEGORY_DISPLAY,

    DEVICE_CATEGORY_SOUND,

    DEVICE_CATEGORY_MISC,

    DEVICE_CATEGORY_CPU,

    DEVICE_CATEGORY_MAX

} DeviceCategory;

qdev-monitor.c

+1 −0
Original line number Diff line number Diff line
@@ -137,6 +137,7 @@ static void qdev_print_devinfos(bool show_no_user) 
        [DEVICE_CATEGORY_DISPLAY] = "Display",

        [DEVICE_CATEGORY_SOUND]   = "Sound",

        [DEVICE_CATEGORY_MISC]    = "Misc",

        [DEVICE_CATEGORY_CPU]     = "CPU",

        [DEVICE_CATEGORY_MAX]     = "Uncategorized",

    };

    GSList *list, *elt;

qom/cpu.c

+1 −0
Original line number Diff line number Diff line
@@ -415,6 +415,7 @@ static void cpu_class_init(ObjectClass *klass, void *data) 
    k->cpu_exec_enter = cpu_common_noop;

    k->cpu_exec_exit = cpu_common_noop;

    k->cpu_exec_interrupt = cpu_common_exec_interrupt;

    set_bit(DEVICE_CATEGORY_CPU, dc->categories);

    dc->realize = cpu_common_realizefn;

    dc->unrealize = cpu_common_unrealizefn;

    /*