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

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



Machine/CPU/NUMA queue, 2017-09-19

# gpg: Signature made Tue 19 Sep 2017 21:17:01 BST
# 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/machine-next-pull-request:
  MAINTAINERS: Update git URLs for my trees
  hw/acpi-build: Fix SRAT memory building in case of node 0 without RAM
  NUMA: Replace MAX_NODES with nb_numa_nodes in for loop
  numa: cpu: calculate/set default node-ids after all -numa CLI options are parsed
  arm: drop intermediate cpu_model -> cpu type parsing and use cpu type directly
  pc: use generic cpu_model parsing
  vl.c: convert cpu_model to cpu type and set of global properties before machine_init()
  cpu: make cpu_generic_init() abort QEMU on error
  qom: cpus: split cpu_generic_init() on feature parsing and cpu creation parts
  hostmem-file: Add "discard-data" option
  osdep: Define QEMU_MADV_REMOVE
  vl: Clean up user-creatable objects when exiting

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

MAINTAINERS

+4 −1
Original line number Diff line number Diff line
@@ -249,6 +249,7 @@ S: Maintained 
F: target/i386/

F: hw/i386/

F: disas/i386.c

T: git git://github.com/ehabkost/qemu.git x86-next



Xtensa

M: Max Filippov <jcmvbkbc@gmail.com>
@@ -858,6 +859,7 @@ S: Supported 
F: hw/core/machine.c

F: hw/core/null-machine.c

F: include/hw/boards.h

T: git git://github.com/ehabkost/qemu.git machine-next



Xtensa Machines

---------------
@@ -1385,7 +1387,7 @@ M: Eduardo Habkost <ehabkost@redhat.com> 
S: Maintained

F: numa.c

F: include/sysemu/numa.h

T: git git://github.com/ehabkost/qemu.git numa

T: git git://github.com/ehabkost/qemu.git machine-next



Host Memory Backends

M: Eduardo Habkost <ehabkost@redhat.com>
@@ -1393,6 +1395,7 @@ M: Igor Mammedov <imammedo@redhat.com> 
S: Maintained

F: backends/hostmem*.c

F: include/sysemu/hostmem.h

T: git git://github.com/ehabkost/qemu.git machine-next



Cryptodev Backends

M: Gonglei <arei.gonglei@huawei.com>

backends/hostmem-file.c

+29 −0
Original line number Diff line number Diff line
@@ -32,6 +32,7 @@ struct HostMemoryBackendFile { 
    HostMemoryBackend parent_obj;



    bool share;

    bool discard_data;

    char *mem_path;

};
@@ -103,16 +104,44 @@ static void file_memory_backend_set_share(Object *o, bool value, Error **errp) 
    fb->share = value;

}



static bool file_memory_backend_get_discard_data(Object *o, Error **errp)

{

    return MEMORY_BACKEND_FILE(o)->discard_data;

}



static void file_memory_backend_set_discard_data(Object *o, bool value,

                                               Error **errp)

{

    MEMORY_BACKEND_FILE(o)->discard_data = value;

}



static void file_backend_unparent(Object *obj)

{

    HostMemoryBackend *backend = MEMORY_BACKEND(obj);

    HostMemoryBackendFile *fb = MEMORY_BACKEND_FILE(obj);



    if (host_memory_backend_mr_inited(backend) && fb->discard_data) {

        void *ptr = memory_region_get_ram_ptr(&backend->mr);

        uint64_t sz = memory_region_size(&backend->mr);



        qemu_madvise(ptr, sz, QEMU_MADV_REMOVE);

    }

}



static void

file_backend_class_init(ObjectClass *oc, void *data)

{

    HostMemoryBackendClass *bc = MEMORY_BACKEND_CLASS(oc);



    bc->alloc = file_backend_memory_alloc;

    oc->unparent = file_backend_unparent;



    object_class_property_add_bool(oc, "share",

        file_memory_backend_get_share, file_memory_backend_set_share,

        &error_abort);

    object_class_property_add_bool(oc, "discard-data",

        file_memory_backend_get_discard_data, file_memory_backend_set_discard_data,

        &error_abort);

    object_class_property_add_str(oc, "mem-path",

        get_mem_path, set_mem_path,

        &error_abort);

bsd-user/main.c

+0 −4
Original line number Diff line number Diff line
@@ -902,10 +902,6 @@ int main(int argc, char **argv) 
    /* NOTE: we need to init the CPU at this stage to get

       qemu_host_page_size */

    cpu = cpu_init(cpu_model);

    if (!cpu) {

        fprintf(stderr, "Unable to find CPU definition\n");

        exit(1);

    }

    env = cpu->env_ptr;

#if defined(TARGET_SPARC) || defined(TARGET_PPC)

    cpu_reset(cpu);

hw/alpha/dp264.c

+0 −4
Original line number Diff line number Diff line
@@ -68,10 +68,6 @@ static void clipper_init(MachineState *machine) 
    memset(cpus, 0, sizeof(cpus));

    for (i = 0; i < smp_cpus; ++i) {

        cpus[i] = ALPHA_CPU(cpu_generic_init(TYPE_ALPHA_CPU, cpu_model));

        if (!cpus[i]) {

            error_report("Unable to find CPU definition");

            exit(1);

        }

    }



    cpus[0]->env.trap_arg0 = ram_size;

hw/arm/armv7m.c

+5 −35
Original line number Diff line number Diff line
@@ -151,10 +151,6 @@ static void armv7m_realize(DeviceState *dev, Error **errp) 
    SysBusDevice *sbd;

    Error *err = NULL;

    int i;

    char **cpustr;

    ObjectClass *oc;

    const char *typename;

    CPUClass *cc;



    if (!s->board_memory) {

        error_setg(errp, "memory property was not set");
@@ -163,29 +159,7 @@ static void armv7m_realize(DeviceState *dev, Error **errp) 


    memory_region_add_subregion_overlap(&s->container, 0, s->board_memory, -1);



    cpustr = g_strsplit(s->cpu_model, ",", 2);



    oc = cpu_class_by_name(TYPE_ARM_CPU, cpustr[0]);

    if (!oc) {

        error_setg(errp, "Unknown CPU model %s", cpustr[0]);

        g_strfreev(cpustr);

        return;

    }



    cc = CPU_CLASS(oc);

    typename = object_class_get_name(oc);

    cc->parse_features(typename, cpustr[1], &err);

    g_strfreev(cpustr);

    if (err) {

        error_propagate(errp, err);

        return;

    }



    s->cpu = ARM_CPU(object_new(typename));

    if (!s->cpu) {

        error_setg(errp, "Unknown CPU model %s", s->cpu_model);

        return;

    }

    s->cpu = ARM_CPU(object_new(s->cpu_type));



    object_property_set_link(OBJECT(s->cpu), OBJECT(&s->container), "memory",

                             &error_abort);
@@ -241,7 +215,7 @@ static void armv7m_realize(DeviceState *dev, Error **errp) 
}



static Property armv7m_properties[] = {

    DEFINE_PROP_STRING("cpu-model", ARMv7MState, cpu_model),

    DEFINE_PROP_STRING("cpu-type", ARMv7MState, cpu_type),

    DEFINE_PROP_LINK("memory", ARMv7MState, board_memory, TYPE_MEMORY_REGION,

                     MemoryRegion *),

    DEFINE_PROP_END_OF_LIST(),
@@ -275,20 +249,16 @@ static void armv7m_reset(void *opaque) 
   Returns the ARMv7M device.  */



DeviceState *armv7m_init(MemoryRegion *system_memory, int mem_size, int num_irq,

                      const char *kernel_filename, const char *cpu_model)

                         const char *kernel_filename, const char *cpu_type)

{

    DeviceState *armv7m;



    if (cpu_model == NULL) {

        cpu_model = "cortex-m3";

    }



    armv7m = qdev_create(NULL, TYPE_ARMV7M);

    qdev_prop_set_uint32(armv7m, "num-irq", num_irq);

    qdev_prop_set_string(armv7m, "cpu-model", cpu_model);

    qdev_prop_set_string(armv7m, "cpu-type", cpu_type);

    object_property_set_link(OBJECT(armv7m), OBJECT(get_system_memory()),

                                     "memory", &error_abort);

    /* This will exit with an error if the user passed us a bad cpu_model */

    /* This will exit with an error if the user passed us a bad cpu_type */

    qdev_init_nofail(armv7m);



    armv7m_load_kernel(ARM_CPU(first_cpu), kernel_filename, mem_size);