Message ID | 1444985258-6605-1-git-send-email-mst@redhat.com |
---|---|
State | New |
Headers | show |
On 16 October 2015 at 09:49, Michael S. Tsirkin <mst@redhat.com> wrote: > The following changes since commit b37686f7e84b22cfaf7fd01ac5133f2617cc3027: > > Merge remote-tracking branch 'remotes/stefanha/tags/tracing-pull-request' into staging (2015-10-09 12:18:14 +0100) > > 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 7f31381190755a1aa22c5cd486723b674ab83369: > > vhost: fail backend intialization early (2015-10-16 11:44:15 +0300) > > ---------------------------------------------------------------- > vhost, pc features, fixes > > New features: > VT-d support for devices behind a bridge > > Signed-off-by: Michael S. Tsirkin <mst@redhat.com> Merge conflict in tests/Makefile. Looks trivial but I have a big long queue to process at the moment, so I'm just going to bounce this one, I'm afraid. thanks -- PMM
The following changes since commit b37686f7e84b22cfaf7fd01ac5133f2617cc3027: Merge remote-tracking branch 'remotes/stefanha/tags/tracing-pull-request' into staging (2015-10-09 12:18:14 +0100) 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 7f31381190755a1aa22c5cd486723b674ab83369: vhost: fail backend intialization early (2015-10-16 11:44:15 +0300) ---------------------------------------------------------------- vhost, pc features, fixes New features: VT-d support for devices behind a bridge Signed-off-by: Michael S. Tsirkin <mst@redhat.com> ---------------------------------------------------------------- Igor Mammedov (3): vhost: add vhost_has_free_slot() interface pc-dimm: add vhost slots limit check before commiting to hotplug vhost: fail backend intialization early Knut Omang (1): intel_iommu: Add support for translation for devices behind bridges Marc-André Lureau (1): tests: re-enable vhost-user-test Michael S. Tsirkin (2): exec: factor out duplicate mmap code net: don't set native endianness configure | 1 + include/hw/i386/intel_iommu.h | 16 ++++++- include/hw/virtio/vhost-backend.h | 2 + include/hw/virtio/vhost.h | 2 + include/qemu/mmap-alloc.h | 10 +++++ exec.c | 47 +++++---------------- hw/i386/intel_iommu.c | 89 ++++++++++++++++++++++++++++++++------- hw/mem/pc-dimm.c | 7 +++ hw/pci-host/q35.c | 25 ++--------- hw/virtio/vhost-backend.c | 19 +++++++++ hw/virtio/vhost-user.c | 6 +++ hw/virtio/vhost.c | 27 ++++++++++++ net/net.c | 8 ++++ stubs/vhost.c | 6 +++ util/mmap-alloc.c | 71 +++++++++++++++++++++++++++++++ util/oslib-posix.c | 28 ++---------- stubs/Makefile.objs | 1 + tests/Makefile | 4 +- util/Makefile.objs | 1 + 19 files changed, 266 insertions(+), 104 deletions(-) create mode 100644 include/qemu/mmap-alloc.h create mode 100644 stubs/vhost.c create mode 100644 util/mmap-alloc.c