mirror of https://github.com/xemu-project/xemu.git
- 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 -----BEGIN PGP SIGNATURE----- Version: GnuPG v2.0.22 (GNU/Linux) iQIcBAABAgAGBQJbqlsyAAoJEC7Z13T+cC21RbAP/3IvGfBxuRm6rBWoghjQgbl8 KU8nPnlZUtqjxmfUTILO/h+pJ3na5MQ8hh7v8JHi+xlQ2DPkECW21DtnfdxntVjw +b+N5Ap6J22GHyEq4HJXPWAk2rDInqkU966DvL40RiMvOTfXdg9EO0TDX0VsVgZv BR1r7/t3T0P7hiQ0XWb9U2JchRIC+Zgk34gXZPSTpoIv89fUhzNoK5LvAA6yV1FQ TvE8VTKJm4wkqThH1ShtbJCBKjHjW/W8LYZr3YMothcs8vGjEdEcDL4BoJZDn3bF h4VTkU+k8lp7W9LmlnPnu1WH/5ezhzdwJTeFaPJt4U10WKJptAS4vbK03DXlds9O 9d2BOXKrima2kSr1ejSe1f0kcE8fis1XFmSuhF61Nbw6ngT5+pP2JSc1XwFazd2K zQwV4GXBLzAGnd4F2Ec+5TKzbGFVfczxeBDiBkkVmG+XdX/UXJpkpPYGAaw7DDiK JwKVVYIPk1ll6MAbR6qEGsvE/adHNEm8lUdjXqwgbQlIeUZ2H0hCu9lJ0X81mtoQ WZP+nMa/87COnlPX6VPVgxM2TXQOH/UbGz/WmYzZ6/gPKTX+gfwrHQGdp7Tjl33U KxFKWioFnoqGuyWasvTtKEK67/IlrY+w1nXuuqKJg8J2/qx1SVtx45FHkRkxkIDx 4boRpx0XUqpDVdf8VhRB =dXgp -----END PGP SIGNATURE----- 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>
This commit is contained in:
Peter Maydell
commit
866ba83854
2
Makefile
2
Makefile
|
|
@ -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
|
||||
|
||||
|
|
|
|||
|
|
@ -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
|
||||
|
|
|
|||
|
|
@ -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).
|
||||
|
||||
|
|
|
|||
|
|
@ -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
|
||||
|
|
|
|||
|
|
@ -324,6 +324,9 @@ static void machine_set_enforce_config_section(Object *obj, bool value,
|
|||
{
|
||||
MachineState *ms = MACHINE(obj);
|
||||
|
||||
warn_report("enforce-config-section is deprecated, please use "
|
||||
"-global migration.send-configuration=on|off instead");
|
||||
|
||||
ms->enforce_config_section = value;
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -643,7 +643,7 @@ static void qdev_get_legacy_property(Object *obj, Visitor *v,
|
|||
* the string depends on the property type. Legacy properties are only
|
||||
* needed for "info qtree".
|
||||
*
|
||||
* Do not use this is new code! QOM Properties added through this interface
|
||||
* Do not use this in new code! QOM Properties added through this interface
|
||||
* will be given names in the "legacy" namespace.
|
||||
*/
|
||||
static void qdev_property_add_legacy(DeviceState *dev, Property *prop,
|
||||
|
|
|
|||
|
|
@ -51,8 +51,9 @@ struct VMStateDescription;
|
|||
* Devices are constructed in two stages,
|
||||
* 1) object instantiation via object_initialize() and
|
||||
* 2) device realization via #DeviceState:realized property.
|
||||
* The former may not fail (it might assert or exit), the latter may return
|
||||
* error information to the caller and must be re-entrant.
|
||||
* The former may not fail (and must not abort or exit, since it is called
|
||||
* during device introspection already), and the latter may return error
|
||||
* information to the caller and must be re-entrant.
|
||||
* Trivial field initializations should go into #TypeInfo.instance_init.
|
||||
* Operations depending on @props static properties should go into @realize.
|
||||
* After successful realization, setting static properties will fail.
|
||||
|
|
|
|||
|
|
@ -984,6 +984,10 @@ static int net_client_init1(const void *object, bool is_netdev, Error **errp)
|
|||
/* missing optional values have been initialized to "all bits zero" */
|
||||
name = net->has_id ? net->id : net->name;
|
||||
|
||||
if (net->has_name) {
|
||||
warn_report("The 'name' parameter is deprecated, use 'id' instead");
|
||||
}
|
||||
|
||||
/* Map the old options to the new flat type */
|
||||
switch (opts->type) {
|
||||
case NET_LEGACY_OPTIONS_TYPE_NONE:
|
||||
|
|
|
|||
|
|
@ -404,6 +404,8 @@ static SlirpState *slirp_lookup(Monitor *mon, const char *hub_id,
|
|||
monitor_printf(mon, "unrecognized (hub-id, stackname) pair\n");
|
||||
return NULL;
|
||||
}
|
||||
warn_report("Using 'hub-id' is deprecated, specify the netdev id "
|
||||
"directly instead");
|
||||
} else {
|
||||
nc = qemu_find_netdev(name);
|
||||
if (!nc) {
|
||||
|
|
|
|||
|
|
@ -35,6 +35,11 @@ which is the default.
|
|||
|
||||
@section System emulator command line arguments
|
||||
|
||||
@subsection -machine enforce-config-section=on|off (since 3.1)
|
||||
|
||||
The @option{enforce-config-section} parameter is replaced by the
|
||||
@option{-global migration.send-configuration=@var{on|off}} option.
|
||||
|
||||
@subsection -no-kvm (since 1.3.0)
|
||||
|
||||
The ``-no-kvm'' argument is now a synonym for setting
|
||||
|
|
@ -83,6 +88,11 @@ The 'file' driver for drives is no longer appropriate for character or host
|
|||
devices and will only accept regular files (S_IFREG). The correct driver
|
||||
for these file types is 'host_cdrom' or 'host_device' as appropriate.
|
||||
|
||||
@subsection -net ...,name=@var{name} (since 3.1)
|
||||
|
||||
The @option{name} parameter of the @option{-net} option is a synonym
|
||||
for the @option{id} parameter, which should now be used instead.
|
||||
|
||||
@section QEMU Machine Protocol (QMP) commands
|
||||
|
||||
@subsection block-dirty-bitmap-add "autoload" parameter (since 2.12.0)
|
||||
|
|
@ -99,6 +109,13 @@ The ``query-cpus'' command is replaced by the ``query-cpus-fast'' command.
|
|||
The ``arch'' output member of the ``query-cpus-fast'' command is
|
||||
replaced by the ``target'' output member.
|
||||
|
||||
@section System emulator human monitor commands
|
||||
|
||||
@subsection The hub_id parameter of 'hostfwd_add' / 'hostfwd_remove' (since 3.1)
|
||||
|
||||
The @option{[hub_id name]} parameter tuple of the 'hostfwd_add' and
|
||||
'hostfwd_remove' HMP commands has been replaced by @option{netdev_id}.
|
||||
|
||||
@section System emulator devices
|
||||
|
||||
@subsection ivshmem (since 2.6.0)
|
||||
|
|
|
|||
|
|
@ -255,12 +255,8 @@ check-qtest-pci-$(CONFIG_IVSHMEM_DEVICE) += tests/ivshmem-test$(EXESUF)
|
|||
gcov-files-pci-$(CONFIG_IVSHMEM_DEVICE) += hw/misc/ivshmem.c
|
||||
check-qtest-pci-y += tests/megasas-test$(EXESUF)
|
||||
gcov-files-pci-y += hw/scsi/megasas.c
|
||||
check-qtest-$(CONFIG_VMXNET3_PCI) += tests/vmxnet3-test$(EXESUF)
|
||||
gcov-files-$(CONFIG_VMXNET3_PCI) += hw/net/vmxnet3.c
|
||||
check-qtest-$(CONFIG_ISA_TESTDEV) = tests/endianness-test$(EXESUF)
|
||||
check-qtest-$(CONFIG_WDT_IB700) += tests/wdt_ib700-test$(EXESUF)
|
||||
gcov-files-$(CONFIG_WDT_IB700) += hw/watchdog/watchdog.c hw/watchdog/wdt_ib700.c
|
||||
|
||||
check-qtest-i386-$(CONFIG_ISA_TESTDEV) = tests/endianness-test$(EXESUF)
|
||||
check-qtest-i386-y += tests/fdc-test$(EXESUF)
|
||||
gcov-files-i386-y = hw/block/fdc.c
|
||||
check-qtest-i386-y += tests/ide-test$(EXESUF)
|
||||
|
|
@ -277,9 +273,13 @@ check-qtest-i386-y += tests/ipmi-bt-test$(EXESUF)
|
|||
check-qtest-i386-y += tests/i440fx-test$(EXESUF)
|
||||
check-qtest-i386-y += tests/fw_cfg-test$(EXESUF)
|
||||
check-qtest-i386-y += tests/drive_del-test$(EXESUF)
|
||||
check-qtest-i386-$(CONFIG_WDT_IB700) += tests/wdt_ib700-test$(EXESUF)
|
||||
gcov-files-i386-$(CONFIG_WDT_IB700) += hw/watchdog/watchdog.c hw/watchdog/wdt_ib700.c
|
||||
check-qtest-i386-y += tests/tco-test$(EXESUF)
|
||||
check-qtest-i386-y += $(check-qtest-pci-y)
|
||||
gcov-files-i386-y += $(gcov-files-pci-y)
|
||||
check-qtest-i386-$(CONFIG_VMXNET3_PCI) += tests/vmxnet3-test$(EXESUF)
|
||||
gcov-files-i386-$(CONFIG_VMXNET3_PCI) += hw/net/vmxnet3.c
|
||||
gcov-files-i386-y += hw/net/net_rx_pkt.c
|
||||
gcov-files-i386-y += hw/net/net_tx_pkt.c
|
||||
check-qtest-i386-$(CONFIG_PVPANIC) += tests/pvpanic-test$(EXESUF)
|
||||
|
|
@ -332,8 +332,15 @@ check-qtest-m68k-y = tests/boot-serial-test$(EXESUF)
|
|||
|
||||
check-qtest-microblaze-y = tests/boot-serial-test$(EXESUF)
|
||||
|
||||
check-qtest-mips-$(CONFIG_ISA_TESTDEV) = tests/endianness-test$(EXESUF)
|
||||
|
||||
check-qtest-mips64-$(CONFIG_ISA_TESTDEV) = tests/endianness-test$(EXESUF)
|
||||
|
||||
check-qtest-mips64el-$(CONFIG_ISA_TESTDEV) = tests/endianness-test$(EXESUF)
|
||||
|
||||
check-qtest-moxie-y = tests/boot-serial-test$(EXESUF)
|
||||
|
||||
check-qtest-ppc-$(CONFIG_ISA_TESTDEV) = tests/endianness-test$(EXESUF)
|
||||
check-qtest-ppc-y += tests/boot-order-test$(EXESUF)
|
||||
check-qtest-ppc-y += tests/prom-env-test$(EXESUF)
|
||||
check-qtest-ppc-y += tests/drive_del-test$(EXESUF)
|
||||
|
|
@ -366,11 +373,16 @@ check-qtest-ppc64-$(CONFIG_IVSHMEM_DEVICE) += tests/ivshmem-test$(EXESUF)
|
|||
gcov-files-ppc64-$(CONFIG_IVSHMEM_DEVICE) += hw/misc/ivshmem.c
|
||||
check-qtest-ppc64-y += tests/cpu-plug-test$(EXESUF)
|
||||
|
||||
check-qtest-sh4-$(CONFIG_ISA_TESTDEV) = tests/endianness-test$(EXESUF)
|
||||
|
||||
check-qtest-sh4eb-$(CONFIG_ISA_TESTDEV) = tests/endianness-test$(EXESUF)
|
||||
|
||||
check-qtest-sparc-y = tests/prom-env-test$(EXESUF)
|
||||
check-qtest-sparc-y += tests/m48t59-test$(EXESUF)
|
||||
gcov-files-sparc-y = hw/timer/m48t59.c
|
||||
check-qtest-sparc-y += tests/boot-serial-test$(EXESUF)
|
||||
|
||||
check-qtest-sparc64-$(CONFIG_ISA_TESTDEV) = tests/endianness-test$(EXESUF)
|
||||
check-qtest-sparc64-y += tests/prom-env-test$(EXESUF)
|
||||
check-qtest-sparc64-y += tests/boot-serial-test$(EXESUF)
|
||||
|
||||
|
|
|
|||
|
|
@ -438,11 +438,11 @@ static int test_migrate_start(QTestState **from, QTestState **to,
|
|||
" -incoming %s",
|
||||
accel, tmpfs, bootpath, uri);
|
||||
} else if (strcmp(arch, "ppc64") == 0) {
|
||||
cmd_src = g_strdup_printf("-machine accel=%s -m 256M"
|
||||
cmd_src = g_strdup_printf("-machine accel=%s -m 256M -nodefaults"
|
||||
" -name source,debug-threads=on"
|
||||
" -serial file:%s/src_serial"
|
||||
" -prom-env '"
|
||||
"boot-command=hex .\" _\" begin %x %x "
|
||||
" -prom-env 'use-nvramrc?=true' -prom-env "
|
||||
"'nvramrc=hex .\" _\" begin %x %x "
|
||||
"do i c@ 1 + i c! 1000 +loop .\" B\" 0 "
|
||||
"until'", accel, tmpfs, end_address,
|
||||
start_address);
|
||||
|
|
|
|||
|
|
@ -187,6 +187,7 @@ bool qemu_memfd_alloc_check(void)
|
|||
int fd;
|
||||
void *ptr;
|
||||
|
||||
fd = -1;
|
||||
ptr = qemu_memfd_alloc("test", 4096, 0, &fd, NULL);
|
||||
memfd_check = ptr ? MEMFD_OK : MEMFD_KO;
|
||||
qemu_memfd_free(ptr, 4096, fd);
|
||||
|
|
|
|||
Loading…
Reference in New Issue