Commit cd5ff833 authored by Igor Mammedov's avatar Igor Mammedov Committed by Eduardo Habkost
Browse files

machine: show if CLI option '-numa node,mem' is supported in QAPI schema 



Legacy '-numa node,mem' option has a number of issues and mgmt often
defaults to it. Unfortunately it's no possible to replace it with
an alternative '-numa memdev' without breaking migration compatibility.
What's possible though is to deprecate it, keeping option working with
old machine types only.

In order to help users to find out if being deprecated CLI option
'-numa node,mem' is still supported by particular machine type, add new
"numa-mem-supported" property to output of query-machines.

"numa-mem-supported" is set to 'true' for machines that currently support
NUMA, but it will be flipped to 'false' later on, once deprecation period
expires and kept 'true' only for old machine types that used to support
the legacy option so it won't break existing configuration that are using
it.

Signed-off-by: default avatarIgor Mammedov <imammedo@redhat.com>
Message-Id: <1560172207-378962-1-git-send-email-imammedo@redhat.com>
Reviewed-by: default avatarMarkus Armbruster <armbru@redhat.com>
Signed-off-by: default avatarEduardo Habkost <ehabkost@redhat.com>
parent fc3b77e2

hw/arm/virt.c

+1 −0
Original line number Diff line number Diff line
@@ -1952,6 +1952,7 @@ static void virt_machine_class_init(ObjectClass *oc, void *data) 
    assert(!mc->get_hotplug_handler);

    mc->get_hotplug_handler = virt_machine_get_hotplug_handler;

    hc->plug = virt_machine_device_plug_cb;

    mc->numa_mem_supported = true;

}



static void virt_instance_init(Object *obj)

hw/core/machine-qmp-cmds.c

+1 −0
Original line number Diff line number Diff line
@@ -226,6 +226,7 @@ MachineInfoList *qmp_query_machines(Error **errp) 
        info->name = g_strdup(mc->name);

        info->cpu_max = !mc->max_cpus ? 1 : mc->max_cpus;

        info->hotpluggable_cpus = mc->has_hotpluggable_cpus;

        info->numa_mem_supported = mc->numa_mem_supported;



        entry = g_malloc0(sizeof(*entry));

        entry->value = info;

hw/i386/pc.c

+1 −0
Original line number Diff line number Diff line
@@ -2856,6 +2856,7 @@ static void pc_machine_class_init(ObjectClass *oc, void *data) 
    nc->nmi_monitor_handler = x86_nmi;

    mc->default_cpu_type = TARGET_DEFAULT_CPU_TYPE;

    mc->nvdimm_supported = true;

    mc->numa_mem_supported = true;



    object_class_property_add(oc, PC_MACHINE_DEVMEM_REGION_SIZE, "int",

        pc_machine_get_device_memory_region_size, NULL,

hw/ppc/spapr.c

+1 −0
Original line number Diff line number Diff line
@@ -4367,6 +4367,7 @@ static void spapr_machine_class_init(ObjectClass *oc, void *data) 
     * in which LMBs are represented and hot-added

     */

    mc->numa_mem_align_shift = 28;

    mc->numa_mem_supported = true;



    smc->default_caps.caps[SPAPR_CAP_HTM] = SPAPR_CAP_OFF;

    smc->default_caps.caps[SPAPR_CAP_VSX] = SPAPR_CAP_ON;

include/hw/boards.h

+3 −0
Original line number Diff line number Diff line
@@ -160,6 +160,8 @@ typedef struct { 
 * @kvm_type:

 *    Return the type of KVM corresponding to the kvm-type string option or

 *    computed based on other criteria such as the host kernel capabilities.

 * @numa_mem_supported:

 *    true if '--numa node.mem' option is supported and false otherwise

 */

struct MachineClass {

    /*< private >*/
@@ -212,6 +214,7 @@ struct MachineClass { 
    bool ignore_boot_device_suffixes;

    bool smbus_no_migration_support;

    bool nvdimm_supported;

    bool numa_mem_supported;



    HotplugHandler *(*get_hotplug_handler)(MachineState *machine,

                                           DeviceState *dev);