qemu-commits
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

[Qemu-commits] [qemu/qemu] 3d1ad1: tests/vhost-user-bridge: remove false


From: GitHub
Subject: [Qemu-commits] [qemu/qemu] 3d1ad1: tests/vhost-user-bridge: remove false comment
Date: Mon, 09 Jan 2017 08:30:03 -0800

  Branch: refs/heads/master
  Home:   https://github.com/qemu/qemu
  Commit: 3d1ad18c4257471cd5fda8397a46457735027b2c
      
https://github.com/qemu/qemu/commit/3d1ad18c4257471cd5fda8397a46457735027b2c
  Author: Marc-André Lureau <address@hidden>
  Date:   2016-12-16 (Fri, 16 Dec 2016)

  Changed paths:
    M tests/vhost-user-bridge.c

  Log Message:
  -----------
  tests/vhost-user-bridge: remove false comment

dispatcher_remove() is in use.

Signed-off-by: Marc-André Lureau <address@hidden>
Reviewed-by: Michael S. Tsirkin <address@hidden>
Signed-off-by: Michael S. Tsirkin <address@hidden>


  Commit: 4e4212d0566e4daa0b8eff9029cafb4a6ac207c1
      
https://github.com/qemu/qemu/commit/4e4212d0566e4daa0b8eff9029cafb4a6ac207c1
  Author: Marc-André Lureau <address@hidden>
  Date:   2016-12-16 (Fri, 16 Dec 2016)

  Changed paths:
    M tests/vhost-user-bridge.c

  Log Message:
  -----------
  tests/vhost-user-bridge: remove unnecessary dispatcher_remove

The call fd is not watched

Signed-off-by: Marc-André Lureau <address@hidden>
Reviewed-by: Michael S. Tsirkin <address@hidden>
Signed-off-by: Michael S. Tsirkin <address@hidden>


  Commit: 9652f5785e394f099dbc9188ae88860727df44ce
      
https://github.com/qemu/qemu/commit/9652f5785e394f099dbc9188ae88860727df44ce
  Author: Marc-André Lureau <address@hidden>
  Date:   2016-12-16 (Fri, 16 Dec 2016)

  Changed paths:
    M tests/vhost-user-bridge.c

  Log Message:
  -----------
  tests/vhost-user-bridge: indicate peer disconnected

Signed-off-by: Marc-André Lureau <address@hidden>
Reviewed-by: Michael S. Tsirkin <address@hidden>
Signed-off-by: Michael S. Tsirkin <address@hidden>


  Commit: 98206d4e6b719f650b0f2d23bcd4bab83c624341
      
https://github.com/qemu/qemu/commit/98206d4e6b719f650b0f2d23bcd4bab83c624341
  Author: Marc-André Lureau <address@hidden>
  Date:   2016-12-16 (Fri, 16 Dec 2016)

  Changed paths:
    M tests/vhost-user-bridge.c

  Log Message:
  -----------
  tests/vhost-user-bridge: do not accept more than one connection

Signed-off-by: Marc-André Lureau <address@hidden>
Reviewed-by: Michael S. Tsirkin <address@hidden>
Signed-off-by: Michael S. Tsirkin <address@hidden>


  Commit: 7b2e5c65f42fff7a418e2b8216e92f5e0a0c3e7e
      
https://github.com/qemu/qemu/commit/7b2e5c65f42fff7a418e2b8216e92f5e0a0c3e7e
  Author: Marc-André Lureau <address@hidden>
  Date:   2016-12-16 (Fri, 16 Dec 2016)

  Changed paths:
    M Makefile
    M Makefile.objs
    A contrib/libvhost-user/Makefile.objs
    A contrib/libvhost-user/libvhost-user.c
    A contrib/libvhost-user/libvhost-user.h

  Log Message:
  -----------
  contrib: add libvhost-user

Add a library to help implementing vhost-user backend (or slave).

Dealing with vhost-user as an application developer isn't so easy: you
have all the trouble with any protocol: validation, unix ancillary data,
shared memory, eventfd, logging, and on top of that you need to deal
with virtio queues, if possible efficiently.

qemu test has a nice vhost-user testing application vhost-user-bridge,
which implements most of vhost-user, and virtio.c which implements
virtqueues manipulation. Based on these two, I tried to make a simple
library, reusable for tests or development of new vhost-user scenarios.

Signed-off-by: Marc-André Lureau <address@hidden>
[Felipe: set used_idx copy on SET_VRING_ADDR and update shadow avail idx
 on SET_VRING_BASE]
Signed-off-by: Felipe Franciosi <address@hidden>
Reviewed-by: Michael S. Tsirkin <address@hidden>
Signed-off-by: Michael S. Tsirkin <address@hidden>


  Commit: e10e798c85c2331dab338b6a01835ebde81136e5
      
https://github.com/qemu/qemu/commit/e10e798c85c2331dab338b6a01835ebde81136e5
  Author: Marc-André Lureau <address@hidden>
  Date:   2016-12-16 (Fri, 16 Dec 2016)

  Changed paths:
    M tests/Makefile.include
    M tests/vhost-user-bridge.c

  Log Message:
  -----------
  tests/vhost-user-bridge: use contrib/libvhost-user

Use the libvhost-user library.

This ended up being a rather large patch that cannot be easily splitted,
due to massive code move and API changes.

Signed-off-by: Marc-André Lureau <address@hidden>
Reviewed-by: Michael S. Tsirkin <address@hidden>
Signed-off-by: Michael S. Tsirkin <address@hidden>


  Commit: d9429b84af2302b6e28bec3c52710cf67eda3cee
      
https://github.com/qemu/qemu/commit/d9429b84af2302b6e28bec3c52710cf67eda3cee
  Author: Prasad J Pandit <address@hidden>
  Date:   2016-12-16 (Fri, 16 Dec 2016)

  Changed paths:
    M hw/i386/amd_iommu.c
    M hw/i386/amd_iommu.h

  Log Message:
  -----------
  i386: amd_iommu: fix MMIO register count and access

IOMMU MMIO registers are divided in two groups by their offsets.
Low offsets(<0x2000) registers are grouped into 'amdvi_mmio_low'
table and higher offsets(>=0x2000) registers are grouped into
'amdvi_mmio_high' table. No of registers in each table is given
by macro 'AMDVI_MMIO_REGS_LOW' and 'AMDVI_MMIO_REGS_HIGH' resp.
Values of these two macros were swapped, resulting in an OOB
access when reading 'amdvi_mmio_high' table. Correct these two
macros. Also read from 'amdvi_mmio_low' table for lower address.

Reported-by: Azureyang <address@hidden>
Signed-off-by: Prasad J Pandit <address@hidden>
Reviewed-by: Michael S. Tsirkin <address@hidden>
Signed-off-by: Michael S. Tsirkin <address@hidden>


  Commit: d93ddfb1f8fb72a7c175a8cf1028c639f769d105
      
https://github.com/qemu/qemu/commit/d93ddfb1f8fb72a7c175a8cf1028c639f769d105
  Author: Michael S. Tsirkin <address@hidden>
  Date:   2016-12-16 (Fri, 16 Dec 2016)

  Changed paths:
    M hw/pci/pci.c

  Log Message:
  -----------
  pci: fix error message for express slots

PCI Express downstream slot has a single PCI slot
behind it, using PCI_DEVFN(PCI_SLOT(devfn), 0)
does not give you function 0 in cases such as ARI
as well as some error cases.

This is exactly what we are hitting:
   $ qemu-system-x86_64 -machine q35 -readconfig docs/q35-chipset.cfg
-monitor stdio
   (qemu) device_add e1000e,bus=ich9-pcie-port-4,addr=00
   (qemu) device_add e1000e,bus=ich9-pcie-port-4,addr=08
   Segmentation fault (core dumped)

The fix is to use the pci_get_function_0 API.

Cc: address@hidden
Signed-off-by: Michael S. Tsirkin <address@hidden>
Reported-by: Eduardo Habkost <address@hidden>
Tested-by: Cao jin <address@hidden>
Tested-by: Eduardo Habkost <address@hidden>
Reviewed-by: Eduardo Habkost <address@hidden>


  Commit: 2858bc68701e282c404ed04d65d4f065e4b40e52
      
https://github.com/qemu/qemu/commit/2858bc68701e282c404ed04d65d4f065e4b40e52
  Author: Wei Huang <address@hidden>
  Date:   2016-12-16 (Fri, 16 Dec 2016)

  Changed paths:
    M hw/s390x/virtio-ccw.c
    M hw/virtio/virtio-mmio.c

  Log Message:
  -----------
  virtio: avoid using guest_notifier_mask in vhost-user mode

Because guest mask notifier cannot be used in vhost-user mode, a boolean
flag "use_guest_notifier_mask" was added in commit 5669655aafd to disable
the use of guest mask notifier under virtio-pci. However this flag wasn't
checked in other virtio devices, such as virtio-mmio. In our tests, it
caused assertion error under "vhost-user + virtio-mmio". This patch
addresses this problem by adding a check before guest_notifier_mask is
called.

Signed-off-by: Wei Huang <address@hidden>
Reviewed-by: Michael S. Tsirkin <address@hidden>
Signed-off-by: Michael S. Tsirkin <address@hidden>


  Commit: 77424a452abe5f941d8cd81f1e85f42bca31c9ef
      
https://github.com/qemu/qemu/commit/77424a452abe5f941d8cd81f1e85f42bca31c9ef
  Author: Peter Maydell <address@hidden>
  Date:   2017-01-09 (Mon, 09 Jan 2017)

  Changed paths:
    M Makefile
    M Makefile.objs
    A contrib/libvhost-user/Makefile.objs
    A contrib/libvhost-user/libvhost-user.c
    A contrib/libvhost-user/libvhost-user.h
    M hw/i386/amd_iommu.c
    M hw/i386/amd_iommu.h
    M hw/pci/pci.c
    M hw/s390x/virtio-ccw.c
    M hw/virtio/virtio-mmio.c
    M tests/Makefile.include
    M tests/vhost-user-bridge.c

  Log Message:
  -----------
  Merge remote-tracking branch 'remotes/mst/tags/for_upstream' into staging

virtio, vhost, pc: fixes

Here are some bugfixes that didn't make 2.8.

Signed-off-by: Michael S. Tsirkin <address@hidden>

# gpg: Signature made Fri 16 Dec 2016 21:13:43 GMT
# gpg:                using RSA key 0x281F0DB8D28D5469
# gpg: Good signature from "Michael S. Tsirkin <address@hidden>"
# gpg:                 aka "Michael S. Tsirkin <address@hidden>"
# Primary key fingerprint: 0270 606B 6F3C DF3D 0B17  0970 C350 3912 AFBE 8E67
#      Subkey fingerprint: 5D09 FD08 71C8 F85B 94CA  8A0D 281F 0DB8 D28D 5469

* remotes/mst/tags/for_upstream:
  virtio: avoid using guest_notifier_mask in vhost-user mode
  pci: fix error message for express slots
  i386: amd_iommu: fix MMIO register count and access
  tests/vhost-user-bridge: use contrib/libvhost-user
  contrib: add libvhost-user
  tests/vhost-user-bridge: do not accept more than one connection
  tests/vhost-user-bridge: indicate peer disconnected
  tests/vhost-user-bridge: remove unnecessary dispatcher_remove
  tests/vhost-user-bridge: remove false comment

Signed-off-by: Peter Maydell <address@hidden>


Compare: https://github.com/qemu/qemu/compare/dba5c337c832...77424a452abe

reply via email to

[Prev in Thread] Current Thread [Next in Thread]