mbox

[PULL,v2] virtio,pc features, fixes

Message ID 1443124395-19435-1-git-send-email-mst@redhat.com
State New
Headers show

Pull-request

git://git.kernel.org/pub/scm/virt/kvm/mst/qemu.git tags/for_upstream

Message

Michael S. Tsirkin Sept. 24, 2015, 7:54 p.m. UTC
Same as v1 but 2 last patches dropped.
Not reposting since patches left are the same.

The following changes since commit fefa4b128de06cec6d513f00ee61e8208aed4a87:

  Merge remote-tracking branch 'remotes/awilliam/tags/vfio-update-20150923.0' into staging (2015-09-23 21:39:46 +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 2d0c513cb66b21d5a7c4692e2092af9e997fd251:

  MAINTAINERS: add more devices to the PCI section (2015-09-24 16:27:53 +0300)

----------------------------------------------------------------
virtio,pc features, fixes

New features:
    vhost-user multiqueue support
    virtio-ccw virtio 1 support
    pci bridge support in iommu

Signed-off-by: Michael S. Tsirkin <mst@redhat.com>

----------------------------------------------------------------
Changchun Ouyang (2):
      vhost-user: add multiple queue support
      vhost-user: add a new message to disable/enable a specific virt queue.

Cornelia Huck (4):
      virtio: ring sizes vs. reset
      virtio-ccw: support ring size changes
      virtio-ccw: feature bits > 31 handling
      virtio-ccw: enable virtio-1

Eduardo Habkost (3):
      q35: Move options common to all classes to pc_q35_machine_options()
      q35: Move options common to all classes to pc_i440fx_machine_options()
      pc: Introduce pc-*-2.5 machine classes

Jason Wang (1):
      virtio-net: unbreak self announcement and guest offloads after migration

Knut Omang (1):
      intel_iommu: Add support for translation for devices behind bridges

Michael S. Tsirkin (1):
      vhost-user: add protocol feature negotiation

Paolo Bonzini (2):
      MAINTAINERS: add more devices to the PC section
      MAINTAINERS: add more devices to the PCI section

Pierre Morel (1):
      virtio: right size for virtio_queue_get_avail_size

Yuanhan Liu (4):
      vhost-user: use VHOST_USER_XXX macro for switch statement
      vhost: rename VHOST_RESET_OWNER to VHOST_RESET_DEVICE
      vhost-user: add VHOST_USER_GET_QUEUE_NUM message
      vhost: introduce vhost_backend_get_vq_index method

 qapi-schema.json                  |   6 +-
 hw/s390x/virtio-ccw.h             |   6 +-
 include/hw/compat.h               |   3 +
 include/hw/i386/intel_iommu.h     |  16 ++++-
 include/hw/i386/pc.h              |   4 ++
 include/hw/virtio/vhost-backend.h |   4 ++
 include/hw/virtio/vhost.h         |   2 +
 include/net/vhost_net.h           |   3 +
 linux-headers/linux/vhost.h       |   2 +-
 hw/i386/intel_iommu.c             |  90 +++++++++++++++++++-----
 hw/i386/pc_piix.c                 |  22 ++++--
 hw/i386/pc_q35.c                  |  22 ++++--
 hw/net/vhost_net.c                |  44 ++++++++++--
 hw/net/virtio-net.c               |  48 ++++++++-----
 hw/pci-host/q35.c                 |  25 +------
 hw/s390x/s390-virtio-ccw.c        |  20 ++++++
 hw/s390x/virtio-ccw.c             |  64 ++++++++++++-----
 hw/virtio/vhost-backend.c         |  10 ++-
 hw/virtio/vhost-user.c            | 139 +++++++++++++++++++++++++++++++------
 hw/virtio/vhost.c                 |  20 +++---
 hw/virtio/virtio.c                |  66 +++++++++++++++++-
 net/vhost-user.c                  | 141 +++++++++++++++++++++++++-------------
 tests/vhost-user-test.c           |   2 +-
 MAINTAINERS                       |  21 ++++++
 docs/specs/vhost-user.txt         |  77 ++++++++++++++++++++-
 qemu-options.hx                   |   5 +-
 26 files changed, 681 insertions(+), 181 deletions(-)

Comments

Peter Maydell Sept. 24, 2015, 9:08 p.m. UTC | #1
On 24 September 2015 at 12:54, Michael S. Tsirkin <mst@redhat.com> wrote:
> Same as v1 but 2 last patches dropped.
> Not reposting since patches left are the same.
>
> The following changes since commit fefa4b128de06cec6d513f00ee61e8208aed4a87:
>
>   Merge remote-tracking branch 'remotes/awilliam/tags/vfio-update-20150923.0' into staging (2015-09-23 21:39:46 +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 2d0c513cb66b21d5a7c4692e2092af9e997fd251:
>
>   MAINTAINERS: add more devices to the PCI section (2015-09-24 16:27:53 +0300)
>
> ----------------------------------------------------------------
> virtio,pc features, fixes
>
> New features:
>     vhost-user multiqueue support
>     virtio-ccw virtio 1 support
>     pci bridge support in iommu
>
> Signed-off-by: Michael S. Tsirkin <mst@redhat.com>

Fails to build with our minimal glib version:
Undefined symbols for architecture x86_64:
  "_g_hash_table_add", referenced from:
      _vtd_find_add_as in intel_iommu.o
  SETFILE lm32-softmmu/qemu-system-lm32

g_hash_table_add only appeared in glib 2.32; our minimum
is 2.22.

thanks
-- PMM
Peter Maydell Sept. 24, 2015, 9:10 p.m. UTC | #2
On 24 September 2015 at 14:08, Peter Maydell <peter.maydell@linaro.org> wrote:
> On 24 September 2015 at 12:54, Michael S. Tsirkin <mst@redhat.com> wrote:
>> Same as v1 but 2 last patches dropped.
>> Not reposting since patches left are the same.
>>
>> The following changes since commit fefa4b128de06cec6d513f00ee61e8208aed4a87:
>>
>>   Merge remote-tracking branch 'remotes/awilliam/tags/vfio-update-20150923.0' into staging (2015-09-23 21:39:46 +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 2d0c513cb66b21d5a7c4692e2092af9e997fd251:
>>
>>   MAINTAINERS: add more devices to the PCI section (2015-09-24 16:27:53 +0300)
>>
>> ----------------------------------------------------------------
>> virtio,pc features, fixes
>>
>> New features:
>>     vhost-user multiqueue support
>>     virtio-ccw virtio 1 support
>>     pci bridge support in iommu
>>
>> Signed-off-by: Michael S. Tsirkin <mst@redhat.com>
>
> Fails to build with our minimal glib version:

...and also on 32-bit:
/root/qemu/hw/i386/intel_iommu.c: In function ‘vtd_find_add_as’:
/root/qemu/hw/i386/intel_iommu.c:1869:20: error: cast from pointer to
integer of different size [-Werror=pointer-to-int-cast]
/root/qemu/hw/i386/intel_iommu.c:1877:15: error: cast from pointer to
integer of different size [-Werror=pointer-to-int-cast]

-- PMM