1. 21 9月, 2017 3 次提交
    • M
      net: add Sun HME (Happy Meal Ethernet) on-board NIC · c110425d
      Mark Cave-Ayland 提交于
      Enable it by default for the sparc64-softmmu configuration.
      Signed-off-by: NMark Cave-Ayland <mark.cave-ayland@ilande.co.uk>
      Acked-by: NArtyom Tarasenko <atar4qemu@gmail.com>
      c110425d
    • P
      Merge remote-tracking branch 'remotes/gkurz/tags/for-upstream' into staging · b62b7ed0
      Peter Maydell 提交于
      These patches fix regressions in 2.10
      
      # gpg: Signature made Wed 20 Sep 2017 07:51:07 BST
      # gpg:                using DSA key 0x02FC3AEB0101DBC2
      # gpg: Good signature from "Greg Kurz <groug@kaod.org>"
      # gpg:                 aka "Greg Kurz <groug@free.fr>"
      # gpg:                 aka "Greg Kurz <gkurz@linux.vnet.ibm.com>"
      # gpg:                 aka "Gregory Kurz (Groug) <groug@free.fr>"
      # gpg:                 aka "[jpeg image of size 3330]"
      # gpg: WARNING: This key is not certified with a trusted signature!
      # gpg:          There is no indication that the signature belongs to the owner.
      # Primary key fingerprint: 2BD4 3B44 535E C0A7 9894  DBA2 02FC 3AEB 0101 DBC2
      
      * remotes/gkurz/tags/for-upstream:
        9pfs: check the size of transport buffer before marshaling
        9pfs: fix name_to_path assertion in v9fs_complete_rename()
        9pfs: fix readdir() for 9p2000.u
      Signed-off-by: NPeter Maydell <peter.maydell@linaro.org>
      b62b7ed0
    • P
      Merge remote-tracking branch 'remotes/ehabkost/tags/machine-next-pull-request' into staging · d3f5433c
      Peter Maydell 提交于
      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: NPeter Maydell <peter.maydell@linaro.org>
      d3f5433c
  2. 20 9月, 2017 37 次提交