[Qemu-commits] [qemu/qemu] 277238: vhost-user-bridge: fix iov_restore_front() warning

[GitHub]

  Branch: refs/heads/master
  Home:   https://github.com/qemu/qemu
  Commit: 277238f9f41e0a429a24b05c03f3010b35c3e9d0
      
https://github.com/qemu/qemu/commit/277238f9f41e0a429a24b05c03f3010b35c3e9d0
  Author: Marc-André Lureau <address@hidden>
  Date:   2017-06-08 (Thu, 08 Jun 2017)

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

  Log Message:
  -----------
  vhost-user-bridge: fix iov_restore_front() warning

  CC      tests/vhost-user-bridge.o
/home/dgilbert/git/qemu-world3/tests/vhost-user-bridge.c:228:23: warning: 
variables 'front' and 'iov' used in loop condition not modified in loop body 
[-Wfor-loop-analysis]
    for (cur = front; front != iov; cur++) {
                ^~~~~    ~~~
1 warning generated.

Fix the loop, document the function, and fix some related assert().

In practice, the loop bug was harmless because the front sg buffer is
enough to discard/restore the header size.

Reported-by: Dr. David Alan Gilbert <address@hidden>
Signed-off-by: Marc-André Lureau <address@hidden>
Reviewed-by: Michael S. Tsirkin <address@hidden>
Signed-off-by: Michael S. Tsirkin <address@hidden>
Reviewed-by: Dr. David Alan Gilbert <address@hidden>
Tested-by: Jens Freimann <address@hidden>


  Commit: 20fdef58a0daa8da21438b79663f7ada2c59ebbc
      
https://github.com/qemu/qemu/commit/20fdef58a0daa8da21438b79663f7ada2c59ebbc
  Author: Haozhong Zhang <address@hidden>
  Date:   2017-06-08 (Thu, 08 Jun 2017)

  Changed paths:
    M hw/acpi/nvdimm.c

  Log Message:
  -----------
  nvdimm acpi: fix region format interface code

Per ACPI 6.2, section 5.2.25.6 and JEDEC Annex L Release 3, the
current region format interface code 0x201 indicates the block
addressed function interface 1, rather than a byte addressable
interface. Fix it by using 0x301 which indicates the byte addressable
no energy backed function interface 1.

Signed-off-by: Haozhong Zhang <address@hidden>
Reviewed-by: Michael S. Tsirkin <address@hidden>
Signed-off-by: Michael S. Tsirkin <address@hidden>
Reviewed-by: Stefan Hajnoczi <address@hidden>


  Commit: bc277a52fbea1532d1adf30ba0edf15ab3dcdead
      
https://github.com/qemu/qemu/commit/bc277a52fbea1532d1adf30ba0edf15ab3dcdead
  Author: Marcel Apfelbaum <address@hidden>
  Date:   2017-06-08 (Thu, 08 Jun 2017)

  Changed paths:
    M hw/pci-bridge/gen_pcie_root_port.c
    M include/hw/compat.h

  Log Message:
  -----------
  hw/pcie: fix the generic pcie root port to support migration

Add msix state to pcie-root-ports's vmstate
in order to support migration.

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


  Commit: 8e3cf49c47064da19f4bfb1c5bf16e6e613f1bfa
      
https://github.com/qemu/qemu/commit/8e3cf49c47064da19f4bfb1c5bf16e6e613f1bfa
  Author: Peter Maydell <address@hidden>
  Date:   2017-06-13 (Tue, 13 Jun 2017)

  Changed paths:
    M hw/acpi/nvdimm.c
    M hw/pci-bridge/gen_pcie_root_port.c
    M include/hw/compat.h
    M tests/vhost-user-bridge.c

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

pc, pci, vhost: fixes

Some fixes all over the place.

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

# gpg: Signature made Thu 08 Jun 2017 20:04:24 BST
# 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:
  hw/pcie: fix the generic pcie root port to support migration
  nvdimm acpi: fix region format interface code
  vhost-user-bridge: fix iov_restore_front() warning

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


Compare: https://github.com/qemu/qemu/compare/f4f3082b0c35...8e3cf49c4706