Commit 06e64339 authored by Peter Maydell's avatar Peter Maydell
Browse files

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



Machine queue, 2019-04-25

* 4.1 machine-types (Cornelia Huck)
* Support MAP_SYNC on pmem memory backends (Zhang Yi)
* -cpu parsing fixes and cleanups (Eduardo Habkost)
* machine initialization cleanups (Wei Yang, Markus Armbruster)

# gpg: Signature made Thu 25 Apr 2019 18:54:57 BST
# gpg:                using RSA key 2807936F984DC5A6
# gpg: Good signature from "Eduardo Habkost <ehabkost@redhat.com>" [full]
# Primary key fingerprint: 5A32 2FD5 ABC4 D3DB ACCF  D1AA 2807 936F 984D C5A6

* remotes/ehabkost/tags/machine-next-pull-request:
  util/mmap-alloc: support MAP_SYNC in qemu_ram_mmap()
  linux-headers: add linux/mman.h.
  scripts/update-linux-headers: add linux/mman.h
  util/mmap-alloc: Add a 'is_pmem' parameter to qemu_ram_mmap
  cpu: Fix crash with empty -cpu option
  cpu: Rename parse_cpu_model() to parse_cpu_option()
  vl: Simplify machine_parse()
  vl: Clean up after previous commit
  vl.c: allocate TYPE_MACHINE list once during bootup
  vl.c: make find_default_machine() local
  hw: add compat machines for 4.1

Signed-off-by: default avatarPeter Maydell <peter.maydell@linaro.org>
parents f7526eec 119906af

bsd-user/main.c

+1 −1
Original line number Diff line number Diff line
@@ -905,7 +905,7 @@ int main(int argc, char **argv) 
    /* init tcg before creating CPUs and to get qemu_host_page_size */

    tcg_exec_init(0);



    cpu_type = parse_cpu_model(cpu_model);

    cpu_type = parse_cpu_option(cpu_model);

    cpu = cpu_create(cpu_type);

    env = cpu->env_ptr;

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

docs/nvdimm.txt

+19 −3
Original line number Diff line number Diff line
@@ -144,9 +144,25 @@ Guest Data Persistence 
----------------------



Though QEMU supports multiple types of vNVDIMM backends on Linux,

currently the only one that can guarantee the guest write persistence

is the device DAX on the real NVDIMM device (e.g., /dev/dax0.0), to

which all guest access do not involve any host-side kernel cache.

the only backend that can guarantee the guest write persistence is:



A. DAX device (e.g., /dev/dax0.0, ) or

B. DAX file(mounted with dax option)



When using B (A file supporting direct mapping of persistent memory)

as a backend, write persistence is guaranteed if the host kernel has

support for the MAP_SYNC flag in the mmap system call (available

since Linux 4.15 and on certain distro kernels) and additionally

both 'pmem' and 'share' flags are set to 'on' on the backend.



If these conditions are not satisfied i.e. if either 'pmem' or 'share'

are not set, if the backend file does not support DAX or if MAP_SYNC

is not supported by the host kernel, write persistence is not

guaranteed after a system crash. For compatibility reasons, these

conditions are ignored if not satisfied. Currently, no way is

provided to test for them.

For more details, please reference mmap(2) man page:

http://man7.org/linux/man-pages/man2/mmap.2.html.



When using other types of backends, it's suggested to set 'unarmed'

option of '-device nvdimm' to 'on', which sets the unarmed flag of the

exec.c

+7 −3
Original line number Diff line number Diff line
@@ -983,14 +983,18 @@ void cpu_exec_realizefn(CPUState *cpu, Error **errp) 
#endif

}



const char *parse_cpu_model(const char *cpu_model)

const char *parse_cpu_option(const char *cpu_option)

{

    ObjectClass *oc;

    CPUClass *cc;

    gchar **model_pieces;

    const char *cpu_type;



    model_pieces = g_strsplit(cpu_model, ",", 2);

    model_pieces = g_strsplit(cpu_option, ",", 2);

    if (!model_pieces[0]) {

        error_report("-cpu option cannot be empty");

        exit(1);

    }



    oc = cpu_class_by_name(CPU_RESOLVING_TYPE, model_pieces[0]);

    if (oc == NULL) {
@@ -1915,7 +1919,7 @@ static void *file_ram_alloc(RAMBlock *block, 
    }



    area = qemu_ram_mmap(fd, memory, block->mr->align,

                         block->flags & RAM_SHARED);

                         block->flags & RAM_SHARED, block->flags & RAM_PMEM);

    if (area == MAP_FAILED) {

        error_setg_errno(errp, errno,

                         "unable to map backing store for guest RAM");

hw/arm/virt.c

+8 −1
Original line number Diff line number Diff line
@@ -1978,10 +1978,17 @@ static void machvirt_machine_init(void) 
}

type_init(machvirt_machine_init);



static void virt_machine_4_1_options(MachineClass *mc)

{

}

DEFINE_VIRT_MACHINE_AS_LATEST(4, 1)



static void virt_machine_4_0_options(MachineClass *mc)

{

    virt_machine_4_1_options(mc);

    compat_props_add(mc->compat_props, hw_compat_4_0, hw_compat_4_0_len);

}

DEFINE_VIRT_MACHINE_AS_LATEST(4, 0)

DEFINE_VIRT_MACHINE(4, 0)



static void virt_machine_3_1_options(MachineClass *mc)

{

hw/core/machine.c

+3 −0
Original line number Diff line number Diff line
@@ -24,6 +24,9 @@ 
#include "hw/pci/pci.h"

#include "hw/mem/nvdimm.h"



GlobalProperty hw_compat_4_0[] = {};

const size_t hw_compat_4_0_len = G_N_ELEMENTS(hw_compat_4_0);



GlobalProperty hw_compat_3_1[] = {

    { "pcie-root-port", "x-speed", "2_5" },

    { "pcie-root-port", "x-width", "1" },