* [Qemu-devel] [PULL v4 01/26] tests/Makefile: Use some more CONFIG switches for x86 tests
2019-01-22 7:08 [Qemu-devel] [PULL v4 00/26] qtests, typedefs and gnu99 Thomas Huth
@ 2019-01-22 7:08 ` Thomas Huth
2019-01-22 7:08 ` [Qemu-devel] [PULL v4 20/26] virtio-net: Fix VirtIONet typedef redefinition Thomas Huth
` (2 subsequent siblings)
3 siblings, 0 replies; 5+ messages in thread
From: Thomas Huth @ 2019-01-22 7:08 UTC (permalink / raw)
To: Peter Maydell, qemu-devel; +Cc: Philippe Mathieu-Daudé
To be able to build and test QEMU binaries where certain devices are
disabled, we have to use the right CONFIG_* switches to run certain
tests only if the corresponding device really has been compiled into
the binary.
Signed-off-by: Thomas Huth <thuth@redhat.com>
---
tests/Makefile.include | 10 +++++-----
1 file changed, 5 insertions(+), 5 deletions(-)
diff --git a/tests/Makefile.include b/tests/Makefile.include
index 5e6b2c7..64478b5 100644
--- a/tests/Makefile.include
+++ b/tests/Makefile.include
@@ -167,13 +167,13 @@ check-qtest-pci-$(CONFIG_NE2000_PCI) += tests/ne2000-test$(EXESUF)
check-qtest-pci-$(CONFIG_NVME_PCI) += tests/nvme-test$(EXESUF)
check-qtest-pci-$(CONFIG_AC97) += tests/ac97-test$(EXESUF)
check-qtest-pci-$(CONFIG_ES1370) += tests/es1370-test$(EXESUF)
-check-qtest-pci-y += $(check-qtest-virtio-y)
+check-qtest-pci-$(CONFIG_VIRTIO) += $(check-qtest-virtio-y)
check-qtest-pci-$(CONFIG_IPACK) += tests/tpci200-test$(EXESUF)
check-qtest-pci-$(CONFIG_IPACK) += $(check-qtest-ipack-y)
-check-qtest-pci-y += tests/display-vga-test$(EXESUF)
+check-qtest-pci-$(CONFIG_VGA) += tests/display-vga-test$(EXESUF)
check-qtest-pci-$(CONFIG_HDA) += tests/intel-hda-test$(EXESUF)
check-qtest-pci-$(CONFIG_IVSHMEM_DEVICE) += tests/ivshmem-test$(EXESUF)
-check-qtest-pci-y += tests/megasas-test$(EXESUF)
+check-qtest-pci-$(CONFIG_MEGASAS_SCSI_PCI) += tests/megasas-test$(EXESUF)
check-qtest-i386-$(CONFIG_ISA_TESTDEV) = tests/endianness-test$(EXESUF)
check-qtest-i386-y += tests/fdc-test$(EXESUF)
@@ -185,9 +185,9 @@ check-qtest-i386-y += tests/bios-tables-test$(EXESUF)
check-qtest-i386-$(CONFIG_SGA) += tests/boot-serial-test$(EXESUF)
check-qtest-i386-$(CONFIG_SLIRP) += tests/pxe-test$(EXESUF)
check-qtest-i386-y += tests/rtc-test$(EXESUF)
-check-qtest-i386-y += tests/ipmi-kcs-test$(EXESUF)
+check-qtest-i386-$(CONFIG_ISA_IPMI_KCS) += tests/ipmi-kcs-test$(EXESUF)
# Disabled temporarily as it fails intermittently especially under NetBSD VM
-# check-qtest-i386-y += tests/ipmi-bt-test$(EXESUF)
+# check-qtest-i386-$(CONFIG_ISA_IPMI_BT) += 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)
--
1.8.3.1
^ permalink raw reply related [flat|nested] 5+ messages in thread* [Qemu-devel] [PULL v4 20/26] virtio-net: Fix VirtIONet typedef redefinition
2019-01-22 7:08 [Qemu-devel] [PULL v4 00/26] qtests, typedefs and gnu99 Thomas Huth
2019-01-22 7:08 ` [Qemu-devel] [PULL v4 01/26] tests/Makefile: Use some more CONFIG switches for x86 tests Thomas Huth
@ 2019-01-22 7:08 ` Thomas Huth
2019-01-22 7:08 ` [Qemu-devel] [PULL v4 26/26] tests: remove rule for nonexisting qdev-monitor-test Thomas Huth
2019-01-22 11:12 ` [Qemu-devel] [PULL v4 00/26] qtests, typedefs and gnu99 Peter Maydell
3 siblings, 0 replies; 5+ messages in thread
From: Thomas Huth @ 2019-01-22 7:08 UTC (permalink / raw)
To: Peter Maydell, qemu-devel; +Cc: Philippe Mathieu-Daudé
From: Philippe Mathieu-Daudé <philmd@redhat.com>
Commit 2974e916df8 introduced the VirtioNetRscChain structure which
refer to a VirtIONet, declared later, thus required VirtIONet typedef
to use a forward declaration.
However, when compiling with Clang in -std=gnu99 mode, this triggers
the following warning/error:
CC hw/net/virtio-net.o
In file included from qemu/hw/net/virtio-net.c:22:
include/hw/virtio/virtio-net.h:189:3: error: redefinition of typedef 'VirtIONet' is a C11 feature [-Werror,-Wtypedef-redefinition]
} VirtIONet;
^
include/hw/virtio/virtio-net.h:110:26: note: previous definition is here
typedef struct VirtIONet VirtIONet;
^
1 error generated.
make: *** [rules.mak:69: hw/net/virtio-net.o] Error 1
Fix it by removing the duplicate typedef definition.
Reported-by: Peter Maydell <peter.maydell@linaro.org>
Signed-off-by: Philippe Mathieu-Daudé <philmd@redhat.com>
Reviewed-by: Eric Blake <eblake@redhat.com>
Reviewed-by: Greg Kurz <groug@kaod.org>
Reviewed-by: Michael S. Tsirkin <mst@redhat.com>
Signed-off-by: Thomas Huth <thuth@redhat.com>
---
include/hw/virtio/virtio-net.h | 5 ++---
1 file changed, 2 insertions(+), 3 deletions(-)
diff --git a/include/hw/virtio/virtio-net.h b/include/hw/virtio/virtio-net.h
index c7ec1a7..bd66275 100644
--- a/include/hw/virtio/virtio-net.h
+++ b/include/hw/virtio/virtio-net.h
@@ -106,7 +106,6 @@ typedef struct VirtioNetRscSeg {
NetClientState *nc;
} VirtioNetRscSeg;
-struct VirtIONet;
typedef struct VirtIONet VirtIONet;
/* Chain is divided by protocol(ipv4/v6) and NetClientInfo */
@@ -136,7 +135,7 @@ typedef struct VirtIONetQueue {
struct VirtIONet *n;
} VirtIONetQueue;
-typedef struct VirtIONet {
+struct VirtIONet {
VirtIODevice parent_obj;
uint8_t mac[ETH_ALEN];
uint16_t status;
@@ -186,7 +185,7 @@ typedef struct VirtIONet {
int announce_counter;
bool needs_vnet_hdr_swap;
bool mtu_bypass_backend;
-} VirtIONet;
+};
void virtio_net_set_netclient_name(VirtIONet *n, const char *name,
const char *type);
--
1.8.3.1
^ permalink raw reply related [flat|nested] 5+ messages in thread* [Qemu-devel] [PULL v4 26/26] tests: remove rule for nonexisting qdev-monitor-test
2019-01-22 7:08 [Qemu-devel] [PULL v4 00/26] qtests, typedefs and gnu99 Thomas Huth
2019-01-22 7:08 ` [Qemu-devel] [PULL v4 01/26] tests/Makefile: Use some more CONFIG switches for x86 tests Thomas Huth
2019-01-22 7:08 ` [Qemu-devel] [PULL v4 20/26] virtio-net: Fix VirtIONet typedef redefinition Thomas Huth
@ 2019-01-22 7:08 ` Thomas Huth
2019-01-22 11:12 ` [Qemu-devel] [PULL v4 00/26] qtests, typedefs and gnu99 Peter Maydell
3 siblings, 0 replies; 5+ messages in thread
From: Thomas Huth @ 2019-01-22 7:08 UTC (permalink / raw)
To: Peter Maydell, qemu-devel; +Cc: Philippe Mathieu-Daudé
From: Paolo Bonzini <pbonzini@redhat.com>
This test was merged into drive_del-test in 2014.
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
Reviewed-by: Thomas Huth <thuth@redhat.com>
Reviewed-by: Philippe Mathieu-Daudé <philmd@redhat.com>
Reviewed-by: Laurent Vivier <lvivier@redhat.com>
Fixes: e2f3f221885a90de766ce9a3 ("Merge of qdev-monitor-test, blockdev-test")
Signed-off-by: Thomas Huth <thuth@redhat.com>
---
tests/Makefile.include | 1 -
1 file changed, 1 deletion(-)
diff --git a/tests/Makefile.include b/tests/Makefile.include
index e0b9aa2..4eea38a 100644
--- a/tests/Makefile.include
+++ b/tests/Makefile.include
@@ -748,7 +748,6 @@ tests/qom-test$(EXESUF): tests/qom-test.o
tests/test-hmp$(EXESUF): tests/test-hmp.o
tests/machine-none-test$(EXESUF): tests/machine-none-test.o
tests/drive_del-test$(EXESUF): tests/drive_del-test.o $(libqos-virtio-obj-y)
-tests/qdev-monitor-test$(EXESUF): tests/qdev-monitor-test.o $(libqos-pc-obj-y)
tests/nvme-test$(EXESUF): tests/nvme-test.o $(libqos-pc-obj-y)
tests/pvpanic-test$(EXESUF): tests/pvpanic-test.o
tests/i82801b11-test$(EXESUF): tests/i82801b11-test.o
--
1.8.3.1
^ permalink raw reply related [flat|nested] 5+ messages in thread* Re: [Qemu-devel] [PULL v4 00/26] qtests, typedefs and gnu99
2019-01-22 7:08 [Qemu-devel] [PULL v4 00/26] qtests, typedefs and gnu99 Thomas Huth
` (2 preceding siblings ...)
2019-01-22 7:08 ` [Qemu-devel] [PULL v4 26/26] tests: remove rule for nonexisting qdev-monitor-test Thomas Huth
@ 2019-01-22 11:12 ` Peter Maydell
3 siblings, 0 replies; 5+ messages in thread
From: Peter Maydell @ 2019-01-22 11:12 UTC (permalink / raw)
To: Thomas Huth; +Cc: QEMU Developers, Philippe Mathieu-Daudé
On Tue, 22 Jan 2019 at 07:08, Thomas Huth <thuth@redhat.com> wrote:
>
> Hi Peter!
>
> The following changes since commit 166609e6070fab3424510ac7292ecb585f8b80fb:
>
> Merge remote-tracking branch 'remotes/amarkovic/tags/mips-queue-january-17-2019-v2' into staging (2019-01-21 17:53:28 +0000)
>
> are available in the git repository at:
>
> https://gitlab.com/huth/qemu.git tags/pull-request-2019-01-22
>
> for you to fetch changes up to f48a79da78eb605bb0977f930ca137e9b8bdede8:
>
> tests: remove rule for nonexisting qdev-monitor-test (2019-01-22 06:26:33 +0100)
>
> ----------------------------------------------------------------
> - Use more CONFIG Makefile switches for qtests
> - Get rid of global_qtests in some more qtests
> - typedef cleanups
> - Fixes for compiling with Clang
> - Force C standard to gnu99
> - Don't use -nographic in qtests
> ----------------------------------------------------------------
Applied, thanks.
Please update the changelog at https://wiki.qemu.org/ChangeLog/4.0
for any user-visible changes.
-- PMM
^ permalink raw reply [flat|nested] 5+ messages in thread