qemu-commits
[Top][All Lists]
Advanced
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

[Qemu-commits] [qemu/qemu] fac862: osdep: Change default value of qemu_h

From: GitHub
Subject: [Qemu-commits] [qemu/qemu] fac862: osdep: Change default value of qemu_hw_version() t...
Date: Thu, 26 Nov 2015 10:00:06 -0800 
  Branch: refs/heads/master
  Home:   https://github.com/qemu/qemu
  Commit: fac862ffa605f6fa41f52033b27346d26a96bea5
      
https://github.com/qemu/qemu/commit/fac862ffa605f6fa41f52033b27346d26a96bea5
  Author: Eduardo Habkost <address@hidden>
  Date:   2015-11-25 (Wed, 25 Nov 2015)

  Changed paths:
    M include/hw/boards.h
    M include/qemu/osdep.h
    M util/osdep.c

  Log Message:
  -----------
  osdep: Change default value of qemu_hw_version() to "2.5+"

There are two issues with qemu_hw_version() today:

1) If a machine has hw_version set, the value returned by it is
   not very useful, because it is not the actual QEMU version.
2) If a machine does't set hw_version, the return value of
   qemu_hw_version() is broken, because it will change when
   upgrading QEMU.

For those reasons, using qemu_hw_version() is strongly
discouraged, and should be used only in code that used
QEMU_VERSION in the past and needs to keep compatibility.

To fix (2), instead of making every machine broken by default
unless they set hw_version, make qemu_hw_version() simply return
"2.5+" if qemu_set_hw_version() is not called.

Suggested-by: Michael S. Tsirkin <address@hidden>
Signed-off-by: Eduardo Habkost <address@hidden>
Reviewed-by: Michael S. Tsirkin <address@hidden>
Signed-off-by: Michael S. Tsirkin <address@hidden>


  Commit: 463b52f285164ec3dc0649763e06e40cea9e8a1f
      
https://github.com/qemu/qemu/commit/463b52f285164ec3dc0649763e06e40cea9e8a1f
  Author: Eduardo Habkost <address@hidden>
  Date:   2015-11-25 (Wed, 25 Nov 2015)

  Changed paths:
    M hw/i386/pc_piix.c
    M hw/i386/pc_q35.c

  Log Message:
  -----------
  pc: Don't set hw_version on pc-*-2.5

Now that qemu_hw_version() returns a fixed "2.5+" string instead
of QEMU_VERSION, we don't need to set hw_version on pc-*-2.5
explicitly.

Suggested-by: Michael S. Tsirkin <address@hidden>
Signed-off-by: Eduardo Habkost <address@hidden>
Reviewed-by: Michael S. Tsirkin <address@hidden>
Signed-off-by: Michael S. Tsirkin <address@hidden>


  Commit: d39c87d70763f2755d1d7a719817b06f0281fb01
      
https://github.com/qemu/qemu/commit/d39c87d70763f2755d1d7a719817b06f0281fb01
  Author: Wen Congyang <address@hidden>
  Date:   2015-11-25 (Wed, 25 Nov 2015)

  Changed paths:
    M net/vhost-user.c

  Log Message:
  -----------
  vhost-user: set link down when the char device is closed

Signed-off-by: Wen Congyang <address@hidden>
Reviewed-by: Michael S. Tsirkin <address@hidden>
Signed-off-by: Michael S. Tsirkin <address@hidden>
Reviewed-by: Yuanhan Liu <address@hidden>


  Commit: c61f09ed855b5009f816242ce281fd01586d4646
      
https://github.com/qemu/qemu/commit/c61f09ed855b5009f816242ce281fd01586d4646
  Author: Michael S. Tsirkin <address@hidden>
  Date:   2015-11-25 (Wed, 25 Nov 2015)

  Changed paths:
    M docs/specs/vhost-user.txt

  Log Message:
  -----------
  vhost-user: clarify start and enable

It seems that we currently have some duplication between
started and enabled states.

The actual reason is that enable is not documented correctly:
what it does is connecting ring to the backend.

This is important for MQ, because a Linux guest expects TX
packets to be completed even if it disables some queues
temporarily.

Cc: Yuanhan Liu <address@hidden>
Cc: Victor Kaplansky <address@hidden>
Signed-off-by: Michael S. Tsirkin <address@hidden>


  Commit: 85ea9da5b8d8c0b2ab77b493d5ce62599279bf33
      
https://github.com/qemu/qemu/commit/85ea9da5b8d8c0b2ab77b493d5ce62599279bf33
  Author: Victor Kaplansky <address@hidden>
  Date:   2015-11-25 (Wed, 25 Nov 2015)

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

  Log Message:
  -----------
  tests/vhost-user-bridge: propose GUEST_ANNOUNCE feature

The backend has to know whether VIRTIO_NET_F_GUEST_ANNOUNCE was
negotiated, so, as a hack we propose the feature by
vhost-user-bridge during the feature negotiation.

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


  Commit: 7cf32491eac9dc32fd8ca7933f3edc9d42f884ee
      
https://github.com/qemu/qemu/commit/7cf32491eac9dc32fd8ca7933f3edc9d42f884ee
  Author: Victor Kaplansky <address@hidden>
  Date:   2015-11-25 (Wed, 25 Nov 2015)

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

  Log Message:
  -----------
  tests/vhost-user-bridge: read command line arguments

Now some vhost-user-bridge parameters can be passed from the
command line:

Usage: prog [-u ud_socket_path] [-l lhost:lport] [-r rhost:rport]
  -u path to unix doman socket. default: /tmp/vubr.sock
  -l local host and port. default: 127.0.0.1:4444
  -r remote host and port. default: 127.0.0.1:5555

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


  Commit: 449e3578107799817a81249b189f6f82aa9e787d
      
https://github.com/qemu/qemu/commit/449e3578107799817a81249b189f6f82aa9e787d
  Author: Michael S. Tsirkin <address@hidden>
  Date:   2015-11-26 (Thu, 26 Nov 2015)

  Changed paths:
    M hw/virtio/vhost.c

  Log Message:
  -----------
  Revert "vhost: send SET_VRING_ENABLE at start/stop"

This reverts commit 3a12f32229a046f4d4ab0a3a52fb01d2d5a1ab76.

In case of live migration several queues can be enabled and not only the
first one. So informing backend that only the first queue is enabled is
wrong.

Reported-by: Thibaut Collet <address@hidden>
Cc: Yuanhan Liu <address@hidden>
Signed-off-by: Michael S. Tsirkin <address@hidden>
Reviewed-by: Yuanhan Liu <address@hidden>


  Commit: 903a41d3415960240cb3b9f1d66f3707b27010d6
      
https://github.com/qemu/qemu/commit/903a41d3415960240cb3b9f1d66f3707b27010d6
  Author: Stefano Dong (董兴水) <address@hidden>
  Date:   2015-11-26 (Thu, 26 Nov 2015)

  Changed paths:
    M hw/acpi/memory_hotplug.c
    M hw/ppc/spapr.c

  Log Message:
  -----------
  Fix memory leak on error

hw/ppc/spapr.c: Fix memory leak on error, it was introduced in bc09e0611
hw/acpi/memory_hotplug.c: Fix memory leak on error, it was introduced in 
34f2af3d

Signed-off-by: Stefano Dong (董兴水) <address@hidden>
Reviewed-by: Michael S. Tsirkin <address@hidden>
Signed-off-by: Michael S. Tsirkin <address@hidden>


  Commit: d08e42a1125d384cb53423f5810b0c7ea52dc6c9
      
https://github.com/qemu/qemu/commit/d08e42a1125d384cb53423f5810b0c7ea52dc6c9
  Author: Michael S. Tsirkin <address@hidden>
  Date:   2015-11-26 (Thu, 26 Nov 2015)

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

  Log Message:
  -----------
  vhost-user-test: fix migration overlap test

During migration, source does GET_BASE, destination does SET_BASE.
Use that as opposed to fds being configured to detect
vhost user running on both source and destination.

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


  Commit: 72f75c76d84e2eefc6806dafca116860ffe847f0
      
https://github.com/qemu/qemu/commit/72f75c76d84e2eefc6806dafca116860ffe847f0
  Author: Peter Maydell <address@hidden>
  Date:   2015-11-26 (Thu, 26 Nov 2015)

  Changed paths:
    M docs/specs/vhost-user.txt
    M hw/acpi/memory_hotplug.c
    M hw/i386/pc_piix.c
    M hw/i386/pc_q35.c
    M hw/ppc/spapr.c
    M hw/virtio/vhost.c
    M include/hw/boards.h
    M include/qemu/osdep.h
    M net/vhost-user.c
    M tests/vhost-user-bridge.c
    M tests/vhost-user-test.c
    M util/osdep.c

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

vhost, pc: fixes for 2.5

Minor vhost fixes.  HW version tweak for PC.
Documentation and test updates.

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

# gpg: Signature made Thu 26 Nov 2015 16:40:25 GMT using RSA key ID D28D5469
# gpg: Good signature from "Michael S. Tsirkin <address@hidden>"
# gpg:                 aka "Michael S. Tsirkin <address@hidden>"

* remotes/mst/tags/for_upstream:
  vhost-user-test: fix migration overlap test
  Fix memory leak on error
  Revert "vhost: send SET_VRING_ENABLE at start/stop"
  tests/vhost-user-bridge: read command line arguments
  tests/vhost-user-bridge: propose GUEST_ANNOUNCE feature
  vhost-user: clarify start and enable
  vhost-user: set link down when the char device is closed
  pc: Don't set hw_version on pc-*-2.5
  osdep: Change default value of qemu_hw_version() to "2.5+"

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


  Commit: b04fc428356a540fdb9065fa8c3c71ee476c2031
      
https://github.com/qemu/qemu/commit/b04fc428356a540fdb9065fa8c3c71ee476c2031
  Author: Peter Maydell <address@hidden>
  Date:   2015-11-26 (Thu, 26 Nov 2015)

  Changed paths:
    M VERSION

  Log Message:
  -----------
  Update version for v2.5.0-rc2 release

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


Compare: https://github.com/qemu/qemu/compare/a5df35070a4c...b04fc428356a
reply via email to
[Prev in Thread] Current Thread [Next in Thread]