| Message ID | 1409670380-22943-1-git-send-email-mst@redhat.com |
|---|---|
| State | New |
| Headers | show |
On Tue, Sep 02, 2014 at 06:07:01PM +0300, Michael S. Tsirkin wrote: > The following changes since commit 187de915e8d06aaf82be206aebc551c82bf0670c: > > pcie: fix trailing whitespace (2014-08-25 00:16:07 +0200) > > are available in the git repository at: > > git://git.kernel.org/pub/scm/virt/kvm/mst/qemu.git tags/for_upstream > > for you to fetch changes up to aad4dce934649b3a398396fc2a76f215bb194ea4: > > vhost_net: start/stop guest notifiers properly (2014-09-02 17:33:37 +0300) > > ---------------------------------------------------------------- > pci, pc fixes, features > > A bunch of bugfixes - these will make sense for 2.1.1 > > Initial Intel IOMMU support. > > Signed-off-by: Michael S. Tsirkin <mst@redhat.com> > > ---------------------------------------------------------------- > Gonglei (1): > ioh3420: remove unused ioh3420_init() declaration > > Jason Wang (1): > vhost_net: start/stop guest notifiers properly > > Knut Omang (1): > pci: avoid losing config updates to MSI/MSIX cap regs > > Le Tan (8): > iommu: add is_write as a parameter to the translate function of MemoryRegionIOMMUOps > intel-iommu: introduce Intel IOMMU (VT-d) emulation > intel-iommu: add DMAR table to ACPI tables > intel-iommu: add Intel IOMMU emulation to q35 and add a machine option "iommu" as a switch > intel-iommu: fix coding style issues around in q35.c and machine.c > intel-iommu: add supports for queued invalidation interface > intel-iommu: add context-cache to cache context-entry > intel-iommu: add IOTLB using hash table > > Michael S. Tsirkin (2): > vhost_net: cleanup start/stop condition A problem was reported with this one. I fixed it up, will send v2 pull. > virtio-net: don't run bh on vm stopped > > hw/i386/acpi-defs.h | 40 + > hw/i386/intel_iommu_internal.h | 389 ++++++++ > hw/pci-bridge/ioh3420.h | 4 - > include/exec/memory.h | 2 +- > include/hw/boards.h | 1 + > include/hw/i386/intel_iommu.h | 120 +++ > include/hw/pci-host/q35.h | 2 + > exec.c | 2 +- > hw/alpha/typhoon.c | 3 +- > hw/core/machine.c | 27 +- > hw/i386/acpi-build.c | 39 + > hw/i386/intel_iommu.c | 1963 ++++++++++++++++++++++++++++++++++++++++ > hw/net/vhost_net.c | 39 +- > hw/net/virtio-net.c | 14 +- > hw/pci-host/apb.c | 3 +- > hw/pci-host/q35.c | 58 +- > hw/pci/pci.c | 7 +- > hw/ppc/spapr_iommu.c | 3 +- > hw/virtio/vhost.c | 2 - > vl.c | 4 + > hw/i386/Makefile.objs | 1 + > qemu-options.hx | 5 +- > 22 files changed, 2683 insertions(+), 45 deletions(-) > create mode 100644 hw/i386/intel_iommu_internal.h > create mode 100644 include/hw/i386/intel_iommu.h > create mode 100644 hw/i386/intel_iommu.c >
On 3 September 2014 12:26, Michael S. Tsirkin <mst@redhat.com> wrote: > A problem was reported with this one. > I fixed it up, will send v2 pull. I accidentally just merged the v1 by mistake :-( Sorry about that; I'm going to merge in the v2 (it conflicts in vhost_net.c but fairly trivially so I'll fix that up) and then we should get to where we were intending to go. Apologies for the error. -- PMM
On 4 September 2014 12:11, Peter Maydell <peter.maydell@linaro.org> wrote: > On 3 September 2014 12:26, Michael S. Tsirkin <mst@redhat.com> wrote: >> A problem was reported with this one. >> I fixed it up, will send v2 pull. > > I accidentally just merged the v1 by mistake :-( > Sorry about that; I'm going to merge in the v2 (it conflicts > in vhost_net.c but fairly trivially so I'll fix that up) and then > we should get to where we were intending to go. Apologies > for the error. As discussed on IRC, reverted the incorrect vhost_net commit and then cleanly merged in the v2 pull. Apologies again for this mess. -- PMM
The following changes since commit 187de915e8d06aaf82be206aebc551c82bf0670c: pcie: fix trailing whitespace (2014-08-25 00:16:07 +0200) are available in the git repository at: git://git.kernel.org/pub/scm/virt/kvm/mst/qemu.git tags/for_upstream for you to fetch changes up to aad4dce934649b3a398396fc2a76f215bb194ea4: vhost_net: start/stop guest notifiers properly (2014-09-02 17:33:37 +0300) ---------------------------------------------------------------- pci, pc fixes, features A bunch of bugfixes - these will make sense for 2.1.1 Initial Intel IOMMU support. Signed-off-by: Michael S. Tsirkin <mst@redhat.com> ---------------------------------------------------------------- Gonglei (1): ioh3420: remove unused ioh3420_init() declaration Jason Wang (1): vhost_net: start/stop guest notifiers properly Knut Omang (1): pci: avoid losing config updates to MSI/MSIX cap regs Le Tan (8): iommu: add is_write as a parameter to the translate function of MemoryRegionIOMMUOps intel-iommu: introduce Intel IOMMU (VT-d) emulation intel-iommu: add DMAR table to ACPI tables intel-iommu: add Intel IOMMU emulation to q35 and add a machine option "iommu" as a switch intel-iommu: fix coding style issues around in q35.c and machine.c intel-iommu: add supports for queued invalidation interface intel-iommu: add context-cache to cache context-entry intel-iommu: add IOTLB using hash table Michael S. Tsirkin (2): vhost_net: cleanup start/stop condition virtio-net: don't run bh on vm stopped hw/i386/acpi-defs.h | 40 + hw/i386/intel_iommu_internal.h | 389 ++++++++ hw/pci-bridge/ioh3420.h | 4 - include/exec/memory.h | 2 +- include/hw/boards.h | 1 + include/hw/i386/intel_iommu.h | 120 +++ include/hw/pci-host/q35.h | 2 + exec.c | 2 +- hw/alpha/typhoon.c | 3 +- hw/core/machine.c | 27 +- hw/i386/acpi-build.c | 39 + hw/i386/intel_iommu.c | 1963 ++++++++++++++++++++++++++++++++++++++++ hw/net/vhost_net.c | 39 +- hw/net/virtio-net.c | 14 +- hw/pci-host/apb.c | 3 +- hw/pci-host/q35.c | 58 +- hw/pci/pci.c | 7 +- hw/ppc/spapr_iommu.c | 3 +- hw/virtio/vhost.c | 2 - vl.c | 4 + hw/i386/Makefile.objs | 1 + qemu-options.hx | 5 +- 22 files changed, 2683 insertions(+), 45 deletions(-) create mode 100644 hw/i386/intel_iommu_internal.h create mode 100644 include/hw/i386/intel_iommu.h create mode 100644 hw/i386/intel_iommu.c