Commit a678502e authored by Peter Maydell's avatar Peter Maydell
Browse files

Merge remote-tracking branch 'remotes/ehabkost/tags/x86-and-machine-pull-request' into staging 



x86, machine, numa queue (2017-01-23)

# gpg: Signature made Mon 23 Jan 2017 23:26:59 GMT
# gpg:                using RSA key 0x2807936F984DC5A6
# gpg: Good signature from "Eduardo Habkost <ehabkost@redhat.com>"
# Primary key fingerprint: 5A32 2FD5 ABC4 D3DB ACCF  D1AA 2807 936F 984D C5A6

* remotes/ehabkost/tags/x86-and-machine-pull-request:
  kvm: Allow invtsc migration if tsc-khz is set explicitly
  kvm: Simplify invtsc check
  hw/core/null-machine: Add the possibility to instantiate a CPU and RAM
  qemu-options: Rename variables on the -numa "cpus" option
  MAINTAINERS: Add an entry for hw/core/null-machine.c
  machine: Make possible_cpu_arch_ids() return const pointer
  pc: don't return cpu pointer from pc_new_cpu() as it's not needed anymore
  pc: cleanup: move smbios_set_cpuid() into pc_build_smbios()
  arch_init: Remove unnecessary default_config_files table
  vl: Ensure the numa_post_machine_init func in the appropriate location
  i386: Return migration-safe field on query-cpu-definitions
  i386: Remove AMD feature flag aliases from Opteron models
  x86: add AVX512_VPOPCNTDQ features

Signed-off-by: default avatarPeter Maydell <peter.maydell@linaro.org>
parents d5e85105 d99569d9

MAINTAINERS

+1 −0
Original line number Diff line number Diff line
@@ -819,6 +819,7 @@ M: Eduardo Habkost <ehabkost@redhat.com> 
M: Marcel Apfelbaum <marcel@redhat.com>

S: Supported

F: hw/core/machine.c

F: hw/core/null-machine.c

F: include/hw/boards.h



Xtensa Machines

arch_init.c

+0 −27
Original line number Diff line number Diff line
@@ -83,33 +83,6 @@ int graphic_depth = 32; 


const uint32_t arch_type = QEMU_ARCH;



static struct defconfig_file {

    const char *filename;

    /* Indicates it is an user config file (disabled by -no-user-config) */

    bool userconfig;

} default_config_files[] = {

    { CONFIG_QEMU_CONFDIR "/qemu.conf",                   true },

    { NULL }, /* end of list */

};



int qemu_read_default_config_files(bool userconfig)

{

    int ret;

    struct defconfig_file *f;



    for (f = default_config_files; f->filename; f++) {

        if (!userconfig && f->userconfig) {

            continue;

        }

        ret = qemu_read_config_file(f->filename);

        if (ret < 0 && ret != -ENOENT) {

            return ret;

        }

    }



    return 0;

}



struct soundhw {

    const char *name;

    const char *descr;

hw/acpi/cpu.c

+2 −4
Original line number Diff line number Diff line
@@ -190,7 +190,7 @@ void cpu_hotplug_hw_init(MemoryRegion *as, Object *owner, 
{

    MachineState *machine = MACHINE(qdev_get_machine());

    MachineClass *mc = MACHINE_GET_CLASS(machine);

    CPUArchIdList *id_list;

    const CPUArchIdList *id_list;

    int i;



    assert(mc->possible_cpu_arch_ids);
@@ -201,7 +201,6 @@ void cpu_hotplug_hw_init(MemoryRegion *as, Object *owner, 
        state->devs[i].cpu =  id_list->cpus[i].cpu;

        state->devs[i].arch_id = id_list->cpus[i].arch_id;

    }

    g_free(id_list);

    memory_region_init_io(&state->ctrl_reg, owner, &cpu_hotplug_ops, state,

                          "acpi-mem-hotplug", ACPI_CPU_HOTPLUG_REG_LEN);

    memory_region_add_subregion(as, base_addr, &state->ctrl_reg);
@@ -325,7 +324,7 @@ void build_cpus_aml(Aml *table, MachineState *machine, CPUHotplugFeatures opts, 
    Aml *one = aml_int(1);

    Aml *sb_scope = aml_scope("_SB");

    MachineClass *mc = MACHINE_GET_CLASS(machine);

    CPUArchIdList *arch_ids = mc->possible_cpu_arch_ids(machine);

    const CPUArchIdList *arch_ids = mc->possible_cpu_arch_ids(machine);

    char *cphp_res_path = g_strdup_printf("%s." CPUHP_RES_DEVICE, res_root);

    Object *obj = object_resolve_path_type("", TYPE_ACPI_DEVICE_IF, NULL);

    AcpiDeviceIfClass *adevc = ACPI_DEVICE_IF_GET_CLASS(obj);
@@ -574,5 +573,4 @@ void build_cpus_aml(Aml *table, MachineState *machine, CPUHotplugFeatures opts, 
    aml_append(table, method);



    g_free(cphp_res_path);

    g_free(arch_ids);

}

hw/acpi/cpu_hotplug.c

+1 −3
Original line number Diff line number Diff line
@@ -128,7 +128,7 @@ void build_legacy_cpu_hotplug_aml(Aml *ctx, MachineState *machine, 
    Aml *zero = aml_int(0);

    Aml *one = aml_int(1);

    MachineClass *mc = MACHINE_GET_CLASS(machine);

    CPUArchIdList *apic_ids = mc->possible_cpu_arch_ids(machine);

    const CPUArchIdList *apic_ids = mc->possible_cpu_arch_ids(machine);

    PCMachineState *pcms = PC_MACHINE(machine);



    /*
@@ -329,8 +329,6 @@ void build_legacy_cpu_hotplug_aml(Aml *ctx, MachineState *machine, 
        apic_idx = apic_id + 1;

    }

    aml_append(sb_scope, aml_name_decl(CPU_ON_BITMAP, pkg));

    g_free(apic_ids);



    aml_append(ctx, sb_scope);



    method = aml_method("\\_GPE._E02", 0, AML_NOTSERIALIZED);

hw/core/Makefile.objs

+1 −1
Original line number Diff line number Diff line
@@ -12,7 +12,6 @@ common-obj-$(CONFIG_XILINX_AXI) += stream.o 
common-obj-$(CONFIG_PTIMER) += ptimer.o

common-obj-$(CONFIG_SOFTMMU) += sysbus.o

common-obj-$(CONFIG_SOFTMMU) += machine.o

common-obj-$(CONFIG_SOFTMMU) += null-machine.o

common-obj-$(CONFIG_SOFTMMU) += loader.o

common-obj-$(CONFIG_SOFTMMU) += qdev-properties-system.o

common-obj-$(CONFIG_SOFTMMU) += register.o
@@ -20,3 +19,4 @@ common-obj-$(CONFIG_SOFTMMU) += or-irq.o 
common-obj-$(CONFIG_PLATFORM_BUS) += platform-bus.o



obj-$(CONFIG_SOFTMMU) += generic-loader.o

obj-$(CONFIG_SOFTMMU) += null-machine.o