[Qemu-commits] [qemu/qemu] 9bf265: hw: add compat machines for 4.1

[Peter Maydell]

  Branch: refs/heads/master
  Home:   https://github.com/qemu/qemu
  Commit: 9bf2650bc3aab126b85c034bf86e27d564f9a1aa
      
https://github.com/qemu/qemu/commit/9bf2650bc3aab126b85c034bf86e27d564f9a1aa
  Author: Cornelia Huck <address@hidden>
  Date:   2019-04-25 (Thu, 25 Apr 2019)

  Changed paths:
    M hw/arm/virt.c
    M hw/core/machine.c
    M hw/i386/pc.c
    M hw/i386/pc_piix.c
    M hw/i386/pc_q35.c
    M hw/ppc/spapr.c
    M hw/s390x/s390-virtio-ccw.c
    M include/hw/boards.h
    M include/hw/i386/pc.h

  Log Message:
  -----------
  hw: add compat machines for 4.1

Add 4.1 machine types for arm/i440fx/q35/s390x/spapr.

Signed-off-by: Cornelia Huck <address@hidden>
Message-Id: <address@hidden>
Acked-by: Greg Kurz <address@hidden>
Acked-by: David Gibson <address@hidden>
Signed-off-by: Eduardo Habkost <address@hidden>


  Commit: 06433c27c1be5755c56ff0656660072e339ce4be
      
https://github.com/qemu/qemu/commit/06433c27c1be5755c56ff0656660072e339ce4be
  Author: Wei Yang <address@hidden>
  Date:   2019-04-25 (Thu, 25 Apr 2019)

  Changed paths:
    M include/hw/boards.h
    M vl.c

  Log Message:
  -----------
  vl.c: make find_default_machine() local

Function find_default_machine() is introduced by commit 2c8cffa599b7
"vl: make find_default_machine externally visible", and it was used
outside of vl.c until commit a904410af5f1 "pc_sysfw: remove the rom_only
property".

Commit a904410af5f1 "pc_sysfw: remove the rom_only property" removed the
only user of find_default_machine() outside vl.c, but neglected to make
it static. Do that now.

Signed-off-by: Wei Yang <address@hidden>

Message-Id: <address@hidden>
Reviewed-by: Markus Armbruster <address@hidden>
Signed-off-by: Eduardo Habkost <address@hidden>


  Commit: c516cd1b34f119370d9816ad87514698dc2bdbc8
      
https://github.com/qemu/qemu/commit/c516cd1b34f119370d9816ad87514698dc2bdbc8
  Author: Wei Yang <address@hidden>
  Date:   2019-04-25 (Thu, 25 Apr 2019)

  Changed paths:
    M vl.c

  Log Message:
  -----------
  vl.c: allocate TYPE_MACHINE list once during bootup

Now all the functions used to select machine is local and the call flow
looks like below:

    select_machine()
        find_default_machine()
        machine_parse()
            find_machine()

All these related function will need a GSList for TYPE_MACHINE.
Currently we allocate this list each time we use it, while this is not
necessary to do so because we don't need to modify this.

This patch make the TYPE_MACHINE list allocation in select_machine and
pass this to its child for use.

Signed-off-by: Wei Yang <address@hidden>
Reviewed-by: Markus Armbruster <address@hidden>
Message-Id: <address@hidden>
Signed-off-by: Eduardo Habkost <address@hidden>


  Commit: f2c93021380f13272d9cd1e3b693a654358b0a3c
      
https://github.com/qemu/qemu/commit/f2c93021380f13272d9cd1e3b693a654358b0a3c
  Author: Markus Armbruster <address@hidden>
  Date:   2019-04-25 (Thu, 25 Apr 2019)

  Changed paths:
    M vl.c

  Log Message:
  -----------
  vl: Clean up after previous commit

Since the previous commit, find_machine() and find_default_machine()
don't have to deallocate on return.  This permits further
simplifications.

Signed-off-by: Markus Armbruster <address@hidden>
Reviewed-by: Wei Yang <address@hidden>
Message-Id: <address@hidden>
Signed-off-by: Eduardo Habkost <address@hidden>


  Commit: 12cb82fdf01e9110455b2c55172c751531500d87
      
https://github.com/qemu/qemu/commit/12cb82fdf01e9110455b2c55172c751531500d87
  Author: Markus Armbruster <address@hidden>
  Date:   2019-04-25 (Thu, 25 Apr 2019)

  Changed paths:
    M vl.c

  Log Message:
  -----------
  vl: Simplify machine_parse()

Exploit that argument @name is nerver null.  Check is_help_option()
first, because that's what we do elsewhere.  If we (foolishly!)
defined a machine named "help", -machine help would now print help
instead of selecting the machine named "help".

Signed-off-by: Markus Armbruster <address@hidden>
Reviewed-by: Wei Yang <address@hidden>
Message-Id: <address@hidden>
Signed-off-by: Eduardo Habkost <address@hidden>


  Commit: c1c8cfe5f983aff0fcb018b0f0a11dd4580cc88e
      
https://github.com/qemu/qemu/commit/c1c8cfe5f983aff0fcb018b0f0a11dd4580cc88e
  Author: Eduardo Habkost <address@hidden>
  Date:   2019-04-25 (Thu, 25 Apr 2019)

  Changed paths:
    M bsd-user/main.c
    M exec.c
    M include/qom/cpu.h
    M linux-user/main.c
    M vl.c

  Log Message:
  -----------
  cpu: Rename parse_cpu_model() to parse_cpu_option()

The "model[,option...]" string parsed by the function is not just
a CPU model.  Rename the function and its argument to indicate it
expects the full "-cpu" option to be provided.

Signed-off-by: Eduardo Habkost <address@hidden>
Message-Id: <address@hidden>
Reviewed-by: David Gibson <address@hidden>
Reviewed-by: Markus Armbruster <address@hidden>
Reviewed-by: Igor Mammedov <address@hidden>
Signed-off-by: Eduardo Habkost <address@hidden>


  Commit: 5b863f3e2fade14ef0be01b2b690aac2c4fab477
      
https://github.com/qemu/qemu/commit/5b863f3e2fade14ef0be01b2b690aac2c4fab477
  Author: Eduardo Habkost <address@hidden>
  Date:   2019-04-25 (Thu, 25 Apr 2019)

  Changed paths:
    M exec.c
    A tests/acceptance/empty_cpu_model.py

  Log Message:
  -----------
  cpu: Fix crash with empty -cpu option

Fix the following crash:

  $ qemu-system-x86_64 -cpu ''
  qemu-system-x86_64: qom/cpu.c:291: cpu_class_by_name: \
      Assertion `cpu_model && cc->class_by_name' failed.

Regression test script included.

Fixes: 99193d8f2ef5 ("cpu: drop unnecessary NULL check and 
cpu_common_class_by_name()")
Signed-off-by: Eduardo Habkost <address@hidden>
Message-Id: <address@hidden>
Reviewed-by: Stefano Garzarella <address@hidden>
Tested-by: Stefano Garzarella <address@hidden>
Signed-off-by: Eduardo Habkost <address@hidden>


  Commit: 2ac0f1621c9be59eebc844fa10361a84fd726185
      
https://github.com/qemu/qemu/commit/2ac0f1621c9be59eebc844fa10361a84fd726185
  Author: Zhang Yi <address@hidden>
  Date:   2019-04-25 (Thu, 25 Apr 2019)

  Changed paths:
    M exec.c
    M include/qemu/mmap-alloc.h
    M util/mmap-alloc.c
    M util/oslib-posix.c

  Log Message:
  -----------
  util/mmap-alloc: Add a 'is_pmem' parameter to qemu_ram_mmap

besides the existing 'shared' flags, we are going to add
'is_pmem' to qemu_ram_mmap(), which indicated the memory backend
file is a persist memory.

Signed-off-by: Haozhong Zhang <address@hidden>
Signed-off-by: Zhang Yi <address@hidden>
Reviewed-by: Pankaj Gupta <address@hidden>
Message-Id: <address@hidden>
Reviewed-by: Michael S. Tsirkin <address@hidden>
Reviewed-by: Pankaj Gupta <address@hidden>
Signed-off-by: Eduardo Habkost <address@hidden>


  Commit: 0289881fb6c90bc5ac07585f0a1d60a3a5777d3d
      
https://github.com/qemu/qemu/commit/0289881fb6c90bc5ac07585f0a1d60a3a5777d3d
  Author: Zhang Yi <address@hidden>
  Date:   2019-04-25 (Thu, 25 Apr 2019)

  Changed paths:
    M scripts/update-linux-headers.sh

  Log Message:
  -----------
  scripts/update-linux-headers: add linux/mman.h

Add linux/mman.h,asm/mman.h,asm/mman-common.h to linux-headers,
So we can use more mmap2 flags.

Signed-off-by: Zhang Yi <address@hidden>
Message-Id: <address@hidden>
Signed-off-by: Eduardo Habkost <address@hidden>


  Commit: 8cf108c5d159bccfa162a06e6abc35cfa4965781
      
https://github.com/qemu/qemu/commit/8cf108c5d159bccfa162a06e6abc35cfa4965781
  Author: Zhang Yi <address@hidden>
  Date:   2019-04-25 (Thu, 25 Apr 2019)

  Changed paths:
    A linux-headers/asm-arm/mman.h
    A linux-headers/asm-arm64/mman.h
    A linux-headers/asm-generic/hugetlb_encode.h
    A linux-headers/asm-generic/mman-common.h
    A linux-headers/asm-generic/mman.h
    A linux-headers/asm-mips/mman.h
    A linux-headers/asm-powerpc/mman.h
    A linux-headers/asm-s390/mman.h
    A linux-headers/asm-x86/mman.h
    A linux-headers/linux/mman.h

  Log Message:
  -----------
  linux-headers: add linux/mman.h.

Update it to 4.20-rc1

Signed-off-by: Zhang Yi <address@hidden>
Message-Id: <address@hidden>
Signed-off-by: Eduardo Habkost <address@hidden>


  Commit: 119906afa5ca610adb87c55ab0d8e53c9104bfc3
      
https://github.com/qemu/qemu/commit/119906afa5ca610adb87c55ab0d8e53c9104bfc3
  Author: Zhang Yi <address@hidden>
  Date:   2019-04-25 (Thu, 25 Apr 2019)

  Changed paths:
    M docs/nvdimm.txt
    M qemu-options.hx
    M util/mmap-alloc.c

  Log Message:
  -----------
  util/mmap-alloc: support MAP_SYNC in qemu_ram_mmap()

When a file supporting DAX is used as vNVDIMM backend, mmap it with
MAP_SYNC flag in addition which can ensure file system metadata
synced in each guest writes to the backend file, without other QEMU
actions (e.g., periodic fsync() by QEMU).

Current, We have below different possible use cases:

1. pmem=on is set, shared=on is set, MAP_SYNC supported:
   a: backend is a dax supporting file.
    - MAP_SYNC will active.
   b: backend is not a dax supporting file.
    - mmap will trigger a warning. then MAP_SYNC flag will be ignored

2. The rest of cases:
   - we will never pass the MAP_SYNC to mmap2

Signed-off-by: Haozhong Zhang <address@hidden>
Signed-off-by: Zhang Yi <address@hidden>
[ehabkost: Rebased patch to latest code on master]
Signed-off-by: Eduardo Habkost <address@hidden>
Signed-off-by: Wei Yang <address@hidden>
Tested-by: Wei Yang <address@hidden>
Message-Id: <address@hidden>
[ehabkost: squashed documentation patch]
Message-Id: <address@hidden>
[ehabkost: documentation fixup]
Reviewed-by: Michael S. Tsirkin <address@hidden>
Reviewed-by: Pankaj Gupta <address@hidden>
Reviewed-by: Stefan Hajnoczi <address@hidden>
Signed-off-by: Eduardo Habkost <address@hidden>


  Commit: 06e64339555096a2bc2d08c7e012b36a9977062c
      
https://github.com/qemu/qemu/commit/06e64339555096a2bc2d08c7e012b36a9977062c
  Author: Peter Maydell <address@hidden>
  Date:   2019-04-26 (Fri, 26 Apr 2019)

  Changed paths:
    M bsd-user/main.c
    M docs/nvdimm.txt
    M exec.c
    M hw/arm/virt.c
    M hw/core/machine.c
    M hw/i386/pc.c
    M hw/i386/pc_piix.c
    M hw/i386/pc_q35.c
    M hw/ppc/spapr.c
    M hw/s390x/s390-virtio-ccw.c
    M include/hw/boards.h
    M include/hw/i386/pc.h
    M include/qemu/mmap-alloc.h
    M include/qom/cpu.h
    A linux-headers/asm-arm/mman.h
    A linux-headers/asm-arm64/mman.h
    A linux-headers/asm-generic/hugetlb_encode.h
    A linux-headers/asm-generic/mman-common.h
    A linux-headers/asm-generic/mman.h
    A linux-headers/asm-mips/mman.h
    A linux-headers/asm-powerpc/mman.h
    A linux-headers/asm-s390/mman.h
    A linux-headers/asm-x86/mman.h
    A linux-headers/linux/mman.h
    M linux-user/main.c
    M qemu-options.hx
    M scripts/update-linux-headers.sh
    A tests/acceptance/empty_cpu_model.py
    M util/mmap-alloc.c
    M util/oslib-posix.c
    M vl.c

  Log Message:
  -----------
  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 <address@hidden>" [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: Peter Maydell <address@hidden>


Compare: https://github.com/qemu/qemu/compare/f7526eece29c...06e643395550