Commit 866ba838 authored by Peter Maydell's avatar Peter Maydell
Browse files

Merge remote-tracking branch 'remotes/huth-gitlab/tags/pull-request-2018-09-25' into staging 



- Deprecate the usage of a network backend via "name" instead of "id"
- Deprecate the "enforce-config-section" machine parameter
- Re-enable the wdt_ib700, endianness and vmxnet3 qtests
- Some trivial fixes and doc update patches that crossed my way

# gpg: Signature made Tue 25 Sep 2018 16:58:42 BST
# gpg:                using RSA key 2ED9D774FE702DB5
# gpg: Good signature from "Thomas Huth <th.huth@gmx.de>"
# gpg:                 aka "Thomas Huth <thuth@redhat.com>"
# gpg:                 aka "Thomas Huth <huth@tuxfamily.org>"
# gpg:                 aka "Thomas Huth <th.huth@posteo.de>"
# Primary key fingerprint: 27B8 8847 EEE0 2501 18F3  EAB9 2ED9 D774 FE70 2DB5

* remotes/huth-gitlab/tags/pull-request-2018-09-25:
  Revert "check: Move VMXNET3 test to common"
  Revert "check: Move endianess test to common"
  Revert "check: Move wdt_ib700 test to common"
  tests/migration: Speed up the test on ppc64
  hw/qdev-core: Fix description of instance_init
  qdev: fix a typo in comment
  docs: Fix some typos (most found by codespell)
  trivial: Make bios files and source files non-executable
  memfd: fix possible usage of the uninitialized file descriptor
  hw/core/machine: Officially deprecate the enforce-config-section parameter
  net/slirp: Deprecate the [hub_id name] parameter tuple
  net: Deprecate the "name" parameter of -net
  Makefile: Add missing dependency for qemu-deprecated.texi

Signed-off-by: default avatarPeter Maydell <peter.maydell@linaro.org>
parents c5e4e492 deead96d

Makefile

+1 −1
Original line number Diff line number Diff line
@@ -978,7 +978,7 @@ txt: qemu-doc.txt docs/interop/qemu-qmp-ref.txt docs/interop/qemu-ga-ref.txt 


qemu-doc.html qemu-doc.info qemu-doc.pdf qemu-doc.txt: \

	qemu-img.texi qemu-nbd.texi qemu-options.texi qemu-option-trace.texi \

	qemu-monitor.texi qemu-img-cmds.texi qemu-ga.texi \

	qemu-deprecated.texi qemu-monitor.texi qemu-img-cmds.texi qemu-ga.texi \

	qemu-monitor-info.texi docs/qemu-block-drivers.texi \

	docs/qemu-cpu-models.texi

block/blkreplay.c

100755 → 100644
+0 −0

File mode changed from 100755 to 100644.

View file

docs/COLO-FT.txt

+1 −1
Original line number Diff line number Diff line
@@ -104,7 +104,7 @@ Primary side. 
COLO Proxy:

Delivers packets to Primary and Seconday, and then compare the responses from

both side. Then decide whether to start a checkpoint according to some rules.

Please refer to docs/colo-proxy.txt for more informations.

Please refer to docs/colo-proxy.txt for more information.



Note:

HeartBeat has not been implemented yet, so you need to trigger failover process

docs/interop/vhost-user.txt

+2 −2
Original line number Diff line number Diff line
@@ -666,12 +666,12 @@ Master message types 
      Equivalent ioctl: VHOST_SET_VRING_ENDIAN

      Master payload: vring state description



      Set the endianess of a VQ for legacy devices. Little-endian is indicated

      Set the endianness of a VQ for legacy devices. Little-endian is indicated

      with state.num set to 0 and big-endian is indicated with state.num set

      to 1. Other values are invalid.

      This request should be sent only when VHOST_USER_PROTOCOL_F_CROSS_ENDIAN

      has been negotiated.

      Backends that negotiated this feature should handle both endianesses

      Backends that negotiated this feature should handle both endiannesses

      and expect this message once (per VQ) during device configuration

      (ie. before the master starts the VQ).

docs/replay.txt

+1 −1
Original line number Diff line number Diff line
@@ -320,7 +320,7 @@ Here is the list of events that are written into the log: 
   async event id from the following list:

     - REPLAY_ASYNC_EVENT_BH. Bottom-half callback. This event synchronizes

       callbacks that affect virtual machine state, but normally called

       asyncronously.

       asynchronously.

       Argument: 8-byte operation id.

     - REPLAY_ASYNC_EVENT_INPUT. Input device event. Contains

       parameters of keyboard and mouse input operations