]> git.ipfire.org Git - thirdparty/qemu.git/commit
Merge remote-tracking branch 'remotes/mcayland/qemu-sparc' into staging
authorPeter Maydell <peter.maydell@linaro.org>
Thu, 5 Jun 2014 22:05:07 +0000 (23:05 +0100)
committerPeter Maydell <peter.maydell@linaro.org>
Thu, 5 Jun 2014 22:05:07 +0000 (23:05 +0100)
commit50809c8b9288a9bfe1fdec926b7ef985608a7ea6
treea3110c29be93ca8ffa24b46c53bf046773913764
parent4e627aeef8353a2af151cd2c82aa5eedf79e5534
parentae74bbe7c5b070d26852d6673759d47cd3569722
Merge remote-tracking branch 'remotes/mcayland/qemu-sparc' into staging

* remotes/mcayland/qemu-sparc:
  apb: implement IOMMU translation for PCI host bridge
  apb: handle reading/writing of IOMMU control registers
  apb: fix IOMMU register sizes
  apb: Move IOMMU registers into a separate IOMMUState struct
  tcx: move initialisation from realizefn to initfn
  tcx: move initialisation from SysBusDevice class to TCX class realizefn
  cg3: add extra check to prevent CG3 register array overflow
  cg3: move initialisation from realizefn to initfn

Signed-off-by: Peter Maydell <peter.maydell@linaro.org>