[Qemu-commits] [qemu/qemu] 2cef91: tests: switch pxe and vm gen id tests to use kvm

[GitHub]

  Branch: refs/heads/master
  Home:   https://github.com/qemu/qemu
  Commit: 2cef91cf4922cb1ade8882c1097966b090467bbb
      
https://github.com/qemu/qemu/commit/2cef91cf4922cb1ade8882c1097966b090467bbb
  Author: Michael S. Tsirkin <address@hidden>
  Date:   2017-08-02 (Wed, 02 Aug 2017)

  Changed paths:
    M tests/pxe-test.c
    M tests/vmgenid-test.c

  Log Message:
  -----------
  tests: switch pxe and vm gen id tests to use kvm

Speed up tests on host systems with kvm support.

Cc: Paolo Bonzini <address@hidden>
Cc: Thomas Huth <address@hidden>
Cc: Laurent Vivier <address@hidden>
Signed-off-by: Michael S. Tsirkin <address@hidden>
Acked-by: Paolo Bonzini <address@hidden>


  Commit: 08b9e0ba623c4468fe94026a9bdd086526ef62f0
      
https://github.com/qemu/qemu/commit/08b9e0ba623c4468fe94026a9bdd086526ef62f0
  Author: Peng Hao <address@hidden>
  Date:   2017-08-02 (Wed, 02 Aug 2017)

  Changed paths:
    M hw/virtio/vhost-backend.c

  Log Message:
  -----------
  vhost: fix a memory leak

vhost exists a call for g_file_get_contents, but not call g_free.

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


  Commit: 5df04f1762ef78c08fd69e19dcedf3d9ba8c9b86
      
https://github.com/qemu/qemu/commit/5df04f1762ef78c08fd69e19dcedf3d9ba8c9b86
  Author: Felipe Franciosi <address@hidden>
  Date:   2017-08-02 (Wed, 02 Aug 2017)

  Changed paths:
    M docs/interop/vhost-user.txt
    M hw/virtio/vhost-user.c

  Log Message:
  -----------
  vhost-user: fix legacy cross-endian configurations

Currently, vhost-user does not implement any means for notifying the
backend about guest endianess. This commit introduces a new message
called VHOST_USER_SET_VRING_ENDIAN which is analogous to the ioctl()
called VHOST_SET_VRING_ENDIAN used for kernel vhost backends. Such
message is necessary for backends supporting legacy (pre-1.0) virtio
devices running in big-endian guests.

Signed-off-by: Felipe Franciosi <address@hidden>
Signed-off-by: Mike Cui <address@hidden>


  Commit: 892721d91d9deb2affe4e61334b1dd1b43728f92
      
https://github.com/qemu/qemu/commit/892721d91d9deb2affe4e61334b1dd1b43728f92
  Author: Peter Xu <address@hidden>
  Date:   2017-08-02 (Wed, 02 Aug 2017)

  Changed paths:
    M hw/i386/intel_iommu.c
    M hw/i386/intel_iommu_internal.h

  Log Message:
  -----------
  intel_iommu: fix iova for pt

IOMMUTLBEntry.iova is returned incorrectly on one PT path (though mostly
we cannot really trigger this path, even if we do, we are mostly
disgarding this value, so it didn't break anything). Fix it by
converting the VTD_PAGE_MASK into the correct definition
VTD_PAGE_MASK_4K, then remove VTD_PAGE_MASK.

Fixes: b93130 ("intel_iommu: cleanup vtd_{do_}iommu_translate()")
Signed-off-by: Peter Xu <address@hidden>
Reviewed-by: Michael S. Tsirkin <address@hidden>
Signed-off-by: Michael S. Tsirkin <address@hidden>


  Commit: 07f7b73398de3b60f28301a9af2a2338710105c7
      
https://github.com/qemu/qemu/commit/07f7b73398de3b60f28301a9af2a2338710105c7
  Author: Peter Xu <address@hidden>
  Date:   2017-08-02 (Wed, 02 Aug 2017)

  Changed paths:
    M hw/i386/intel_iommu.c
    M include/hw/i386/intel_iommu.h

  Log Message:
  -----------
  intel_iommu: use access_flags for iotlb

It was cached by read/write separately. Let's merge them.

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


  Commit: 2f6b38d171b11c2cedd294e2e7e50e110702f5ef
      
https://github.com/qemu/qemu/commit/2f6b38d171b11c2cedd294e2e7e50e110702f5ef
  Author: Laurent Vivier <address@hidden>
  Date:   2017-08-02 (Wed, 02 Aug 2017)

  Changed paths:
    M accel/accel.c

  Log Message:
  -----------
  accel: cleanup error output

Only emit "XXX accelerator not found", if there are not
further accelerators listed. eg

   accel=kvm:tcg

doesn't print a "KVM accelerator not found" warning
when it falls back to tcg, but a

   accel=kvm

prints a warning, since no fallback is given.

Suggested-by: Daniel P. Berrange <address@hidden>
Suggested-by: Paolo Bonzini <address@hidden>
Signed-off-by: Laurent Vivier <address@hidden>
Reviewed-by: Michael S. Tsirkin <address@hidden>
Signed-off-by: Michael S. Tsirkin <address@hidden>
Reviewed-by: Eric Blake <address@hidden>
Tested-by: Thomas Huth <address@hidden>


  Commit: 91c38e08af93d7d9df5636e4d7747ce3eb7ff1fc
      
https://github.com/qemu/qemu/commit/91c38e08af93d7d9df5636e4d7747ce3eb7ff1fc
  Author: Dr. David Alan Gilbert <address@hidden>
  Date:   2017-08-02 (Wed, 02 Aug 2017)

  Changed paths:
    M tests/bios-tables-test.c

  Log Message:
  -----------
  tests/bios-tables-test: Compiler warning fix

gcc 7.1.1 in fedora 26 moans about the:
   tables = g_new0(uint32_t, tables_nr)

because it can't convince itself that tables_nr is positive.
This is fallout from g_assert_cmpint no longer necessarily being
no-return;  replace it with a plain g_assert.

Signed-off-by: Dr. David Alan Gilbert <address@hidden>
Reviewed-by: Michael S. Tsirkin <address@hidden>
Signed-off-by: Michael S. Tsirkin <address@hidden>
Reviewed-by: Marcel Apfelbaum <address@hidden>


  Commit: 41d4e5ec9f77acaca706d00ee4baaf5324274da5
      
https://github.com/qemu/qemu/commit/41d4e5ec9f77acaca706d00ee4baaf5324274da5
  Author: Yunjian Wang <address@hidden>
  Date:   2017-08-02 (Wed, 02 Aug 2017)

  Changed paths:
    M net/vhost-user.c

  Log Message:
  -----------
  vhost-user: fix watcher need be removed when vhost-user hotplug

"nc" is freed after hotplug vhost-user, but the watcher is not removed.
The QEMU crash when the watcher access the "nc" when socket disconnects.

    Program received signal SIGSEGV, Segmentation fault.
    #0  object_get_class (address@hidden) at qom/object.c:750
    #1  0x00007f9bb4180da1 in qemu_chr_fe_disconnect (be=<optimized out>) at 
chardev/char-fe.c:372
    #2  0x00007f9bb40d1100 in net_vhost_user_watch (chan=<optimized out>, 
cond=<optimized out>, opaque=<optimized out>) at net/vhost-user.c:188
    #3  0x00007f9baf97f99a in g_main_context_dispatch () from 
/usr/lib64/libglib-2.0.so.0
    #4  0x00007f9bb41d7ebc in glib_pollfds_poll () at util/main-loop.c:213
    #5  os_host_main_loop_wait (timeout=<optimized out>) at util/main-loop.c:261
    #6  main_loop_wait (address@hidden) at util/main-loop.c:515
    #7  0x00007f9bb3e266a7 in main_loop () at vl.c:1917
    #8  main (argc=<optimized out>, argv=<optimized out>, envp=<optimized out>) 
at vl.c:4786

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


  Commit: 208fa0e43645edd0b0d8f838857dfc79daff40a8
      
https://github.com/qemu/qemu/commit/208fa0e43645edd0b0d8f838857dfc79daff40a8
  Author: Igor Mammedov <address@hidden>
  Date:   2017-08-02 (Wed, 02 Aug 2017)

  Changed paths:
    M hw/i386/pc.c

  Log Message:
  -----------
  pc: make 'pc.rom' readonly when machine has PCI enabled

looking at bios ROM mapping in QEMU it seems that only isapc
(i.e. not PCI enabled machine) requires ROM being mapped as
RW in other cases BIOS is mapped as RO. Do the same for option
ROM 'pc.rom' when machine has PCI enabled.

As useful side-effect pc.rom MemoryRegion stops being
put in vhost memory map (filtered out by vhost_section()),
which reduces number of entries by 1.

Coincidentally it fixes migration failure reported in

"[PATCH V2]  vhost: fix a migration failed because of vhost region merge"

where following destination CLI with 
/sys/module/vhost/parameters/max_mem_regions = 8

export DIMMSCOUNT=6
QEMU -enable-kvm \
     -netdev type=tap,id=guest0,vhost=on,script=no,vhostforce \
     -device virtio-net-pci,netdev=guest0 \
     -m 256,slots=256,maxmem=2G \
     `i=0; while [ $i -lt $DIMMSCOUNT ]; do echo \
   "-object memory-backend-ram,id=m$i,size=128M \
    -device pc-dimm,id=d$i,memdev=m$i"; i=$(($i + 1)); \
     done`

will fail to startup with error:

 "-device pc-dimm,id=d5,memdev=m5: a used vhost backend has no free memory 
slots left"

while it's possible to add the 6th DIMM during hotplug
on source.

Issue is caused by the fact that number of entries in vhost map
is bigger on 1 entry, when -device is processed, than
after guest boots up, and that offending entry belongs to
'pc.rom', it's not like vhost intends to do IO in ROM range
so making it RO hides region from vhost and makes number
of entries in vhost memory map at -device/machine_done time
match number of entries after guest boots.

Signed-off-by: Igor Mammedov <address@hidden>
Reported-by: Peng Hao <address@hidden>
Reviewed-by: Michael S. Tsirkin <address@hidden>
Signed-off-by: Michael S. Tsirkin <address@hidden>


  Commit: 3a3fcc75f92ab0d71ba0e7511af7dc575c4b4f6c
      
https://github.com/qemu/qemu/commit/3a3fcc75f92ab0d71ba0e7511af7dc575c4b4f6c
  Author: Igor Mammedov <address@hidden>
  Date:   2017-08-02 (Wed, 02 Aug 2017)

  Changed paths:
    M hw/i386/acpi-build.c

  Log Message:
  -----------
  pc: acpi: force FADT rev1 for 440fx based machine types

w2k used to boot on QEMU until revision of FADT has
been bumped to rev3
(commit 77af8a2b hw/i386: Use Rev3 FADT (ACPI 2.0) instead of Rev1 to improve 
guest OS support.)

Keep PC machine at rev1 to remain compatible and Q35
at rev3 where w2k isn't supported anyway so OSX could
run as well.

Signed-off-by: Igor Mammedov <address@hidden>
Tested-by: John Arbuckle <address@hidden>
Reviewed-by: Michael S. Tsirkin <address@hidden>
Signed-off-by: Michael S. Tsirkin <address@hidden>


  Commit: d3d183a638d6a3ead515618a6547b3f80d39fcb9
      
https://github.com/qemu/qemu/commit/d3d183a638d6a3ead515618a6547b3f80d39fcb9
  Author: Peter Maydell <address@hidden>
  Date:   2017-08-02 (Wed, 02 Aug 2017)

  Changed paths:
    M docs/interop/vhost-user.txt
    M hw/i386/acpi-build.c
    M hw/i386/intel_iommu.c
    M hw/i386/intel_iommu_internal.h
    M hw/i386/pc.c
    M hw/virtio/vhost-backend.c
    M hw/virtio/vhost-user.c
    M include/hw/i386/intel_iommu.h
    M net/vhost-user.c
    M tests/bios-tables-test.c
    M tests/pxe-test.c
    M tests/vmgenid-test.c

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

pc, acpi, virtio: fixes, test speedup for rc1

Some fixes all over the place. Notably vhost-user gained a new message
to set endian-ness. Borderline for 2.10 but seems to be the only way to
fix legacy guests.  Also pc tests are run on kvm now. Not a fix at all
but doesn't touch qemu itself, so I merged it since I had to run these a
lot and I just got tired of waiting for these to finish.

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

# gpg: Signature made Tue 01 Aug 2017 22:36:47 BST
# gpg:                using RSA key 0x281F0DB8D28D5469
# gpg: Good signature from "Michael S. Tsirkin <address@hidden>"
# gpg:                 aka "Michael S. Tsirkin <address@hidden>"
# gpg: WARNING: This key is not certified with a trusted signature!
# gpg:          There is no indication that the signature belongs to the owner.
# 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:
  pc: acpi: force FADT rev1 for 440fx based machine types
  pc: make 'pc.rom' readonly when machine has PCI enabled
  vhost-user: fix watcher need be removed when vhost-user hotplug
  tests/bios-tables-test: Compiler warning fix
  accel: cleanup error output
  intel_iommu: use access_flags for iotlb
  intel_iommu: fix iova for pt
  vhost-user: fix legacy cross-endian configurations
  vhost: fix a memory leak
  tests: switch pxe and vm gen id tests to use kvm

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


Compare: https://github.com/qemu/qemu/compare/82d3d409b8b6...d3d183a638d6