1. 11 1月, 2018 4 次提交
    • P
      Merge remote-tracking branch 'remotes/dgibson/tags/ppc-for-2.12-20180111' into staging · e890966d
      Peter Maydell 提交于
      ppc patch queue 2018-01-11
      
      This pull request supersedes ppc-for-2.12-20180108 and several before
      it.  The earlier pull request included a patch which exposed a bug in
      the ARM TCG backend.  I've pulled that out and will repost once the
      ARM bug is fixed (a patch has been posted by Richard Henderson).
      
      Higlights from this series:
        * SLOF update
        * Several new devices for embedded platforms
        * Fix to correctly set compatiblity mode for hotplugged CPUs
        * dtc compile fix for older MacOS versions
      
      # gpg: Signature made Thu 11 Jan 2018 04:58:11 GMT
      # gpg:                using RSA key 0x6C38CACA20D9B392
      # gpg: Good signature from "David Gibson <david@gibson.dropbear.id.au>"
      # gpg:                 aka "David Gibson (Red Hat) <dgibson@redhat.com>"
      # gpg:                 aka "David Gibson (ozlabs.org) <dgibson@ozlabs.org>"
      # gpg:                 aka "David Gibson (kernel.org) <dwg@kernel.org>"
      # Primary key fingerprint: 75F4 6586 AE61 A66C C44E  87DC 6C38 CACA 20D9 B392
      
      * remotes/dgibson/tags/ppc-for-2.12-20180111:
        spapr: Correct compatibility mode setting for hotplugged CPUs
        hw/ppc: Remove the deprecated spapr-pci-vfio-host-bridge device
        Update dtc to fix compilation problem on Mac OS 10.6
        target/ppc: more use of the PPC_*() macros
        ppc/pnv: change powernv_ prefix to pnv_ for overall naming consistency
        hw/ide: Emulate SiI3112 SATA controller
        spapr_pci: use warn_report()
        ppc4xx_i2c: Implement basic I2C functions
        sm501: Add some more unimplemented registers
        sm501: Add panel hardware cursor registers also to read function
        pseries: Update SLOF firmware image to qemu-slof-20171214
      Signed-off-by: NPeter Maydell <peter.maydell@linaro.org>
      e890966d
    • P
      Merge remote-tracking branch 'remotes/ericb/tags/pull-nbd-2018-01-10' into staging · 612061b2
      Peter Maydell 提交于
      nbd patches for 2018-01-10
      
      - Vladimir Sementsov-Ogievskiy: nbd: rename nbd_option and nbd_opt_reply
      - Vladimir Sementsov-Ogievskiy: nbd/server: add additional assert to nbd_export_put
      
      # gpg: Signature made Wed 10 Jan 2018 22:53:49 GMT
      # gpg:                using RSA key 0xA7A16B4A2527436A
      # gpg: Good signature from "Eric Blake <eblake@redhat.com>"
      # gpg:                 aka "Eric Blake (Free Software Programmer) <ebb9@byu.net>"
      # gpg:                 aka "[jpeg image of size 6874]"
      # Primary key fingerprint: 71C2 CC22 B1C4 6029 27D2  F3AA A7A1 6B4A 2527 436A
      
      * remotes/ericb/tags/pull-nbd-2018-01-10:
        nbd: rename nbd_option and nbd_opt_reply
        nbd/server: add additional assert to nbd_export_put
      Signed-off-by: NPeter Maydell <peter.maydell@linaro.org>
      612061b2
    • P
      Merge remote-tracking branch 'remotes/mcayland/tags/qemu-sparc-signed' into staging · 7642f96e
      Peter Maydell 提交于
      qemu-sparc update
      
      # gpg: Signature made Tue 09 Jan 2018 22:12:22 GMT
      # gpg:                using RSA key 0x5BC2C56FAE0F321F
      # gpg: Good signature from "Mark Cave-Ayland <mark.cave-ayland@ilande.co.uk>"
      # Primary key fingerprint: CC62 1AB9 8E82 200D 915C  C9C4 5BC2 C56F AE0F 321F
      
      * remotes/mcayland/tags/qemu-sparc-signed: (25 commits)
        sun4u_iommu: add trace event for IOMMU translations
        sun4u_iommu: convert from IOMMU_DPRINTF to trace-events
        sun4u_iommu: update to reflect IOMMU is no longer part of the APB device
        sun4u: split IOMMU device out from apb.c to sun4u_iommu.c
        apb: QOMify IOMMU
        sun4m: remove include/hw/sparc/sun4m.h and all references to it
        sun4m: move IOMMU declarations from sun4m.h to sun4m_iommu.h
        sun4m: move sun4m_iommu.c from hw/dma to hw/sparc
        sun4u: switch from EBUS_DPRINTF() macro to trace-events
        sparc64: introduce trace-events for hw/sparc64
        apb: replace OBIO interrupt numbers in pci_pbmA_map_irq() with constants
        ebus: wire up OBIO interrupts to APB pbm via qdev GPIOs
        apb: remove busA property from PBMPCIBridge state
        apb: split pci_pbm_map_irq() into separate functions for bus A and bus B
        apb: remove pci_apb_init() and instantiate APB device using qdev
        apb: move the two secondary PCI bridges objects into APBState
        apb: use gpios to wire up the apb device to the SPARC CPU IRQs
        apb: return APBState from pci_apb_init() rather than PCIBus
        apb: APB QOMify tidy-up
        sun4u: move initialisation of all ISABus devices into ebus_realize()
        ...
      Signed-off-by: NPeter Maydell <peter.maydell@linaro.org>
      7642f96e
    • V
      nbd: rename nbd_option and nbd_opt_reply · 420a4e95
      Vladimir Sementsov-Ogievskiy 提交于
      Rename nbd_option and nbd_opt_reply to NBDOption and NBDOptionReply
      to correspond to Qemu coding style and other structures here.
      Signed-off-by: NVladimir Sementsov-Ogievskiy <vsementsov@virtuozzo.com>
      Reviewed-by: NEric Blake <eblake@redhat.com>
      Message-Id: <20171122101958.17065-5-vsementsov@virtuozzo.com>
      Signed-off-by: NEric Blake <eblake@redhat.com>
      420a4e95
  2. 10 1月, 2018 36 次提交