[Qemu-commits] [qemu/qemu] 1e40d1: vhost-user-gpu: do not send scanout update if no G...

[Peter Maydell]

  Branch: refs/heads/master
  Home:   https://github.com/qemu/qemu
  Commit: 1e40d19877031120631295348c26f43bea08afed
      
https://github.com/qemu/qemu/commit/1e40d19877031120631295348c26f43bea08afed
  Author: Marc-André Lureau <address@hidden>
  Date:   2019-06-16 (Sun, 16 Jun 2019)

  Changed paths:
    M contrib/vhost-user-gpu/main.c

  Log Message:
  -----------
  vhost-user-gpu: do not send scanout update if no GPU socket

Should fix coverity CID 1401760.

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


  Commit: 24af03b946ce6889a435b2f3fc99daddde127874
      
https://github.com/qemu/qemu/commit/24af03b946ce6889a435b2f3fc99daddde127874
  Author: Marc-André Lureau <address@hidden>
  Date:   2019-06-16 (Sun, 16 Jun 2019)

  Changed paths:
    M contrib/vhost-user-gpu/main.c
    M contrib/vhost-user-input/main.c

  Log Message:
  -----------
  vhost-user: check unix_listen() return value

This check shouldn't be necessary, since &error_fatal is given as
argument and will exit() on failure. However, this change should
silence coverity CID 1401761 & 1401705.

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


  Commit: f55411cf143f868e70cd769171fa1db8953a626e
      
https://github.com/qemu/qemu/commit/f55411cf143f868e70cd769171fa1db8953a626e
  Author: Marc-André Lureau <address@hidden>
  Date:   2019-06-16 (Sun, 16 Jun 2019)

  Changed paths:
    M contrib/vhost-user-gpu/main.c
    M contrib/vhost-user-input/main.c

  Log Message:
  -----------
  vhost-user: improve error report

g_printerr() needs a trailing \n

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


  Commit: be32fd9ee1d85e682d652d11b6e32e7f700420bb
      
https://github.com/qemu/qemu/commit/be32fd9ee1d85e682d652d11b6e32e7f700420bb
  Author: Marc-André Lureau <address@hidden>
  Date:   2019-06-16 (Sun, 16 Jun 2019)

  Changed paths:
    M contrib/vhost-user-input/main.c

  Log Message:
  -----------
  vhost-user-input: check ioctl(EVIOCGNAME) return value

This should fix coverity CID 1401704.

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


  Commit: c715130a6495aeb015813e067f0cfb62f788a6e1
      
https://github.com/qemu/qemu/commit/c715130a6495aeb015813e067f0cfb62f788a6e1
  Author: Marc-André Lureau <address@hidden>
  Date:   2019-06-16 (Sun, 16 Jun 2019)

  Changed paths:
    M contrib/vhost-user-gpu/main.c

  Log Message:
  -----------
  vhost-user-gpu: initialize msghdr & iov at declaration

This should fix uninitialized fields found by coverity CID 1401762.

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


  Commit: 00ab8cb1411720d3aba4ef311651604452a9cdc9
      
https://github.com/qemu/qemu/commit/00ab8cb1411720d3aba4ef311651604452a9cdc9
  Author: Marc-André Lureau <address@hidden>
  Date:   2019-06-16 (Sun, 16 Jun 2019)

  Changed paths:
    M docs/interop/vhost-user.json

  Log Message:
  -----------
  docs/vhost-user.json: some firmware.json copy leftovers

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


  Commit: 240e647a14df9677b3a501f7b8b870e40aac3fd5
      
https://github.com/qemu/qemu/commit/240e647a14df9677b3a501f7b8b870e40aac3fd5
  Author: Li Hangjing <address@hidden>
  Date:   2019-06-16 (Sun, 16 Jun 2019)

  Changed paths:
    M hw/virtio/vhost.c

  Log Message:
  -----------
  vhost: fix vhost_log size overflow during migration

When a guest which doesn't support multiqueue is migrated with a multi queues
vhost-user-blk deivce, a crash will occur like:

0 qemu_memfd_alloc (name=<value optimized out>, size=562949953421312, 
seals=<value optimized out>, fd=0x7f87171fe8b4, errp=0x7f87171fe8a8) at 
util/memfd.c:153
1 0x00007f883559d7cf in vhost_log_alloc (size=70368744177664, share=true) at 
hw/virtio/vhost.c:186
2 0x00007f88355a0758 in vhost_log_get (listener=0x7f8838bd7940, enable=1) at 
qemu-2-12/hw/virtio/vhost.c:211
3 vhost_dev_log_resize (listener=0x7f8838bd7940, enable=1) at 
hw/virtio/vhost.c:263
4 vhost_migration_log (listener=0x7f8838bd7940, enable=1) at 
hw/virtio/vhost.c:787
5 0x00007f88355463d6 in memory_global_dirty_log_start () at memory.c:2503
6 0x00007f8835550577 in ram_init_bitmaps (f=0x7f88384ce600, 
opaque=0x7f8836024098) at migration/ram.c:2173
7 ram_init_all (f=0x7f88384ce600, opaque=0x7f8836024098) at migration/ram.c:2192
8 ram_save_setup (f=0x7f88384ce600, opaque=0x7f8836024098) at 
migration/ram.c:2219
9 0x00007f88357a419d in qemu_savevm_state_setup (f=0x7f88384ce600) at 
migration/savevm.c:1002
10 0x00007f883579fc3e in migration_thread (opaque=0x7f8837530400) at 
migration/migration.c:2382
11 0x00007f8832447893 in start_thread () from /lib64/libpthread.so.0
12 0x00007f8832178bfd in clone () from /lib64/libc.so.6

This is because vhost_get_log_size() returns a overflowed vhost-log size.
In this function, it uses the uninitialized variable vqs->used_phys and
vqs->used_size to get the vhost-log size.

Signed-off-by: Li Hangjing <address@hidden>
Reviewed-by: Xie Yongji <address@hidden>
Reviewed-by: Chai Wen <address@hidden>
Message-Id: <address@hidden>
Cc: address@hidden
Reviewed-by: Michael S. Tsirkin <address@hidden>
Signed-off-by: Michael S. Tsirkin <address@hidden>


  Commit: 82f76c6702e6d376ff5cf0326ea2e30f1e514e8e
      
https://github.com/qemu/qemu/commit/82f76c6702e6d376ff5cf0326ea2e30f1e514e8e
  Author: Wei Yang <address@hidden>
  Date:   2019-06-16 (Sun, 16 Jun 2019)

  Changed paths:
    M hw/acpi/Makefile.objs
    A hw/acpi/utils.c
    M hw/arm/virt-acpi-build.c
    M hw/i386/acpi-build.c
    A include/hw/acpi/utils.h

  Log Message:
  -----------
  hw/acpi: extract acpi_add_rom_blob()

arm and i386 has almost the same function acpi_add_rom_blob(), except
giving different FWCfgCallback function.

This patch moves acpi_add_rom_blob() to utils.c by passing
FWCfgCallback to it.

Signed-off-by: Wei Yang <address@hidden>
Reviewed-by: Igor Mammedov <address@hidden>

v7:
  * rebase on top of current master because of conflict
v6:
  * change author from Igor to Michael
v5:
  * remove unnecessary header glib/gprintf.h
  * rearrange include header to make it more suitable
v4:
  * extract -> moves
  * adjust comment in source to make checkpatch happy
v3:
  * put acpi_add_rom_blob() to hw/acpi/utils.c
v2:
  * remove unused header in original source file
Message-Id: <address@hidden>
Reviewed-by: Michael S. Tsirkin <address@hidden>
Signed-off-by: Michael S. Tsirkin <address@hidden>


  Commit: 4a4418369d6dca4ffa88126413ead743d3841666
      
https://github.com/qemu/qemu/commit/4a4418369d6dca4ffa88126413ead743d3841666
  Author: Gerd Hoffmann <address@hidden>
  Date:   2019-06-16 (Sun, 16 Jun 2019)

  Changed paths:
    M hw/i386/acpi-build.c
    M hw/pci-host/q35.c
    M tests/bios-tables-test-allowed-diff.h

  Log Message:
  -----------
  q35: fix mmconfig and PCI0._CRS

This patch changes the handling of the mmconfig area.  Thanks to the
pci(e) expander devices we already have the logic to exclude address
ranges from PCI0._CRS.  We can simply add the mmconfig address range
to the list get it excluded as well.

With that in place we can go with a fixed pci hole which covers the
whole area from the end of (low) ram to the ioapic.

This will make the whole logic alot less fragile.  No matter where the
firmware places the mmconfig xbar, things should work correctly.  The
guest also gets a bit more PCI address space (seabios boot):

    # cat /proc/iomem
    [ ... ]
    7ffdd000-7fffffff : reserved
    80000000-afffffff : PCI Bus 0000:00            <<-- this is new
    b0000000-bfffffff : PCI MMCONFIG 0000 [bus 00-ff]
      b0000000-bfffffff : reserved
    c0000000-febfffff : PCI Bus 0000:00
      f8000000-fbffffff : 0000:00:01.0
    [ ... ]

So this is a guest visible change.

Cc: László Érsek <address@hidden>
Signed-off-by: Gerd Hoffmann <address@hidden>
Reviewed-by: Igor Mammedov <address@hidden>
Message-Id: <address@hidden>


  Commit: 500eb6db5b5baef3f642415cdeb4b3e728537f81
      
https://github.com/qemu/qemu/commit/500eb6db5b5baef3f642415cdeb4b3e728537f81
  Author: Michael S. Tsirkin <address@hidden>
  Date:   2019-06-16 (Sun, 16 Jun 2019)

  Changed paths:
    M tests/bios-tables-test-allowed-diff.h
    M tests/data/acpi/q35/DSDT
    M tests/data/acpi/q35/DSDT.bridge
    M tests/data/acpi/q35/DSDT.cphp
    M tests/data/acpi/q35/DSDT.dimmpxm
    M tests/data/acpi/q35/DSDT.ipmibt
    M tests/data/acpi/q35/DSDT.memhp
    M tests/data/acpi/q35/DSDT.mmio64
    M tests/data/acpi/q35/DSDT.numamem

  Log Message:
  -----------
  q35: update DSDT

update expected files and drop them from allowed diff list.

Fixes: 4a4418369d6 ("q35: fix mmconfig and PCI0._CRS")
Signed-off-by: Michael S. Tsirkin <address@hidden>


  Commit: 5f6b3561bf58395fd6c906d7064a1a5693a2e426
      
https://github.com/qemu/qemu/commit/5f6b3561bf58395fd6c906d7064a1a5693a2e426
  Author: Michael S. Tsirkin <address@hidden>
  Date:   2019-06-16 (Sun, 16 Jun 2019)

  Changed paths:
    M tests/data/acpi/rebuild-expected-aml.sh

  Log Message:
  -----------
  tests/rebuild-expected-aml.sh: blow out difflist

As expected files have been updated, make sure we
do not forget to remove them from the allowed
diff list.

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


  Commit: 5d0e5694470d2952b4f257bc985cac8c89b4fd92
      
https://github.com/qemu/qemu/commit/5d0e5694470d2952b4f257bc985cac8c89b4fd92
  Author: Peter Maydell <address@hidden>
  Date:   2019-06-17 (Mon, 17 Jun 2019)

  Changed paths:
    M contrib/vhost-user-gpu/main.c
    M contrib/vhost-user-input/main.c
    M docs/interop/vhost-user.json
    M hw/acpi/Makefile.objs
    A hw/acpi/utils.c
    M hw/arm/virt-acpi-build.c
    M hw/i386/acpi-build.c
    M hw/pci-host/q35.c
    M hw/virtio/vhost.c
    A include/hw/acpi/utils.h
    M tests/data/acpi/q35/DSDT
    M tests/data/acpi/q35/DSDT.bridge
    M tests/data/acpi/q35/DSDT.cphp
    M tests/data/acpi/q35/DSDT.dimmpxm
    M tests/data/acpi/q35/DSDT.ipmibt
    M tests/data/acpi/q35/DSDT.memhp
    M tests/data/acpi/q35/DSDT.mmio64
    M tests/data/acpi/q35/DSDT.numamem
    M tests/data/acpi/rebuild-expected-aml.sh

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

virtio, acpi: fixes, cleanups

A bunch of minor fixes all over the place.

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

# gpg: Signature made Sun 16 Jun 2019 21:46:31 BST
# gpg:                using RSA key 281F0DB8D28D5469
# gpg: Good signature from "Michael S. Tsirkin <address@hidden>" [full]
# gpg:                 aka "Michael S. Tsirkin <address@hidden>" [full]
# 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:
  tests/rebuild-expected-aml.sh: blow out difflist
  q35: update DSDT
  q35: fix mmconfig and PCI0._CRS
  hw/acpi: extract acpi_add_rom_blob()
  vhost: fix vhost_log size overflow during migration
  docs/vhost-user.json: some firmware.json copy leftovers
  vhost-user-gpu: initialize msghdr & iov at declaration
  vhost-user-input: check ioctl(EVIOCGNAME) return value
  vhost-user: improve error report
  vhost-user: check unix_listen() return value
  vhost-user-gpu: do not send scanout update if no GPU socket

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


Compare: https://github.com/qemu/qemu/compare/53defa05701b...5d0e5694470d