summaryrefslogtreecommitdiff
path: root/block
diff options
context:
space:
mode:
authorPeter Maydell <peter.maydell@linaro.org>2018-09-25 18:09:52 +0100
committerPeter Maydell <peter.maydell@linaro.org>2018-09-25 18:09:52 +0100
commit866ba8385466a1a74ea4729e2a247c4c75584166 (patch)
tree77bd2970de195cd53ff15c70ba3b08626bae788f /block
parentc5e4e49258e9b89cb34c085a419dd9f862935c48 (diff)
parentdeead96db50524cd5e90a515d151cc58abf5c109 (diff)
downloadqemu-866ba8385466a1a74ea4729e2a247c4c75584166.zip
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: Peter Maydell <peter.maydell@linaro.org>
Diffstat (limited to 'block')
-rw-r--r--[-rwxr-xr-x]block/blkreplay.c0
1 files changed, 0 insertions, 0 deletions
diff --git a/block/blkreplay.c b/block/blkreplay.c
index b5d9efdeca..b5d9efdeca 100755..100644
--- a/block/blkreplay.c
+++ b/block/blkreplay.c