From 681a1eafe27d7520818e3827ef87e093fb2387e0 Mon Sep 17 00:00:00 2001 From: Thomas Huth Date: Thu, 20 Sep 2018 09:42:37 +0200 Subject: [PATCH 01/13] Makefile: Add missing dependency for qemu-deprecated.texi MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Make sure that the docs get correctly regenerated when the file qemu-deprecated.texi has been changed. Fixes: 44c67847e32c91a6071fb0440c357b9489f08bc6 Reviewed-by: Philippe Mathieu-Daudé Reviewed-by: Markus Armbruster Signed-off-by: Thomas Huth (cherry picked from commit f99ce85279178385f204a52236f855c879c29cdc) --- Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Makefile b/Makefile index fe623e4634..f42e17690a 100644 --- a/Makefile +++ b/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 From 101625a4d4ac7e96227a156bc5f6d21a9cc383cd Mon Sep 17 00:00:00 2001 From: Thomas Huth Date: Thu, 20 Sep 2018 10:14:08 +0200 Subject: [PATCH 02/13] net: Deprecate the "name" parameter of -net MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit In early times, network backends were specified by a "vlan" and "name" tuple. With the introduction of netdevs, the "name" was replaced by an "id" (which is supposed to be unique), but the "name" parameter stayed as an alias which could be used instead of "id". Unfortunately, we miss the duplication check for "name": $ qemu-system-x86_64 -net user,name=n1 -net user,name=n1 ... starts without an error, while "id" correctly complains: $ qemu-system-x86_64 -net user,id=n1 -net user,id=n1 qemu-system-x86_64: -net user,id=n1: Duplicate ID 'n1' for net Instead of trying to fix the code for the legacy "name" parameter, let's rather get rid of this old interface and deprecate the "name" parameter now - this will also be less confusing for the users in the long run. Reviewed-by: Philippe Mathieu-Daudé Reviewed-by: Markus Armbruster Signed-off-by: Thomas Huth --- net/net.c | 4 ++++ qemu-deprecated.texi | 5 +++++ 2 files changed, 9 insertions(+) diff --git a/net/net.c b/net/net.c index 2a3133990c..cdcd5cf634 100644 --- a/net/net.c +++ b/net/net.c @@ -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: diff --git a/qemu-deprecated.texi b/qemu-deprecated.texi index 2283fc52c3..4ac5c6a6f0 100644 --- a/qemu-deprecated.texi +++ b/qemu-deprecated.texi @@ -83,6 +83,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) From 68cb29ea6585c6fb87ee598583c561cde246873b Mon Sep 17 00:00:00 2001 From: Thomas Huth Date: Thu, 20 Sep 2018 10:22:27 +0200 Subject: [PATCH 03/13] net/slirp: Deprecate the [hub_id name] parameter tuple MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit The "name" in the [hub_id name] parameter tuple is the same as a "netdev_id" (which should be unique), so specifying the hub_id here is just redundant (it was likely just necessary in the past when the network subsystem was still using "vlans" only and when it did not use unique "id"s yet). Reviewed-by: Philippe Mathieu-Daudé Reviewed-by: Markus Armbruster Signed-off-by: Thomas Huth --- net/slirp.c | 2 ++ qemu-deprecated.texi | 7 +++++++ 2 files changed, 9 insertions(+) diff --git a/net/slirp.c b/net/slirp.c index c18060f778..c93b64dd91 100644 --- a/net/slirp.c +++ b/net/slirp.c @@ -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) { diff --git a/qemu-deprecated.texi b/qemu-deprecated.texi index 4ac5c6a6f0..9b918f02ec 100644 --- a/qemu-deprecated.texi +++ b/qemu-deprecated.texi @@ -104,6 +104,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) From 91c082ad86e96ee342faaa024d46fd3e6242a98e Mon Sep 17 00:00:00 2001 From: Thomas Huth Date: Thu, 20 Sep 2018 09:22:07 +0200 Subject: [PATCH 04/13] hw/core/machine: Officially deprecate the enforce-config-section parameter Commit 16f7244842b5135543ef068a1adafd94c6965953 added this parameter to the documentation, including a note that it is deprecated. But it has never been added to the "Deprecated features" appendix, which is our official way to deprecate legacy parameters. So let's do this now. Reviewed-by: Peter Xu Signed-off-by: Thomas Huth --- hw/core/machine.c | 3 +++ qemu-deprecated.texi | 5 +++++ 2 files changed, 8 insertions(+) diff --git a/hw/core/machine.c b/hw/core/machine.c index 6b68e1218f..1987557833 100644 --- a/hw/core/machine.c +++ b/hw/core/machine.c @@ -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; } diff --git a/qemu-deprecated.texi b/qemu-deprecated.texi index 9b918f02ec..16ff946b55 100644 --- a/qemu-deprecated.texi +++ b/qemu-deprecated.texi @@ -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 From 1e7ec6cf067025552bb10def7c49f4527d2f035f Mon Sep 17 00:00:00 2001 From: Dima Stepanov Date: Wed, 13 Jun 2018 11:19:54 +0300 Subject: [PATCH 05/13] memfd: fix possible usage of the uninitialized file descriptor MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit The qemu_memfd_alloc_check() routine allocates the fd variable on stack. This variable is initialized inside the qemu_memfd_alloc() function. There are several cases when *fd will be left unintialized which can lead to the unexpected close() in the qemu_memfd_free() call. Set file descriptor to -1 before calling the qemu_memfd_alloc routine. Signed-off-by: Dima Stepanov Reviewed-by: Marc-André Lureau Reviewed-by: Thomas Huth Signed-off-by: Thomas Huth --- util/memfd.c | 1 + 1 file changed, 1 insertion(+) diff --git a/util/memfd.c b/util/memfd.c index d248a53c3c..6287946b61 100644 --- a/util/memfd.c +++ b/util/memfd.c @@ -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); From 55d38d10b84a256ca80484eb5114a4824608b85e Mon Sep 17 00:00:00 2001 From: Thomas Huth Date: Mon, 7 May 2018 16:32:34 +0200 Subject: [PATCH 06/13] trivial: Make bios files and source files non-executable These files can not be executed on the host, so they should not be marked as executable. Reviewed-by: David Hildenbrand Signed-off-by: Thomas Huth --- block/blkreplay.c | 0 pc-bios/hppa-firmware.img | Bin pc-bios/palcode-clipper | Bin pc-bios/u-boot-sam460-20100605.bin | Bin pc-bios/u-boot.e500 | Bin replay/replay-char.c | 0 6 files changed, 0 insertions(+), 0 deletions(-) mode change 100755 => 100644 block/blkreplay.c mode change 100755 => 100644 pc-bios/hppa-firmware.img mode change 100755 => 100644 pc-bios/palcode-clipper mode change 100755 => 100644 pc-bios/u-boot-sam460-20100605.bin mode change 100755 => 100644 pc-bios/u-boot.e500 mode change 100755 => 100644 replay/replay-char.c diff --git a/block/blkreplay.c b/block/blkreplay.c old mode 100755 new mode 100644 diff --git a/pc-bios/hppa-firmware.img b/pc-bios/hppa-firmware.img old mode 100755 new mode 100644 diff --git a/pc-bios/palcode-clipper b/pc-bios/palcode-clipper old mode 100755 new mode 100644 diff --git a/pc-bios/u-boot-sam460-20100605.bin b/pc-bios/u-boot-sam460-20100605.bin old mode 100755 new mode 100644 diff --git a/pc-bios/u-boot.e500 b/pc-bios/u-boot.e500 old mode 100755 new mode 100644 diff --git a/replay/replay-char.c b/replay/replay-char.c old mode 100755 new mode 100644 From 963e64a486512914231a99716c8775c71e438e0c Mon Sep 17 00:00:00 2001 From: Stefan Weil Date: Fri, 13 Jul 2018 14:17:27 +0200 Subject: [PATCH 07/13] docs: Fix some typos (most found by codespell) Signed-off-by: Stefan Weil Reviewed-by: Peter Maydell Signed-off-by: Thomas Huth --- docs/COLO-FT.txt | 2 +- docs/interop/vhost-user.txt | 4 ++-- docs/replay.txt | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/docs/COLO-FT.txt b/docs/COLO-FT.txt index d7c7dcda8f..70cfb9ce7d 100644 --- a/docs/COLO-FT.txt +++ b/docs/COLO-FT.txt @@ -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 diff --git a/docs/interop/vhost-user.txt b/docs/interop/vhost-user.txt index f59667f498..c2194711d9 100644 --- a/docs/interop/vhost-user.txt +++ b/docs/interop/vhost-user.txt @@ -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). diff --git a/docs/replay.txt b/docs/replay.txt index 2e21e9ccb0..3497585f5a 100644 --- a/docs/replay.txt +++ b/docs/replay.txt @@ -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 From 6871a0d01f16871c67ea46d4264472cce345bb63 Mon Sep 17 00:00:00 2001 From: Li Qiang Date: Tue, 4 Sep 2018 23:49:01 -0700 Subject: [PATCH 08/13] qdev: fix a typo in comment Found by reading code. Signed-off-by: Li Qiang Signed-off-by: Thomas Huth --- hw/core/qdev.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/hw/core/qdev.c b/hw/core/qdev.c index 36b788a66b..046d8f1f76 100644 --- a/hw/core/qdev.c +++ b/hw/core/qdev.c @@ -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, From 6038f98904942a84d4a9cb03a2d84a5c1948343b Mon Sep 17 00:00:00 2001 From: Thomas Huth Date: Mon, 10 Sep 2018 09:46:26 +0200 Subject: [PATCH 09/13] hw/qdev-core: Fix description of instance_init MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit The part of the documentation of DeviceClass that talks about instance_init is partly wrong: instance_init() functions must not abort or exit, since the function is also called during introspection of the device already. So if a device calls exit() during its instance_init() function, QEMU terminates unexpectedly if somebody tries to just have a look at the interfaces from the device with "device_add xyz,help" or with the "device-list-properties" QOM command. This should never happen. Reviewed-by: Andreas Färber Reviewed-by: Philippe Mathieu-Daudé Reviewed-by: Markus Armbruster Signed-off-by: Thomas Huth --- include/hw/qdev-core.h | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/include/hw/qdev-core.h b/include/hw/qdev-core.h index f1fd0f8736..a24d0dd566 100644 --- a/include/hw/qdev-core.h +++ b/include/hw/qdev-core.h @@ -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. From 2fc3ee6e3fadf1d578de7effb13d4200cc2b13a7 Mon Sep 17 00:00:00 2001 From: Thomas Huth Date: Mon, 17 Sep 2018 16:24:55 +0200 Subject: [PATCH 10/13] tests/migration: Speed up the test on ppc64 The SLOF boot process is always quite slow ... but we can speed it up a little bit by specifying "-nodefaults" and by using the "nvramrc" variable instead of "boot-command" (since "nvramrc" is evaluated earlier in the SLOF boot process than "boot-command"). Reviewed-by: Dr. David Alan Gilbert Reviewed-by: Laurent Vivier Signed-off-by: Thomas Huth --- tests/migration-test.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/tests/migration-test.c b/tests/migration-test.c index 0e687b7512..967e3d0856 100644 --- a/tests/migration-test.c +++ b/tests/migration-test.c @@ -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); From 72f911d47115041a38912b72ad9258157c6b9a2d Mon Sep 17 00:00:00 2001 From: Thomas Huth Date: Mon, 24 Sep 2018 09:26:19 +0200 Subject: [PATCH 11/13] Revert "check: Move wdt_ib700 test to common" This reverts commit ee1f6c812b3240420dff07a3860060b7d4abfe09. The patch did not work as expected: The wdt_ib700 test is currently not run at all anymore. Signed-off-by: Thomas Huth --- tests/Makefile.include | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/tests/Makefile.include b/tests/Makefile.include index 87c81d1dcc..2b3b7382fc 100644 --- a/tests/Makefile.include +++ b/tests/Makefile.include @@ -258,8 +258,6 @@ 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-y += tests/fdc-test$(EXESUF) gcov-files-i386-y = hw/block/fdc.c @@ -277,6 +275,8 @@ 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) From c9324bf5cff8f7889aecbb50bade42db5cea636b Mon Sep 17 00:00:00 2001 From: Thomas Huth Date: Mon, 24 Sep 2018 09:27:40 +0200 Subject: [PATCH 12/13] Revert "check: Move endianess test to common" This reverts commit 669cc7100065c690cb7b4f3da5cfc471d1ed4740. The patch did not work as expected: The endianess test is currently not run at all anymore. Signed-off-by: Thomas Huth --- tests/Makefile.include | 14 +++++++++++++- 1 file changed, 13 insertions(+), 1 deletion(-) diff --git a/tests/Makefile.include b/tests/Makefile.include index 2b3b7382fc..e5eb5140d8 100644 --- a/tests/Makefile.include +++ b/tests/Makefile.include @@ -257,8 +257,8 @@ 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-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) @@ -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) From deead96db50524cd5e90a515d151cc58abf5c109 Mon Sep 17 00:00:00 2001 From: Thomas Huth Date: Mon, 24 Sep 2018 09:28:23 +0200 Subject: [PATCH 13/13] Revert "check: Move VMXNET3 test to common" This reverts commit 7a066770f53c198014add869696427f81d67e9c2. The patch did not work as expected: The vmxnet3 test is currently not run at all anymore. Signed-off-by: Thomas Huth --- tests/Makefile.include | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/tests/Makefile.include b/tests/Makefile.include index e5eb5140d8..d0c0a92e67 100644 --- a/tests/Makefile.include +++ b/tests/Makefile.include @@ -255,8 +255,6 @@ 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-i386-$(CONFIG_ISA_TESTDEV) = tests/endianness-test$(EXESUF) check-qtest-i386-y += tests/fdc-test$(EXESUF) @@ -280,6 +278,8 @@ gcov-files-i386-$(CONFIG_WDT_IB700) += hw/watchdog/watchdog.c hw/watchdog/wdt_ib 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)