1. 21 9月, 2017 5 次提交
    • P
      Merge remote-tracking branch 'remotes/sstabellini/tags/xen-20170920-tag' into staging · 211ad3b4
      Peter Maydell 提交于
      Xen 2017/09/20
      
      # gpg: Signature made Thu 21 Sep 2017 03:20:02 BST
      # gpg:                using RSA key 0x894F8F4870E1AE90
      # gpg: Good signature from "Stefano Stabellini <stefano.stabellini@eu.citrix.com>"
      # gpg:                 aka "Stefano Stabellini <sstabellini@kernel.org>"
      # Primary key fingerprint: D04E 33AB A51F 67BA 07D3  0AEA 894F 8F48 70E1 AE90
      
      * remotes/sstabellini/tags/xen-20170920-tag:
        xen/pt: allow QEMU to request MSI unmasking at bind time
        xen-disk: use g_new0 to fix build
      Signed-off-by: NPeter Maydell <peter.maydell@linaro.org>
      211ad3b4
    • R
      xen/pt: allow QEMU to request MSI unmasking at bind time · a8036336
      Roger Pau Monne 提交于
      When a MSI interrupt is bound to a guest using
      xc_domain_update_msi_irq (XEN_DOMCTL_bind_pt_irq) the interrupt is
      left masked by default.
      
      This causes problems with guests that first configure interrupts and
      clean the per-entry MSIX table mask bit and afterwards enable MSIX
      globally. In such scenario the Xen internal msixtbl handlers would not
      detect the unmasking of MSIX entries because vectors are not yet
      registered since MSIX is not enabled, and vectors would be left
      masked.
      
      Introduce a new flag in the gflags field to signal Xen whether a MSI
      interrupt should be unmasked after being bound.
      
      This also requires to track the mask register for MSI interrupts, so
      QEMU can also notify to Xen whether the MSI interrupt should be bound
      masked or unmasked
      Signed-off-by: NRoger Pau Monné <roger.pau@citrix.com>
      Reviewed-by: NJan Beulich <jbeulich@suse.com>
      Reported-by: NAndreas Kinzler <hfp@posteo.de>
      Reviewed-by: NStefano Stabellini <sstabellini@kernel.org>
      Signed-off-by: NStefano Stabellini <sstabellini@kernel.org>
      a8036336
    • O
      xen-disk: use g_new0 to fix build · a3fd781f
      Olaf Hering 提交于
      g_malloc0_n is available since glib-2.24. To allow build with older glib
      versions use the generic g_new0, which is already used in many other
      places in the code.
      
      Fixes commit 3284fad7 ("xen-disk: add support for multi-page shared rings")
      Signed-off-by: NOlaf Hering <olaf@aepfle.de>
      Reviewed-by: NStefano Stabellini <sstabellini@kernel.org>
      Signed-off-by: NStefano Stabellini <sstabellini@kernel.org>
      a3fd781f
    • 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 35 次提交