1. 06 2月, 2017 4 次提交
    • P
      Merge remote-tracking branch 'remotes/dgibson/tags/isa-cleanup-20170206' into staging · c1923252
      Peter Maydell 提交于
      Allow ISA to be disabled on some platforms (v3)
      
      This makes some cleanups that are a start on allowing ISA to be
      compiled out for platforms which don't use it.
      
      I posted this series last November, and it collected a number of R-bs
      and no apparent objections.  So, I've now rebased it (trivially) and
      am sending a pull request in the hopes of merge.  A lot of the pieces
      here don't have a clear maintainer, so I'm sending it directly to
      Peter.
      
      Notes:
        * Patch 3/3 triggers a style warning, but that's just because I'm
          moving a C++ // comment verbatim from one file to another
      
      Changes since v2:
        * Trivial rebase
      
      Changes since v1:
        * Fixed some silly compile errors in 3/3 exposed by some
          changes in other headers
      
      # gpg: Signature made Mon 06 Feb 2017 01:37:50 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/isa-cleanup-20170206:
        Split ISA and sysbus versions of m48t59 device
        Allow ISA bus to be configured out
        Split serial-isa into its own config option
      Signed-off-by: NPeter Maydell <peter.maydell@linaro.org>
      c1923252
    • D
      Split ISA and sysbus versions of m48t59 device · c124c4d1
      David Gibson 提交于
      The m48t59 device supports both ISA and direct sysbus attached versions of
      the device in the one .c file.  This can be awkward for some embedded
      machine types which need the sysbus M48T59, but don't want to pull in the
      ISA bus code and its other dependencies.
      
      Therefore, this patch splits out the code for the ISA attached M48T59 into
      its own C file.  It will be built when both CONFIG_M48T59 and
      CONFIG_ISA_BUS are enabled.
      Signed-off-by: NDavid Gibson <david@gibson.dropbear.id.au>
      Reviewed-by: NEdgar E. Iglesias <edgar.iglesias@xilinx.com>
      Reviewed-by: NMichael S. Tsirkin <mst@redhat.com>
      c124c4d1
    • D
      Allow ISA bus to be configured out · 1fc125f5
      David Gibson 提交于
      Currently, the code to handle the legacy ISA bus is always included in
      qemu.  However there are lots of platforms that don't include ISA legacy
      devies, and quite a few that have never used ISA legacy devices at all.
      
      This patch allows the ISA bus code to be disabled in the configuration for
      platforms where it doesn't make sense.
      
      For now, the default configs are adjusted to include ISA on all platforms
      including PCI: anything with PCI can at least in principle add an i82378
      PCI->ISA bridge.  Also, CONFIG_IDE_CORE which is already in pci.mak
      requires ISA support.
      
      We also explicitly enable ISA on some other non-PCI platforms which include
      ISA devices: moxie, sparc and unicore32.  We may want to pare this down in
      future.
      
      The platforms that will lose ISA by default are: cris, lm32, microblazeel,
      microblaze, openrisc, s390x, tricore, xtensaeb, xtensa.  As far as I can
      tell none of these ever used ISA.
      Signed-off-by: NDavid Gibson <david@gibson.dropbear.id.au>
      Acked-by: NMichael S. Tsirkin <mst@redhat.com>
      Reviewed-by: NMarkus Armbruster <armbru@redhat.com>
      Reviewed-by: NEdgar E. Iglesias <edgar.iglesias@xilinx.com>
      Reviewed-by: NMichael S. Tsirkin <mst@redhat.com>
      1fc125f5
    • D
      Split serial-isa into its own config option · 1401c322
      David Gibson 提交于
      At present, the core device model code for 8250-like serial ports
      (serial.c) and the code for serial ports attached to ISA-style legacy IO
      (serial-isa.c) are both controlled by the CONFIG_SERIAL variable.
      
      There are lots and lots of embedded platforms that have 8250-like serial
      ports but have never had anything resembling ISA legacy IO.  Therefore,
      split serial-isa into its own CONFIG_SERIAL_ISA option so it can be
      disabled for platforms where it's not appropriate.
      
      For now, I enabled CONFIG_SERIAL_ISA in every default-config where
      CONFIG_SERIAL is enabled, excepting microblaze, or32, and xtensa.  As best
      as I can tell, those platforms never used legacy ISA, and also don't
      include PCI support (which would allow connection of a PCI->ISA bridge
      and/or a southbridge including legacy ISA serial ports).
      Signed-off-by: NDavid Gibson <david@gibson.dropbear.id.au>
      Reviewed-by: NThomas Huth <thuth@redhat.com>
      Acked-by: NChristian Borntraeger <borntraeger@de.ibm.com>
      Reviewed-by: NMarkus Armbruster <armbru@redhat.com>
      Reviewed-by: NEdgar E. Iglesias <edgar.iglesias@xilinx.com>
      Reviewed-by: NMichael S. Tsirkin <mst@redhat.com>
      1401c322
  2. 03 2月, 2017 8 次提交
    • P
      Merge remote-tracking branch 'remotes/stefanha/tags/block-pull-request' into staging · a951316b
      Peter Maydell 提交于
      # gpg: Signature made Fri 03 Feb 2017 14:37:45 GMT
      # gpg:                using RSA key 0x9CA4ABB381AB73C8
      # gpg: Good signature from "Stefan Hajnoczi <stefanha@redhat.com>"
      # gpg:                 aka "Stefan Hajnoczi <stefanha@gmail.com>"
      # Primary key fingerprint: 8695 A8BF D3F9 7CDA AC35  775A 9CA4 ABB3 81AB 73C8
      
      * remotes/stefanha/tags/block-pull-request:
        iothread: enable AioContext polling by default
      Signed-off-by: NPeter Maydell <peter.maydell@linaro.org>
      a951316b
    • S
      iothread: enable AioContext polling by default · cdd7abfd
      Stefan Hajnoczi 提交于
      IOThread AioContexts are likely to consist only of event sources like
      virtqueue ioeventfds and LinuxAIO completion eventfds that are pollable
      from userspace (without system calls).
      
      We recently merged the AioContext polling feature but didn't enable it
      by default yet.  I have gone back over the performance data on the
      mailing list and picked a default polling value that gave good results.
      
      Let's enable AioContext polling by default so users don't have another
      switch they need to set manually.  If performance regressions are found
      we can still disable this for the QEMU 2.9 release.
      
      Cc: Paolo Bonzini <pbonzini@redhat.com>
      Cc: Christian Borntraeger <borntraeger@de.ibm.com>
      Cc: Karl Rister <krister@redhat.com>
      Signed-off-by: NStefan Hajnoczi <stefanha@redhat.com>
      Message-id: 20170126170119.27876-1-stefanha@redhat.com
      Signed-off-by: NStefan Hajnoczi <stefanha@redhat.com>
      cdd7abfd
    • P
      Merge remote-tracking branch 'remotes/sstabellini/tags/xen-20170202' into staging · 4100a344
      Peter Maydell 提交于
      Xen 2017/02/02
      
      # gpg: Signature made Thu 02 Feb 2017 18:26:58 GMT
      # gpg:                using RSA key 0x894F8F4870E1AE90
      # gpg: Good signature from "Stefano Stabellini <sstabellini@kernel.org>"
      # gpg:                 aka "Stefano Stabellini <stefano.stabellini@eu.citrix.com>"
      # Primary key fingerprint: D04E 33AB A51F 67BA 07D3  0AEA 894F 8F48 70E1 AE90
      
      * remotes/sstabellini/tags/xen-20170202:
        xen: use qdev_unplug() instead of g_free() in xen_pv_find_xendev()
        MAINTAINERS: Update xen-devel mailing list address
        xen-platform: add missing disk unplug option
        xen-platform: add support for unplugging NVMe disks...
        xen-platform: re-structure unplug_disks
      Signed-off-by: NPeter Maydell <peter.maydell@linaro.org>
      4100a344
    • S
      tci: Remove invalid assertions · 77e217d1
      Stefan Weil 提交于
      tb_jmp_insn_offset and tb_jmp_reset_offset are pointers
      and cannot be used with ARRAY_SIZE.
      Signed-off-by: NStefan Weil <sw@weilnetz.de>
      Acked-by: NMichael S. Tsirkin <mst@redhat.com>
      Message-id: 20170202195601.11286-1-sw@weilnetz.de
      Signed-off-by: NPeter Maydell <peter.maydell@linaro.org>
      77e217d1
    • P
      Merge remote-tracking branch 'remotes/kraxel/tags/pull-vga-20170202-2' into staging · 5b66d7ae
      Peter Maydell 提交于
      cirrus: multiple bugfixes, including CVE-2017-2615 fix.
      
      # gpg: Signature made Thu 02 Feb 2017 15:03:35 GMT
      # gpg:                using RSA key 0x4CB6D8EED3E87138
      # gpg: Good signature from "Gerd Hoffmann (work) <kraxel@redhat.com>"
      # gpg:                 aka "Gerd Hoffmann <gerd@kraxel.org>"
      # gpg:                 aka "Gerd Hoffmann (private) <kraxel@gmail.com>"
      # Primary key fingerprint: A032 8CFF B93A 17A7 9901  FE7D 4CB6 D8EE D3E8 7138
      
      * remotes/kraxel/tags/pull-vga-20170202-2:
        cirrus: fix oob access issue (CVE-2017-2615)
        cirrus: fix blit address mask handling
        cirrus: allow zero source pitch in pattern fill rops
        cirrus: handle negative pitch in cirrus_invalidate_region()
      Signed-off-by: NPeter Maydell <peter.maydell@linaro.org>
      5b66d7ae
    • P
      Merge remote-tracking branch 'remotes/dgibson/tags/ppc-for-2.9-20170202' into staging · 5459ef3b
      Peter Maydell 提交于
      ppc patch queue 2017-02-02
      
      This obsoletes ppc-for-2.9-20170112, which had a MacOS build bug.
      
      This is a long overdue ppc pull request for qemu-2.9.  It's been a
      long time coming due to some holidays and inconveniently timed
      problems with testing.  So, there's a lot in here:
      
          * More POWER9 instruction implementations for TCG
          * The simpler parts of my CPU compatibility mode cleanup
              * This changes behaviour to prefer compatibility modes over
                "raW" mode for new machine type versions
          * New "40p" machine type which is essentially a modernized and
            cleaned up "prep".  The intention is that it will replace "prep"
            once it has some more testing and polish.
          * Add pseries-2.9 machine type
          * Implement H_SIGNAL_SYS_RESET hypercall
          * Consolidate the two alternate CPU init paths in pseries by
            making it always go through CPU core objects to initialize CPU
          * A number of bugfixes and cleanups
          * Stop the guest timebase when the guest is stopped under KVM.
            This makes the guest system clock also stop when paused, which
            matches the x86 behaviour.
          * Some preliminary cleanups leading towards implementation of the
            POWER9 MMU.
      
      There are also some changes not strictly related to ppc code, but for
      its benefit:
      
          * Limit the pxi-expander-bridge (PXB) device to x86 guests only
            (it's essentially a hack to work around historical x86
            limitations)
          * Some additions to the 128-bit math in host_utils, necessary for
            some of the new instructions.
          * Revise a number of qtests and enable them for ppc
      
      # gpg: Signature made Thu 02 Feb 2017 01:40:16 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.9-20170202: (107 commits)
        hw/ppc/pnv: Use error_report instead of hw_error if a ROM file can't be found
        ppc/kvm: Handle the "family" CPU via alias instead of registering new types
        target/ppc/mmu_hash64: Fix incorrect shift value in amr calculation
        target/ppc/mmu_hash64: Fix printing unsigned as signed int
        tcg/POWER9: NOOP the cp_abort instruction
        target/ppc/debug: Print LPCR register value if register exists
        target-ppc: Add xststdc[sp, dp, qp] instructions
        target-ppc: Add xvtstdc[sp,dp] instructions
        target-ppc: Add MMU model check for booke machines
        ppc: switch to constants within BUILD_BUG_ON
        target/ppc/cpu-models: Fix/remove bad CPU aliases
        target/ppc: Remove unused POWERPC_FAMILY(POWER)
        spapr: clock should count only if vm is running
        ppc: Remove unused function cpu_ppc601_rtc_init()
        target/ppc: Add pcr_supported to POWER9 cpu class definition
        powerpc/cpu-models: rename ISAv3.00 logical PVR definition
        target-ppc: Add xvcv[hpsp, sphp] instructions
        target-ppc: Add xsmulqp instruction
        target-ppc: Add xsdivqp instruction
        target-ppc: Add xscvsdqp and xscvudqp instructions
        ...
      
      # Conflicts:
      #	hw/pci-bridge/Makefile.objs
      Signed-off-by: NPeter Maydell <peter.maydell@linaro.org>
      5459ef3b
    • J
      xen: use qdev_unplug() instead of g_free() in xen_pv_find_xendev() · e9dcbc86
      Juergen Gross 提交于
      The error exits of xen_pv_find_xendev() free the new xen-device via
      g_free() which is wrong.
      
      As the xen-device has been initialized as qdev it must be removed
      via qdev_unplug().
      
      This bug has been introduced with commit 3a6c9172
      ("xen: create qdev for each backend device").
      Reported-by: NRoger Pau Monné <roger.pau@citrix.com>
      Tested-by: NRoger Pau Monné <roger.pau@citrix.com>
      Signed-off-by: NJuergen Gross <jgross@suse.com>
      Reviewed-by: NStefano Stabellini <sstabellini@kernel.org>
      e9dcbc86
    • P
      Merge remote-tracking branch 'remotes/stefanha/tags/tracing-pull-request' into staging · 4e9f5244
      Peter Maydell 提交于
      # gpg: Signature made Wed 01 Feb 2017 13:44:32 GMT
      # gpg:                using RSA key 0x9CA4ABB381AB73C8
      # gpg: Good signature from "Stefan Hajnoczi <stefanha@redhat.com>"
      # gpg:                 aka "Stefan Hajnoczi <stefanha@gmail.com>"
      # Primary key fingerprint: 8695 A8BF D3F9 7CDA AC35  775A 9CA4 ABB3 81AB 73C8
      
      * remotes/stefanha/tags/tracing-pull-request:
        trace: clean up trace-events files
        qapi: add missing trace_visit_type_enum() call
        trace: improve error reporting when parsing simpletrace header
        trace: update docs to reflect new code generation approach
        trace: switch to modular code generation for sub-directories
        trace: move setting of group name into Makefiles
        trace: move hw/i386/xen events to correct subdir
        trace: move hw/xen events to correct subdir
        trace: move hw/block/dataplane events to correct subdir
        make: move top level dir to end of include search path
      
      # Conflicts:
      #	Makefile
      Signed-off-by: NPeter Maydell <peter.maydell@linaro.org>
      4e9f5244
  3. 02 2月, 2017 14 次提交
  4. 01 2月, 2017 14 次提交