[Qemu-devel] [PATCH 00/25] Don't "check" disabled drivers

[Qemu-devel] [PATCH 00/25] Don't "check" disabled drivers

[Juan Quintela]

Hi

We can disable drivers with "<foo>-softmmu/config-devices.mak".  But
if we remove drivers there and do "make check", we still try to test
that devices (that are compiled in).  This is a list with the removal
of the ovbious ones.

While I was doing this I fonund:
- we remove <foo>-softmmu/config-devices.mak when we do make clean
  That is an "user" configuration file, we shouldn't do that.
- Use land/lor for consistence
- CONFIG_SERIAL was defined twice for all configurations that include
  pci.mak, fix it.
- pvpanic: We can do the same tricks that everywhere to be able to
  compile it out.

To do a better job, we are in trouble because we only have
"config-devices.mak", but not config-devices.h, so we can't disable
part of the tests/files when we don't want them.  Bigger culprits here
are usb and virtio devices, basically all of them depend of the others
one way or another.

Motivation:

- I compile *lots* of times a day, so it is great to be able to
  compile less devices, it takes less time.
- But if I want to do make check, I need to compile basically a full
  configuration for that platform, so we are at square one.

There are still things that still take too long:
- e1000*/virtio-net pxe test.  It takes more than one second for each,
  and we have e1000/virtio-net/e1000p/virtio-net(again).
- qom tests.  We check _all_ machine types here.  In fast mode, IMHO
  we would only want something like pc-3.0 and q35-30 in fast mode
  (in slow mode everything is ok).
- migration tests: yes, they also took around 5-6 seconds in total,
  and we are adding new tests.  Something needs to be done here.

Time to do "make check" on my laptop (reasonably fast laptop from this
Jannuary) is almost 3mins.  This makes it too long to run continously
for testing that I haven't broken anything.

In another submission I wil send some examples on "how" to disable
other drivers that we can't do now.  But it requires that we generate
config-devices.h to be able to apply them (or yet more complicated
things of registration, see how virtio devices needs to be disabled)

Please review, Juan.

Juan Quintela (25):
  configure: We don't want to clean configuration files
  config:  CONFIG_SERIAL* is already in pci.mak
  check: Use land/lor when possible
  check: Only test vmxnet3 when it is compiled in
  check: Only test ne2000 when it is compiled in
  check: Only test eepro100 when it is compiled in
  check: Only test pcnet when it is compiled in
  check: Only test rtl8139 when it is compiled in
  check: Only test es1370 when it is compiled in
  check: Only test ac97 when it is compiled in
  check: Only test hda when it is compiled in
  check: Only test ipack when it is compiled in
  check: Only test isa-testdev when it is compiled in
  check: Only test ioh3420 when it is compiled in
  check: Only test i82801b11 when it is compiled in
  check: Only test sdhci when it is compiled in
  check: Only test wdt_ib700 when it is compiled in
  check: Only test pvpanic when it is compiled in
  check: Only test nvme when it is compiled in
  check: Only test usb-xhci-nec when it is compiled in
  check: Only test usb-ohci when it is compiled in
  check: Only test usb-uhci devices when they are compiled in
  check: Only test usb-ehci when it is compiled in
  check: Only test ivshm when it is compiled in
  check: Only test tpm devices when they are compiled in

 Makefile                                |   2 +-
 default-configs/alpha-softmmu.mak       |   2 -
 default-configs/arm-softmmu.mak         |   2 -
 default-configs/hppa-softmmu.mak        |   3 -
 default-configs/i386-softmmu.mak        |   2 -
 default-configs/mips-softmmu-common.mak |   2 -
 default-configs/ppc-softmmu.mak         |   1 -
 default-configs/ppcemb-softmmu.mak      |   2 -
 default-configs/sh4-softmmu.mak         |   2 -
 default-configs/sh4eb-softmmu.mak       |   2 -
 default-configs/sparc64-softmmu.mak     |   2 -
 default-configs/x86_64-softmmu.mak      |   2 -
 hw/misc/pvpanic.c                       |  11 --
 include/hw/misc/pvpanic.h               |  11 +-
 tests/Makefile.include                  | 144 ++++++++++++------------
 15 files changed, 81 insertions(+), 109 deletions(-)

-- 
2.17.1

[Qemu-devel] [PATCH 01/25] configure: We don't want to clean configuration files

[Juan Quintela]

If you don't want to compile everything, you configure
config-devices.mak.  And then make clean remove it, and make will
create a default one without your configuration.  Fix it by not
removing it.

Signed-off-by: Juan Quintela <quintela@redhat.com>
---
 Makefile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Makefile b/Makefile
index 2da686be33..2ffbcde323 100644
--- a/Makefile
+++ b/Makefile
@@ -751,7 +751,7 @@ clean:
 	if test -d $$d; then $(MAKE) -C $$d $@ || exit 1; fi; \
 	rm -f $$d/qemu-options.def; \
         done
-	rm -f $(SUBDIR_DEVICES_MAK) config-all-devices.mak
+	rm -f config-all-devices.mak
 
 VERSION ?= $(shell cat VERSION)
 
-- 
2.17.1

Re: [Qemu-devel] [PATCH 01/25] configure: We don't want to clean configuration files

[Daniel P. Berrangé]

On Tue, Jul 17, 2018 at 01:33:38PM +0200, Juan Quintela wrote:
> If you don't want to compile everything, you configure
> config-devices.mak.  And then make clean remove it, and make will
> create a default one without your configuration.  Fix it by not
> removing it.
> 
> Signed-off-by: Juan Quintela <quintela@redhat.com>
> ---
>  Makefile | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
> 
> diff --git a/Makefile b/Makefile
> index 2da686be33..2ffbcde323 100644
> --- a/Makefile
> +++ b/Makefile
> @@ -751,7 +751,7 @@ clean:
>  	if test -d $$d; then $(MAKE) -C $$d $@ || exit 1; fi; \
>  	rm -f $$d/qemu-options.def; \
>          done
> -	rm -f $(SUBDIR_DEVICES_MAK) config-all-devices.mak
> +	rm -f config-all-devices.mak
>  
>  VERSION ?= $(shell cat VERSION)

This feels wrong to me.  If 'make' is creating config-devices.mak, then
either 'make clean' or 'make distclean' must remove it. So if you remove
it here, it should be added to distclean instead.


Regards,
Daniel
-- 
|: https://berrange.com      -o-    https://www.flickr.com/photos/dberrange :|
|: https://libvirt.org         -o-            https://fstop138.berrange.com :|
|: https://entangle-photo.org    -o-    https://www.instagram.com/dberrange :|

Re: [Qemu-devel] [PATCH 01/25] configure: We don't want to clean configuration files

[Juan Quintela]

Daniel P. Berrangé <berrange@redhat.com> wrote:
> On Tue, Jul 17, 2018 at 01:33:38PM +0200, Juan Quintela wrote:
>> If you don't want to compile everything, you configure
>> config-devices.mak.  And then make clean remove it, and make will
>> create a default one without your configuration.  Fix it by not
>> removing it.
>> 
>> Signed-off-by: Juan Quintela <quintela@redhat.com>
>> ---
>>  Makefile | 2 +-
>>  1 file changed, 1 insertion(+), 1 deletion(-)
>> 
>> diff --git a/Makefile b/Makefile
>> index 2da686be33..2ffbcde323 100644
>> --- a/Makefile
>> +++ b/Makefile
>> @@ -751,7 +751,7 @@ clean:
>>  	if test -d $$d; then $(MAKE) -C $$d $@ || exit 1; fi; \
>>  	rm -f $$d/qemu-options.def; \
>>          done
>> -	rm -f $(SUBDIR_DEVICES_MAK) config-all-devices.mak
>> +	rm -f config-all-devices.mak
>>  
>>  VERSION ?= $(shell cat VERSION)
>
> This feels wrong to me.  If 'make' is creating config-devices.mak, then
> either 'make clean' or 'make distclean' must remove it. So if you remove
> it here, it should be added to distclean instead.

I can agree with putting it on distclean.

make don't put it there if it is already there.  My use case is that I
have several build trees from the same source three:

- x86_64-softmmu with minimal set of devices (the ones that I use)
- x86_64-softmmu with everything under the sun
- everything that can be compiled in in fedora

for the 1st case, I am interested that it is fast, so I edit the
x86_64-softmmu/config-device.mak.  But if I do a make clean for any
reason, I lost my changes.

But I agree that it is ok to remove it on make distclean.

Thanks, Juan.

Re: [Qemu-devel] [PATCH 01/25] configure: We don't want to clean configuration files

[Peter Maydell]

On 17 July 2018 at 18:05, Juan Quintela <quintela@redhat.com> wrote:
> Daniel P. Berrangé <berrange@redhat.com> wrote:
>> On Tue, Jul 17, 2018 at 01:33:38PM +0200, Juan Quintela wrote:
>>> If you don't want to compile everything, you configure
>>> config-devices.mak.  And then make clean remove it, and make will
>>> create a default one without your configuration.  Fix it by not
>>> removing it.
>>>
>>> Signed-off-by: Juan Quintela <quintela@redhat.com>
>>> ---
>>>  Makefile | 2 +-
>>>  1 file changed, 1 insertion(+), 1 deletion(-)
>>>
>>> diff --git a/Makefile b/Makefile
>>> index 2da686be33..2ffbcde323 100644
>>> --- a/Makefile
>>> +++ b/Makefile
>>> @@ -751,7 +751,7 @@ clean:
>>>      if test -d $$d; then $(MAKE) -C $$d $@ || exit 1; fi; \
>>>      rm -f $$d/qemu-options.def; \
>>>          done
>>> -    rm -f $(SUBDIR_DEVICES_MAK) config-all-devices.mak
>>> +    rm -f config-all-devices.mak
>>>
>>>  VERSION ?= $(shell cat VERSION)
>>
>> This feels wrong to me.  If 'make' is creating config-devices.mak, then
>> either 'make clean' or 'make distclean' must remove it. So if you remove
>> it here, it should be added to distclean instead.
>
> I can agree with putting it on distclean.
>
> make don't put it there if it is already there.  My use case is that I
> have several build trees from the same source three:
>
> - x86_64-softmmu with minimal set of devices (the ones that I use)
> - x86_64-softmmu with everything under the sun
> - everything that can be compiled in in fedora
>
> for the 1st case, I am interested that it is fast, so I edit the
> x86_64-softmmu/config-device.mak.  But if I do a make clean for any
> reason, I lost my changes.

I think the problem here is that we're confused about whether
config-devices.mak should be a user-editable file or just
part of our build process. Personally I think we should go
for the latter, ie if there are useful use cases that
currently you need to edit the file to achieve, we should
provide a better mechanism for doing them.

thanks
-- PMM

Re: [Qemu-devel] [PATCH 01/25] configure: We don't want to clean configuration files

[Juan Quintela]

Peter Maydell <peter.maydell@linaro.org> wrote:
> On 17 July 2018 at 18:05, Juan Quintela <quintela@redhat.com> wrote:
>> Daniel P. Berrangé <berrange@redhat.com> wrote:
>>> On Tue, Jul 17, 2018 at 01:33:38PM +0200, Juan Quintela wrote:
>>>> If you don't want to compile everything, you configure
>>>> config-devices.mak.  And then make clean remove it, and make will
>>>> create a default one without your configuration.  Fix it by not
>>>> removing it.
>>>>
>>>> Signed-off-by: Juan Quintela <quintela@redhat.com>
>>>> ---
>>>>  Makefile | 2 +-
>>>>  1 file changed, 1 insertion(+), 1 deletion(-)
>>>>
>>>> diff --git a/Makefile b/Makefile
>>>> index 2da686be33..2ffbcde323 100644
>>>> --- a/Makefile
>>>> +++ b/Makefile
>>>> @@ -751,7 +751,7 @@ clean:
>>>>      if test -d $$d; then $(MAKE) -C $$d $@ || exit 1; fi; \
>>>>      rm -f $$d/qemu-options.def; \
>>>>          done
>>>> -    rm -f $(SUBDIR_DEVICES_MAK) config-all-devices.mak
>>>> +    rm -f config-all-devices.mak
>>>>
>>>>  VERSION ?= $(shell cat VERSION)
>>>
>>> This feels wrong to me.  If 'make' is creating config-devices.mak, then
>>> either 'make clean' or 'make distclean' must remove it. So if you remove
>>> it here, it should be added to distclean instead.
>>
>> I can agree with putting it on distclean.
>>
>> make don't put it there if it is already there.  My use case is that I
>> have several build trees from the same source three:
>>
>> - x86_64-softmmu with minimal set of devices (the ones that I use)
>> - x86_64-softmmu with everything under the sun
>> - everything that can be compiled in in fedora
>>
>> for the 1st case, I am interested that it is fast, so I edit the
>> x86_64-softmmu/config-device.mak.  But if I do a make clean for any
>> reason, I lost my changes.
>
> I think the problem here is that we're confused about whether
> config-devices.mak should be a user-editable file or just
> part of our build process. Personally I think we should go
> for the latter, ie if there are useful use cases that
> currently you need to edit the file to achieve, we should
> provide a better mechanism for doing them.

I agree with the better mechanism, but until them this is the only way
to "choose" what devices to compile in.  It is a very bad mechanism, but
it is the only one that we have right now.

On a general level, for devices that are quite well isolated, it works
quite well.  But for the rest of the things, it is kind of messy.
- No dependencies
  So, if you look at the generated x86_64-softmmu/config-devices,mak,
  you can see that we define CONFIG_SCSI=y at least three times
- No way to show that dependencies at the C level, so we can only
  compile in/out at the file level
- simple things like pc-speaker, msmouse or vmport, you can't compile
  out, because they are created by code, not by
  qom/configuration/whatever.

On the other hand, sometimes it looks like I am the only user that use
this.  The original reason for this was to be able to compile out
drivers that downstream don't care about.  There were a couple of
intents to integrate with something like kernel kconfig, but I think
that we never end integrating anything from there.

Later, Juan.

Re: [Qemu-devel] [PATCH 01/25] configure: We don't want to clean configuration files

[Peter Maydell]

On 17 July 2018 at 18:27, Juan Quintela <quintela@redhat.com> wrote:
> On the other hand, sometimes it looks like I am the only user that use
> this.  The original reason for this was to be able to compile out
> drivers that downstream don't care about.  There were a couple of
> intents to integrate with something like kernel kconfig, but I think
> that we never end integrating anything from there.

I think "be able to compile out stuff you don't want" is
useful from a "reduce the security boundary" perspective,
and indeed we have at least one fork of QEMU which is
basically aimed at chopping stuff out, so there's a group
of users who'd like to be able to do that -- you're not on
your own in that sense. But it probably does require more
serious effort if we want to address this use case, so as
always it comes down to whether anybody wants to do the work,
I guess.

thanks
-- PMM

Re: [Qemu-devel] [PATCH 01/25] configure: We don't want to clean configuration files

[Juan Quintela]

Peter Maydell <peter.maydell@linaro.org> wrote:
> On 17 July 2018 at 18:27, Juan Quintela <quintela@redhat.com> wrote:
>> On the other hand, sometimes it looks like I am the only user that use
>> this.  The original reason for this was to be able to compile out
>> drivers that downstream don't care about.  There were a couple of
>> intents to integrate with something like kernel kconfig, but I think
>> that we never end integrating anything from there.
>
> I think "be able to compile out stuff you don't want" is
> useful from a "reduce the security boundary" perspective,
> and indeed we have at least one fork of QEMU which is
> basically aimed at chopping stuff out, so there's a group
> of users who'd like to be able to do that

agreed about that.  Some of the bits are just there for historical
reasons, or it was easier to do it that way.  Case in hand, vfio-spapr,
we compile it in always, but my understanding is that it is only used on
ppc.  On the other hand, spliting things complicates things a lot, see
for instance the virtio-pci.c example that I gave on other answer.  You
can split instead of #ifdef, but need yet another registration.

>-- you're not on
> your own in that sense. But it probably does require more
> serious effort if we want to address this use case, so as
> always it comes down to whether anybody wants to do the work,
> I guess.

Completely agree.  I can justify the effort that I put to be able to
"compile less stuff and then compile faster".  Doing it properly takes
more time that I can afford right now.

I care mostly about x86_64-seftmmu with kvm, appart from the bits that I
sent, the other low hanging fruit that I can think of is:

- being able to compile only q35 or i440fx
- split CONFIG_RDMA into CONFIG_RDMA_DEVICES and CONFIG_RDMA_MIGRATION

Thing that could be clearer:
- What is the difference between CONFIG_VIRTIO_VGA and COVFIG_VIRTIO_GPU
- can we really drop/make optional isapc, yes, I know that some things
  still hang from there.
- VHOST_USER_SCSI, VHOST_USER, VIIRTIO_SCSI, VIRTIO_BLK,
  VIRTIO_DATAPLANE, VHOST_BLK and who knows what.  It is not clear to me
  which ones are the ones that I want.

Later, Juan.

[Qemu-devel] [PATCH 02/25] config: CONFIG_SERIAL* is already in pci.mak

[Juan Quintela]

Signed-off-by: Juan Quintela <quintela@redhat.com>
---
 default-configs/alpha-softmmu.mak       | 2 --
 default-configs/arm-softmmu.mak         | 2 --
 default-configs/hppa-softmmu.mak        | 3 ---
 default-configs/i386-softmmu.mak        | 2 --
 default-configs/mips-softmmu-common.mak | 2 --
 default-configs/ppc-softmmu.mak         | 1 -
 default-configs/ppcemb-softmmu.mak      | 2 --
 default-configs/sh4-softmmu.mak         | 2 --
 default-configs/sh4eb-softmmu.mak       | 2 --
 default-configs/sparc64-softmmu.mak     | 2 --
 default-configs/x86_64-softmmu.mak      | 2 --
 11 files changed, 22 deletions(-)

diff --git a/default-configs/alpha-softmmu.mak b/default-configs/alpha-softmmu.mak
index bbe361f01a..2d81a98441 100644
--- a/default-configs/alpha-softmmu.mak
+++ b/default-configs/alpha-softmmu.mak
@@ -2,8 +2,6 @@
 
 include pci.mak
 include usb.mak
-CONFIG_SERIAL=y
-CONFIG_SERIAL_ISA=y
 CONFIG_I82374=y
 CONFIG_I8254=y
 CONFIG_I8257=y
diff --git a/default-configs/arm-softmmu.mak b/default-configs/arm-softmmu.mak
index 834d45cfaf..4d33e9983d 100644
--- a/default-configs/arm-softmmu.mak
+++ b/default-configs/arm-softmmu.mak
@@ -5,8 +5,6 @@ include usb.mak
 CONFIG_VGA=y
 CONFIG_NAND=y
 CONFIG_ECC=y
-CONFIG_SERIAL=y
-CONFIG_SERIAL_ISA=y
 CONFIG_PTIMER=y
 CONFIG_SD=y
 CONFIG_MAX7310=y
diff --git a/default-configs/hppa-softmmu.mak b/default-configs/hppa-softmmu.mak
index 4badc0521e..f3712afc27 100644
--- a/default-configs/hppa-softmmu.mak
+++ b/default-configs/hppa-softmmu.mak
@@ -1,8 +1,5 @@
 include pci.mak
 include usb.mak
-CONFIG_SERIAL=y
-CONFIG_SERIAL_ISA=y
-CONFIG_ISA_BUS=y
 CONFIG_I8259=y
 CONFIG_E1000_PCI=y
 CONFIG_IDE_ISA=y
diff --git a/default-configs/i386-softmmu.mak b/default-configs/i386-softmmu.mak
index 8c7d4a0fa0..8827166ba1 100644
--- a/default-configs/i386-softmmu.mak
+++ b/default-configs/i386-softmmu.mak
@@ -15,8 +15,6 @@ CONFIG_IPMI_LOCAL=y
 CONFIG_IPMI_EXTERN=y
 CONFIG_ISA_IPMI_KCS=y
 CONFIG_ISA_IPMI_BT=y
-CONFIG_SERIAL=y
-CONFIG_SERIAL_ISA=y
 CONFIG_PARALLEL=y
 CONFIG_I8254=y
 CONFIG_PCSPK=y
diff --git a/default-configs/mips-softmmu-common.mak b/default-configs/mips-softmmu-common.mak
index fae2347ee7..9bae997ca0 100644
--- a/default-configs/mips-softmmu-common.mak
+++ b/default-configs/mips-softmmu-common.mak
@@ -9,8 +9,6 @@ CONFIG_VGA_ISA=y
 CONFIG_VGA_ISA_MM=y
 CONFIG_VGA_CIRRUS=y
 CONFIG_VMWARE_VGA=y
-CONFIG_SERIAL=y
-CONFIG_SERIAL_ISA=y
 CONFIG_PARALLEL=y
 CONFIG_I8254=y
 CONFIG_PCSPK=y
diff --git a/default-configs/ppc-softmmu.mak b/default-configs/ppc-softmmu.mak
index 3181bbf163..d8dd969499 100644
--- a/default-configs/ppc-softmmu.mak
+++ b/default-configs/ppc-softmmu.mak
@@ -53,7 +53,6 @@ CONFIG_IDE_MACIO=y
 # For PReP
 CONFIG_PREP=y
 CONFIG_PREP_PCI=y
-CONFIG_SERIAL_ISA=y
 CONFIG_MC146818RTC=y
 CONFIG_ISA_TESTDEV=y
 CONFIG_RS6000_MC=y
diff --git a/default-configs/ppcemb-softmmu.mak b/default-configs/ppcemb-softmmu.mak
index ac44f150c6..f7a0d577d8 100644
--- a/default-configs/ppcemb-softmmu.mak
+++ b/default-configs/ppcemb-softmmu.mak
@@ -5,8 +5,6 @@ include sound.mak
 include usb.mak
 CONFIG_PPC4XX=y
 CONFIG_M48T59=y
-CONFIG_SERIAL=y
-CONFIG_SERIAL_ISA=y
 CONFIG_I8257=y
 CONFIG_OPENPIC=y
 CONFIG_PFLASH_CFI01=y
diff --git a/default-configs/sh4-softmmu.mak b/default-configs/sh4-softmmu.mak
index caeccd55be..2b46d57ab4 100644
--- a/default-configs/sh4-softmmu.mak
+++ b/default-configs/sh4-softmmu.mak
@@ -2,8 +2,6 @@
 
 include pci.mak
 include usb.mak
-CONFIG_SERIAL=y
-CONFIG_SERIAL_ISA=y
 CONFIG_PTIMER=y
 CONFIG_PFLASH_CFI02=y
 CONFIG_SH4=y
diff --git a/default-configs/sh4eb-softmmu.mak b/default-configs/sh4eb-softmmu.mak
index 53b9cd7b5a..279896a43d 100644
--- a/default-configs/sh4eb-softmmu.mak
+++ b/default-configs/sh4eb-softmmu.mak
@@ -2,8 +2,6 @@
 
 include pci.mak
 include usb.mak
-CONFIG_SERIAL=y
-CONFIG_SERIAL_ISA=y
 CONFIG_PTIMER=y
 CONFIG_PFLASH_CFI02=y
 CONFIG_SH4=y
diff --git a/default-configs/sparc64-softmmu.mak b/default-configs/sparc64-softmmu.mak
index 52edafe547..e039ae3057 100644
--- a/default-configs/sparc64-softmmu.mak
+++ b/default-configs/sparc64-softmmu.mak
@@ -4,8 +4,6 @@ include pci.mak
 include usb.mak
 CONFIG_M48T59=y
 CONFIG_PTIMER=y
-CONFIG_SERIAL=y
-CONFIG_SERIAL_ISA=y
 CONFIG_PARALLEL=y
 CONFIG_PCKBD=y
 CONFIG_FDC=y
diff --git a/default-configs/x86_64-softmmu.mak b/default-configs/x86_64-softmmu.mak
index 0390b4303c..85528ac9af 100644
--- a/default-configs/x86_64-softmmu.mak
+++ b/default-configs/x86_64-softmmu.mak
@@ -15,8 +15,6 @@ CONFIG_IPMI_LOCAL=y
 CONFIG_IPMI_EXTERN=y
 CONFIG_ISA_IPMI_KCS=y
 CONFIG_ISA_IPMI_BT=y
-CONFIG_SERIAL=y
-CONFIG_SERIAL_ISA=y
 CONFIG_PARALLEL=y
 CONFIG_I8254=y
 CONFIG_PCSPK=y
-- 
2.17.1

[Qemu-devel] [PATCH 03/25] check: Use land/lor when possible

[Juan Quintela]

So everythig is (a bit) more consistent

Signed-off-by: Juan Quintela <quintela@redhat.com>
---
 tests/Makefile.include | 12 ++++--------
 1 file changed, 4 insertions(+), 8 deletions(-)

diff --git a/tests/Makefile.include b/tests/Makefile.include
index a49282704e..47aea32193 100644
--- a/tests/Makefile.include
+++ b/tests/Makefile.include
@@ -98,11 +98,9 @@ check-unit-y += tests/test-block-backend$(EXESUF)
 check-unit-y += tests/test-x86-cpuid$(EXESUF)
 # all code tested by test-x86-cpuid is inside topology.h
 gcov-files-test-x86-cpuid-y =
-ifeq ($(CONFIG_SOFTMMU),y)
-check-unit-y += tests/test-xbzrle$(EXESUF)
-gcov-files-test-xbzrle-y = migration/xbzrle.c
-check-unit-$(CONFIG_POSIX) += tests/test-vmstate$(EXESUF)
-endif
+check-unit-$(CONFIG_SOFTMMU) += tests/test-xbzrle$(EXESUF)
+gcov-files-test-xbzrle-$(CONFIG_SOFTMMU) = migration/xbzrle.c
+check-unit-$(call land, $(CONFIG_SOFTMMU), $(CONFIG_POSIX)) += tests/test-vmstate$(EXESUF)
 check-unit-y += tests/test-cutils$(EXESUF)
 gcov-files-test-cutils-y += util/cutils.c
 check-unit-y += tests/test-shift128$(EXESUF)
@@ -297,9 +295,7 @@ check-qtest-i386-y += tests/q35-test$(EXESUF)
 check-qtest-i386-y += tests/vmgenid-test$(EXESUF)
 gcov-files-i386-y += hw/pci-host/q35.c
 check-qtest-i386-$(CONFIG_VHOST_USER_NET_TEST_i386) += tests/vhost-user-test$(EXESUF)
-ifeq ($(CONFIG_VHOST_USER_NET_TEST_i386),)
-check-qtest-x86_64-$(CONFIG_VHOST_USER_NET_TEST_x86_64) += tests/vhost-user-test$(EXESUF)
-endif
+check-qtest-x86_64-$(call lor, $(CONFIG_VHOST_USER_NET_TEST_i386), $(CONFIG_VHOST_USER_NET_TEST_x86_64)) += tests/vhost-user-test$(EXESUF)
 check-qtest-i386-$(CONFIG_TPM) += tests/tpm-crb-swtpm-test$(EXESUF)
 check-qtest-i386-$(CONFIG_TPM) += tests/tpm-crb-test$(EXESUF)
 check-qtest-i386-$(CONFIG_TPM) += tests/tpm-tis-swtpm-test$(EXESUF)
-- 
2.17.1

[Qemu-devel] [PATCH 04/25] check: Only test vmxnet3 when it is compiled in

[Juan Quintela]

Signed-off-by: Juan Quintela <quintela@redhat.com>
---
 tests/Makefile.include | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/tests/Makefile.include b/tests/Makefile.include
index 47aea32193..e9dd3e8928 100644
--- a/tests/Makefile.include
+++ b/tests/Makefile.include
@@ -270,8 +270,8 @@ check-qtest-i386-y += tests/tco-test$(EXESUF)
 gcov-files-i386-y += hw/watchdog/watchdog.c hw/watchdog/wdt_ib700.c
 check-qtest-i386-y += $(check-qtest-pci-y)
 gcov-files-i386-y += $(gcov-files-pci-y)
-check-qtest-i386-y += tests/vmxnet3-test$(EXESUF)
-gcov-files-i386-y += hw/net/vmxnet3.c
+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-y += tests/pvpanic-test$(EXESUF)
-- 
2.17.1

Re: [Qemu-devel] [PATCH 04/25] check: Only test vmxnet3 when it is compiled in

[Thomas Huth]

On 17.07.2018 13:33, Juan Quintela wrote:
> Signed-off-by: Juan Quintela <quintela@redhat.com>
> ---
>  tests/Makefile.include | 4 ++--
>  1 file changed, 2 insertions(+), 2 deletions(-)
> 
> diff --git a/tests/Makefile.include b/tests/Makefile.include
> index 47aea32193..e9dd3e8928 100644
> --- a/tests/Makefile.include
> +++ b/tests/Makefile.include
> @@ -270,8 +270,8 @@ check-qtest-i386-y += tests/tco-test$(EXESUF)
>  gcov-files-i386-y += hw/watchdog/watchdog.c hw/watchdog/wdt_ib700.c
>  check-qtest-i386-y += $(check-qtest-pci-y)
>  gcov-files-i386-y += $(gcov-files-pci-y)
> -check-qtest-i386-y += tests/vmxnet3-test$(EXESUF)
> -gcov-files-i386-y += hw/net/vmxnet3.c
> +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-y += tests/pvpanic-test$(EXESUF)
> 

Reviewed-by: Thomas Huth <thuth@redhat.com>

[Qemu-devel] [PATCH 05/25] check: Only test ne2000 when it is compiled in

[Juan Quintela]

Signed-off-by: Juan Quintela <quintela@redhat.com>
---
 tests/Makefile.include | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/tests/Makefile.include b/tests/Makefile.include
index e9dd3e8928..ae77d26932 100644
--- a/tests/Makefile.include
+++ b/tests/Makefile.include
@@ -220,8 +220,8 @@ gcov-files-pci-y += hw/net/pcnet.c
 gcov-files-pci-y += hw/net/pcnet-pci.c
 check-qtest-pci-y += tests/eepro100-test$(EXESUF)
 gcov-files-pci-y += hw/net/eepro100.c
-check-qtest-pci-y += tests/ne2000-test$(EXESUF)
-gcov-files-pci-y += hw/net/ne2000.c
+check-qtest-pci-$(CONFIG_NE2000_PCI) += tests/ne2000-test$(EXESUF)
+gcov-files-pci-$(CONFIG_NE2000_PCI) += hw/net/ne2000.c
 check-qtest-pci-y += tests/nvme-test$(EXESUF)
 gcov-files-pci-y += hw/block/nvme.c
 check-qtest-pci-y += tests/ac97-test$(EXESUF)
-- 
2.17.1

Re: [Qemu-devel] [PATCH 05/25] check: Only test ne2000 when it is compiled in

[Thomas Huth]

On 17.07.2018 13:33, Juan Quintela wrote:
> Signed-off-by: Juan Quintela <quintela@redhat.com>
> ---
>  tests/Makefile.include | 4 ++--
>  1 file changed, 2 insertions(+), 2 deletions(-)
> 
> diff --git a/tests/Makefile.include b/tests/Makefile.include
> index e9dd3e8928..ae77d26932 100644
> --- a/tests/Makefile.include
> +++ b/tests/Makefile.include
> @@ -220,8 +220,8 @@ gcov-files-pci-y += hw/net/pcnet.c
>  gcov-files-pci-y += hw/net/pcnet-pci.c
>  check-qtest-pci-y += tests/eepro100-test$(EXESUF)
>  gcov-files-pci-y += hw/net/eepro100.c
> -check-qtest-pci-y += tests/ne2000-test$(EXESUF)
> -gcov-files-pci-y += hw/net/ne2000.c
> +check-qtest-pci-$(CONFIG_NE2000_PCI) += tests/ne2000-test$(EXESUF)
> +gcov-files-pci-$(CONFIG_NE2000_PCI) += hw/net/ne2000.c
>  check-qtest-pci-y += tests/nvme-test$(EXESUF)
>  gcov-files-pci-y += hw/block/nvme.c
>  check-qtest-pci-y += tests/ac97-test$(EXESUF)

Reviewed-by: Thomas Huth <thuth@redhat.com>

[Qemu-devel] [PATCH 06/25] check: Only test eepro100 when it is compiled in

[Juan Quintela]

Signed-off-by: Juan Quintela <quintela@redhat.com>
---
 tests/Makefile.include | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/tests/Makefile.include b/tests/Makefile.include
index ae77d26932..560f486416 100644
--- a/tests/Makefile.include
+++ b/tests/Makefile.include
@@ -218,8 +218,8 @@ gcov-files-pci-y += hw/net/rtl8139.c
 check-qtest-pci-y += tests/pcnet-test$(EXESUF)
 gcov-files-pci-y += hw/net/pcnet.c
 gcov-files-pci-y += hw/net/pcnet-pci.c
-check-qtest-pci-y += tests/eepro100-test$(EXESUF)
-gcov-files-pci-y += hw/net/eepro100.c
+check-qtest-pci-$(CONFIG_EEPRO100_PCI) += tests/eepro100-test$(EXESUF)
+gcov-files-pci-$(CONFIG_EEPRO100_PCI) += hw/net/eepro100.c
 check-qtest-pci-$(CONFIG_NE2000_PCI) += tests/ne2000-test$(EXESUF)
 gcov-files-pci-$(CONFIG_NE2000_PCI) += hw/net/ne2000.c
 check-qtest-pci-y += tests/nvme-test$(EXESUF)
-- 
2.17.1

Re: [Qemu-devel] [PATCH 06/25] check: Only test eepro100 when it is compiled in

[Thomas Huth]

On 17.07.2018 13:33, Juan Quintela wrote:
> Signed-off-by: Juan Quintela <quintela@redhat.com>
> ---
>  tests/Makefile.include | 4 ++--
>  1 file changed, 2 insertions(+), 2 deletions(-)
> 
> diff --git a/tests/Makefile.include b/tests/Makefile.include
> index ae77d26932..560f486416 100644
> --- a/tests/Makefile.include
> +++ b/tests/Makefile.include
> @@ -218,8 +218,8 @@ gcov-files-pci-y += hw/net/rtl8139.c
>  check-qtest-pci-y += tests/pcnet-test$(EXESUF)
>  gcov-files-pci-y += hw/net/pcnet.c
>  gcov-files-pci-y += hw/net/pcnet-pci.c
> -check-qtest-pci-y += tests/eepro100-test$(EXESUF)
> -gcov-files-pci-y += hw/net/eepro100.c
> +check-qtest-pci-$(CONFIG_EEPRO100_PCI) += tests/eepro100-test$(EXESUF)
> +gcov-files-pci-$(CONFIG_EEPRO100_PCI) += hw/net/eepro100.c
>  check-qtest-pci-$(CONFIG_NE2000_PCI) += tests/ne2000-test$(EXESUF)
>  gcov-files-pci-$(CONFIG_NE2000_PCI) += hw/net/ne2000.c
>  check-qtest-pci-y += tests/nvme-test$(EXESUF)

Reviewed-by: Thomas Huth <thuth@redhat.com>

[Qemu-devel] [PATCH 07/25] check: Only test pcnet when it is compiled in

[Juan Quintela]

Signed-off-by: Juan Quintela <quintela@redhat.com>
---
 tests/Makefile.include | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/tests/Makefile.include b/tests/Makefile.include
index 560f486416..a039b70f9b 100644
--- a/tests/Makefile.include
+++ b/tests/Makefile.include
@@ -215,9 +215,9 @@ check-qtest-pci-y += tests/e1000e-test$(EXESUF)
 gcov-files-pci-y += hw/net/e1000e.c hw/net/e1000e_core.c
 check-qtest-pci-y += tests/rtl8139-test$(EXESUF)
 gcov-files-pci-y += hw/net/rtl8139.c
-check-qtest-pci-y += tests/pcnet-test$(EXESUF)
-gcov-files-pci-y += hw/net/pcnet.c
-gcov-files-pci-y += hw/net/pcnet-pci.c
+check-qtest-pci-$(CONFIG_PCNET_PCI) += tests/pcnet-test$(EXESUF)
+gcov-files-pci-$(CONFIG_PCNET_PCI) += hw/net/pcnet.c
+gcov-files-pci-$(CONFIG_PCNET_PCI) += hw/net/pcnet-pci.c
 check-qtest-pci-$(CONFIG_EEPRO100_PCI) += tests/eepro100-test$(EXESUF)
 gcov-files-pci-$(CONFIG_EEPRO100_PCI) += hw/net/eepro100.c
 check-qtest-pci-$(CONFIG_NE2000_PCI) += tests/ne2000-test$(EXESUF)
-- 
2.17.1

Re: [Qemu-devel] [PATCH 07/25] check: Only test pcnet when it is compiled in

[Thomas Huth]

On 17.07.2018 13:33, Juan Quintela wrote:
> Signed-off-by: Juan Quintela <quintela@redhat.com>
> ---
>  tests/Makefile.include | 6 +++---
>  1 file changed, 3 insertions(+), 3 deletions(-)
> 
> diff --git a/tests/Makefile.include b/tests/Makefile.include
> index 560f486416..a039b70f9b 100644
> --- a/tests/Makefile.include
> +++ b/tests/Makefile.include
> @@ -215,9 +215,9 @@ check-qtest-pci-y += tests/e1000e-test$(EXESUF)
>  gcov-files-pci-y += hw/net/e1000e.c hw/net/e1000e_core.c
>  check-qtest-pci-y += tests/rtl8139-test$(EXESUF)
>  gcov-files-pci-y += hw/net/rtl8139.c
> -check-qtest-pci-y += tests/pcnet-test$(EXESUF)
> -gcov-files-pci-y += hw/net/pcnet.c
> -gcov-files-pci-y += hw/net/pcnet-pci.c
> +check-qtest-pci-$(CONFIG_PCNET_PCI) += tests/pcnet-test$(EXESUF)
> +gcov-files-pci-$(CONFIG_PCNET_PCI) += hw/net/pcnet.c
> +gcov-files-pci-$(CONFIG_PCNET_PCI) += hw/net/pcnet-pci.c
>  check-qtest-pci-$(CONFIG_EEPRO100_PCI) += tests/eepro100-test$(EXESUF)
>  gcov-files-pci-$(CONFIG_EEPRO100_PCI) += hw/net/eepro100.c
>  check-qtest-pci-$(CONFIG_NE2000_PCI) += tests/ne2000-test$(EXESUF)

Reviewed-by: Thomas Huth <thuth@redhat.com>

[Qemu-devel] [PATCH 08/25] check: Only test rtl8139 when it is compiled in

[Juan Quintela]

test-file-redirector uses rtl8139 in everything except s390.

Signed-off-by: Juan Quintela <quintela@redhat.com>
---
 tests/Makefile.include | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/tests/Makefile.include b/tests/Makefile.include
index a039b70f9b..c6156fe105 100644
--- a/tests/Makefile.include
+++ b/tests/Makefile.include
@@ -213,8 +213,8 @@ check-qtest-pci-y += tests/e1000-test$(EXESUF)
 gcov-files-pci-y += hw/net/e1000.c
 check-qtest-pci-y += tests/e1000e-test$(EXESUF)
 gcov-files-pci-y += hw/net/e1000e.c hw/net/e1000e_core.c
-check-qtest-pci-y += tests/rtl8139-test$(EXESUF)
-gcov-files-pci-y += hw/net/rtl8139.c
+check-qtest-pci-$(CONFIG_RTL8139_PCI) += tests/rtl8139-test$(EXESUF)
+gcov-files-pci-$(CONFIG_RTL8139_PCI) += hw/net/rtl8139.c
 check-qtest-pci-$(CONFIG_PCNET_PCI) += tests/pcnet-test$(EXESUF)
 gcov-files-pci-$(CONFIG_PCNET_PCI) += hw/net/pcnet.c
 gcov-files-pci-$(CONFIG_PCNET_PCI) += hw/net/pcnet-pci.c
@@ -302,7 +302,7 @@ check-qtest-i386-$(CONFIG_TPM) += tests/tpm-tis-swtpm-test$(EXESUF)
 check-qtest-i386-$(CONFIG_TPM) += tests/tpm-tis-test$(EXESUF)
 check-qtest-i386-$(CONFIG_SLIRP) += tests/test-netfilter$(EXESUF)
 check-qtest-i386-$(CONFIG_POSIX) += tests/test-filter-mirror$(EXESUF)
-check-qtest-i386-$(CONFIG_POSIX) += tests/test-filter-redirector$(EXESUF)
+check-qtest-i386-$(CONFIG_RTL8139_PCI) += tests/test-filter-redirector$(EXESUF)
 check-qtest-i386-y += tests/migration-test$(EXESUF)
 check-qtest-i386-y += tests/test-x86-cpuid-compat$(EXESUF)
 check-qtest-i386-y += tests/numa-test$(EXESUF)
@@ -352,7 +352,7 @@ gcov-files-ppc64-y += hw/usb/hcd-xhci.c
 check-qtest-ppc64-y += $(check-qtest-virtio-y)
 check-qtest-ppc64-$(CONFIG_SLIRP) += tests/test-netfilter$(EXESUF)
 check-qtest-ppc64-$(CONFIG_POSIX) += tests/test-filter-mirror$(EXESUF)
-check-qtest-ppc64-$(CONFIG_POSIX) += tests/test-filter-redirector$(EXESUF)
+check-qtest-ppc64-$(CONFIG_RTL8139_PCI) += tests/test-filter-redirector$(EXESUF)
 check-qtest-ppc64-y += tests/display-vga-test$(EXESUF)
 check-qtest-ppc64-y += tests/numa-test$(EXESUF)
 check-qtest-ppc64-$(CONFIG_IVSHMEM) += tests/ivshmem-test$(EXESUF)
-- 
2.17.1

Re: [Qemu-devel] [PATCH 08/25] check: Only test rtl8139 when it is compiled in

[Thomas Huth]

On 17.07.2018 13:33, Juan Quintela wrote:
> test-file-redirector uses rtl8139 in everything except s390.
> 
> Signed-off-by: Juan Quintela <quintela@redhat.com>
> ---
>  tests/Makefile.include | 8 ++++----
>  1 file changed, 4 insertions(+), 4 deletions(-)
> 
> diff --git a/tests/Makefile.include b/tests/Makefile.include
> index a039b70f9b..c6156fe105 100644
> --- a/tests/Makefile.include
> +++ b/tests/Makefile.include
> @@ -213,8 +213,8 @@ check-qtest-pci-y += tests/e1000-test$(EXESUF)
>  gcov-files-pci-y += hw/net/e1000.c
>  check-qtest-pci-y += tests/e1000e-test$(EXESUF)
>  gcov-files-pci-y += hw/net/e1000e.c hw/net/e1000e_core.c
> -check-qtest-pci-y += tests/rtl8139-test$(EXESUF)
> -gcov-files-pci-y += hw/net/rtl8139.c
> +check-qtest-pci-$(CONFIG_RTL8139_PCI) += tests/rtl8139-test$(EXESUF)
> +gcov-files-pci-$(CONFIG_RTL8139_PCI) += hw/net/rtl8139.c
>  check-qtest-pci-$(CONFIG_PCNET_PCI) += tests/pcnet-test$(EXESUF)
>  gcov-files-pci-$(CONFIG_PCNET_PCI) += hw/net/pcnet.c
>  gcov-files-pci-$(CONFIG_PCNET_PCI) += hw/net/pcnet-pci.c
> @@ -302,7 +302,7 @@ check-qtest-i386-$(CONFIG_TPM) += tests/tpm-tis-swtpm-test$(EXESUF)
>  check-qtest-i386-$(CONFIG_TPM) += tests/tpm-tis-test$(EXESUF)
>  check-qtest-i386-$(CONFIG_SLIRP) += tests/test-netfilter$(EXESUF)
>  check-qtest-i386-$(CONFIG_POSIX) += tests/test-filter-mirror$(EXESUF)
> -check-qtest-i386-$(CONFIG_POSIX) += tests/test-filter-redirector$(EXESUF)
> +check-qtest-i386-$(CONFIG_RTL8139_PCI) += tests/test-filter-redirector$(EXESUF)
>  check-qtest-i386-y += tests/migration-test$(EXESUF)
>  check-qtest-i386-y += tests/test-x86-cpuid-compat$(EXESUF)
>  check-qtest-i386-y += tests/numa-test$(EXESUF)
> @@ -352,7 +352,7 @@ gcov-files-ppc64-y += hw/usb/hcd-xhci.c
>  check-qtest-ppc64-y += $(check-qtest-virtio-y)
>  check-qtest-ppc64-$(CONFIG_SLIRP) += tests/test-netfilter$(EXESUF)
>  check-qtest-ppc64-$(CONFIG_POSIX) += tests/test-filter-mirror$(EXESUF)
> -check-qtest-ppc64-$(CONFIG_POSIX) += tests/test-filter-redirector$(EXESUF)
> +check-qtest-ppc64-$(CONFIG_RTL8139_PCI) += tests/test-filter-redirector$(EXESUF)
>  check-qtest-ppc64-y += tests/display-vga-test$(EXESUF)
>  check-qtest-ppc64-y += tests/numa-test$(EXESUF)
>  check-qtest-ppc64-$(CONFIG_IVSHMEM) += tests/ivshmem-test$(EXESUF)

Reviewed-by: Thomas Huth <thuth@redhat.com>

[Qemu-devel] [PATCH 09/25] check: Only test es1370 when it is compiled in

[Juan Quintela]

Signed-off-by: Juan Quintela <quintela@redhat.com>
---
 tests/Makefile.include | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/tests/Makefile.include b/tests/Makefile.include
index c6156fe105..3d146310f0 100644
--- a/tests/Makefile.include
+++ b/tests/Makefile.include
@@ -226,8 +226,8 @@ check-qtest-pci-y += tests/nvme-test$(EXESUF)
 gcov-files-pci-y += hw/block/nvme.c
 check-qtest-pci-y += tests/ac97-test$(EXESUF)
 gcov-files-pci-y += hw/audio/ac97.c
-check-qtest-pci-y += tests/es1370-test$(EXESUF)
-gcov-files-pci-y += hw/audio/es1370.c
+check-qtest-pci-$(CONFIG_ES1370) += tests/es1370-test$(EXESUF)
+gcov-files-pci-$(CONFIG_ES1370) += hw/audio/es1370.c
 check-qtest-pci-y += $(check-qtest-virtio-y)
 gcov-files-pci-y += $(gcov-files-virtio-y) hw/virtio/virtio-pci.c
 check-qtest-pci-y += tests/tpci200-test$(EXESUF)
-- 
2.17.1

Re: [Qemu-devel] [PATCH 09/25] check: Only test es1370 when it is compiled in

[Thomas Huth]

On 17.07.2018 13:33, Juan Quintela wrote:
> Signed-off-by: Juan Quintela <quintela@redhat.com>
> ---
>  tests/Makefile.include | 4 ++--
>  1 file changed, 2 insertions(+), 2 deletions(-)
> 
> diff --git a/tests/Makefile.include b/tests/Makefile.include
> index c6156fe105..3d146310f0 100644
> --- a/tests/Makefile.include
> +++ b/tests/Makefile.include
> @@ -226,8 +226,8 @@ check-qtest-pci-y += tests/nvme-test$(EXESUF)
>  gcov-files-pci-y += hw/block/nvme.c
>  check-qtest-pci-y += tests/ac97-test$(EXESUF)
>  gcov-files-pci-y += hw/audio/ac97.c
> -check-qtest-pci-y += tests/es1370-test$(EXESUF)
> -gcov-files-pci-y += hw/audio/es1370.c
> +check-qtest-pci-$(CONFIG_ES1370) += tests/es1370-test$(EXESUF)
> +gcov-files-pci-$(CONFIG_ES1370) += hw/audio/es1370.c
>  check-qtest-pci-y += $(check-qtest-virtio-y)
>  gcov-files-pci-y += $(gcov-files-virtio-y) hw/virtio/virtio-pci.c
>  check-qtest-pci-y += tests/tpci200-test$(EXESUF)
> 

Reviewed-by: Thomas Huth <thuth@redhat.com>

[Qemu-devel] [PATCH 10/25] check: Only test ac97 when it is compiled in

[Juan Quintela]

Signed-off-by: Juan Quintela <quintela@redhat.com>
---
 tests/Makefile.include | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/tests/Makefile.include b/tests/Makefile.include
index 3d146310f0..af395b5f22 100644
--- a/tests/Makefile.include
+++ b/tests/Makefile.include
@@ -224,8 +224,8 @@ check-qtest-pci-$(CONFIG_NE2000_PCI) += tests/ne2000-test$(EXESUF)
 gcov-files-pci-$(CONFIG_NE2000_PCI) += hw/net/ne2000.c
 check-qtest-pci-y += tests/nvme-test$(EXESUF)
 gcov-files-pci-y += hw/block/nvme.c
-check-qtest-pci-y += tests/ac97-test$(EXESUF)
-gcov-files-pci-y += hw/audio/ac97.c
+check-qtest-pci-$(CONFIG_AC97) += tests/ac97-test$(EXESUF)
+gcov-files-pci-$(CONFIG_AC97) += hw/audio/ac97.c
 check-qtest-pci-$(CONFIG_ES1370) += tests/es1370-test$(EXESUF)
 gcov-files-pci-$(CONFIG_ES1370) += hw/audio/es1370.c
 check-qtest-pci-y += $(check-qtest-virtio-y)
-- 
2.17.1

Re: [Qemu-devel] [PATCH 10/25] check: Only test ac97 when it is compiled in

[Thomas Huth]

On 17.07.2018 13:33, Juan Quintela wrote:
> Signed-off-by: Juan Quintela <quintela@redhat.com>
> ---
>  tests/Makefile.include | 4 ++--
>  1 file changed, 2 insertions(+), 2 deletions(-)
> 
> diff --git a/tests/Makefile.include b/tests/Makefile.include
> index 3d146310f0..af395b5f22 100644
> --- a/tests/Makefile.include
> +++ b/tests/Makefile.include
> @@ -224,8 +224,8 @@ check-qtest-pci-$(CONFIG_NE2000_PCI) += tests/ne2000-test$(EXESUF)
>  gcov-files-pci-$(CONFIG_NE2000_PCI) += hw/net/ne2000.c
>  check-qtest-pci-y += tests/nvme-test$(EXESUF)
>  gcov-files-pci-y += hw/block/nvme.c
> -check-qtest-pci-y += tests/ac97-test$(EXESUF)
> -gcov-files-pci-y += hw/audio/ac97.c
> +check-qtest-pci-$(CONFIG_AC97) += tests/ac97-test$(EXESUF)
> +gcov-files-pci-$(CONFIG_AC97) += hw/audio/ac97.c
>  check-qtest-pci-$(CONFIG_ES1370) += tests/es1370-test$(EXESUF)
>  gcov-files-pci-$(CONFIG_ES1370) += hw/audio/es1370.c
>  check-qtest-pci-y += $(check-qtest-virtio-y)
> 

Reviewed-by: Thomas Huth <thuth@redhat.com>

[Qemu-devel] [PATCH 11/25] check: Only test hda when it is compiled in

[Juan Quintela]

Signed-off-by: Juan Quintela <quintela@redhat.com>
---
 tests/Makefile.include | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/tests/Makefile.include b/tests/Makefile.include
index af395b5f22..691f853ab6 100644
--- a/tests/Makefile.include
+++ b/tests/Makefile.include
@@ -241,8 +241,8 @@ gcov-files-pci-y += hw/display/vga-pci.c
 gcov-files-pci-y += hw/display/virtio-gpu.c
 gcov-files-pci-y += hw/display/virtio-gpu-pci.c
 gcov-files-pci-$(CONFIG_VIRTIO_VGA) += hw/display/virtio-vga.c
-check-qtest-pci-y += tests/intel-hda-test$(EXESUF)
-gcov-files-pci-y += hw/audio/intel-hda.c hw/audio/hda-codec.c
+check-qtest-pci-$(CONFIG_HDA) += tests/intel-hda-test$(EXESUF)
+gcov-files-pci-$(CONFIG_HDA) += hw/audio/intel-hda.c hw/audio/hda-codec.c
 check-qtest-pci-$(CONFIG_IVSHMEM) += tests/ivshmem-test$(EXESUF)
 gcov-files-pci-y += hw/misc/ivshmem.c
 check-qtest-pci-y += tests/megasas-test$(EXESUF)
-- 
2.17.1

Re: [Qemu-devel] [PATCH 11/25] check: Only test hda when it is compiled in

[Thomas Huth]

On 17.07.2018 13:33, Juan Quintela wrote:
> Signed-off-by: Juan Quintela <quintela@redhat.com>
> ---
>  tests/Makefile.include | 4 ++--
>  1 file changed, 2 insertions(+), 2 deletions(-)
> 
> diff --git a/tests/Makefile.include b/tests/Makefile.include
> index af395b5f22..691f853ab6 100644
> --- a/tests/Makefile.include
> +++ b/tests/Makefile.include
> @@ -241,8 +241,8 @@ gcov-files-pci-y += hw/display/vga-pci.c
>  gcov-files-pci-y += hw/display/virtio-gpu.c
>  gcov-files-pci-y += hw/display/virtio-gpu-pci.c
>  gcov-files-pci-$(CONFIG_VIRTIO_VGA) += hw/display/virtio-vga.c
> -check-qtest-pci-y += tests/intel-hda-test$(EXESUF)
> -gcov-files-pci-y += hw/audio/intel-hda.c hw/audio/hda-codec.c
> +check-qtest-pci-$(CONFIG_HDA) += tests/intel-hda-test$(EXESUF)
> +gcov-files-pci-$(CONFIG_HDA) += hw/audio/intel-hda.c hw/audio/hda-codec.c
>  check-qtest-pci-$(CONFIG_IVSHMEM) += tests/ivshmem-test$(EXESUF)
>  gcov-files-pci-y += hw/misc/ivshmem.c
>  check-qtest-pci-y += tests/megasas-test$(EXESUF)
> 

Reviewed-by: Thomas Huth <thuth@redhat.com>

[Qemu-devel] [PATCH 12/25] check: Only test ipack when it is compiled in

[Juan Quintela]

Signed-off-by: Juan Quintela <quintela@redhat.com>
---
 tests/Makefile.include | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/tests/Makefile.include b/tests/Makefile.include
index 691f853ab6..5a3943c81c 100644
--- a/tests/Makefile.include
+++ b/tests/Makefile.include
@@ -230,10 +230,10 @@ check-qtest-pci-$(CONFIG_ES1370) += tests/es1370-test$(EXESUF)
 gcov-files-pci-$(CONFIG_ES1370) += hw/audio/es1370.c
 check-qtest-pci-y += $(check-qtest-virtio-y)
 gcov-files-pci-y += $(gcov-files-virtio-y) hw/virtio/virtio-pci.c
-check-qtest-pci-y += tests/tpci200-test$(EXESUF)
-gcov-files-pci-y += hw/ipack/tpci200.c
-check-qtest-pci-y += $(check-qtest-ipack-y)
-gcov-files-pci-y += $(gcov-files-ipack-y)
+check-qtest-pci-$(CONFIG_IPACK) += tests/tpci200-test$(EXESUF)
+gcov-files-pci-$(CONFIG_IPACK) += hw/ipack/tpci200.c
+check-qtest-pci-$(CONFIG_IPACK) += $(check-qtest-ipack-y)
+gcov-files-pci-$(CONFIG_IPACK) += $(gcov-files-ipack-y)
 check-qtest-pci-y += tests/display-vga-test$(EXESUF)
 gcov-files-pci-y += hw/display/vga.c
 gcov-files-pci-y += hw/display/cirrus_vga.c
-- 
2.17.1

Re: [Qemu-devel] [PATCH 12/25] check: Only test ipack when it is compiled in

[Thomas Huth]

On 17.07.2018 13:33, Juan Quintela wrote:
> Signed-off-by: Juan Quintela <quintela@redhat.com>
> ---
>  tests/Makefile.include | 8 ++++----
>  1 file changed, 4 insertions(+), 4 deletions(-)
> 
> diff --git a/tests/Makefile.include b/tests/Makefile.include
> index 691f853ab6..5a3943c81c 100644
> --- a/tests/Makefile.include
> +++ b/tests/Makefile.include
> @@ -230,10 +230,10 @@ check-qtest-pci-$(CONFIG_ES1370) += tests/es1370-test$(EXESUF)
>  gcov-files-pci-$(CONFIG_ES1370) += hw/audio/es1370.c
>  check-qtest-pci-y += $(check-qtest-virtio-y)
>  gcov-files-pci-y += $(gcov-files-virtio-y) hw/virtio/virtio-pci.c
> -check-qtest-pci-y += tests/tpci200-test$(EXESUF)
> -gcov-files-pci-y += hw/ipack/tpci200.c
> -check-qtest-pci-y += $(check-qtest-ipack-y)
> -gcov-files-pci-y += $(gcov-files-ipack-y)
> +check-qtest-pci-$(CONFIG_IPACK) += tests/tpci200-test$(EXESUF)
> +gcov-files-pci-$(CONFIG_IPACK) += hw/ipack/tpci200.c
> +check-qtest-pci-$(CONFIG_IPACK) += $(check-qtest-ipack-y)
> +gcov-files-pci-$(CONFIG_IPACK) += $(gcov-files-ipack-y)
>  check-qtest-pci-y += tests/display-vga-test$(EXESUF)
>  gcov-files-pci-y += hw/display/vga.c
>  gcov-files-pci-y += hw/display/cirrus_vga.c
> 

Reviewed-by: Thomas Huth <thuth@redhat.com>

[Qemu-devel] [PATCH 13/25] check: Only test isa-testdev when it is compiled in

[Juan Quintela]

Signed-off-by: Juan Quintela <quintela@redhat.com>
---
 tests/Makefile.include | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

diff --git a/tests/Makefile.include b/tests/Makefile.include
index 5a3943c81c..a56d423303 100644
--- a/tests/Makefile.include
+++ b/tests/Makefile.include
@@ -248,7 +248,7 @@ gcov-files-pci-y += hw/misc/ivshmem.c
 check-qtest-pci-y += tests/megasas-test$(EXESUF)
 gcov-files-pci-y += hw/scsi/megasas.c
 
-check-qtest-i386-y = 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)
@@ -319,15 +319,15 @@ check-qtest-m68k-y = tests/boot-serial-test$(EXESUF)
 
 check-qtest-microblaze-y = tests/boot-serial-test$(EXESUF)
 
-check-qtest-mips-y = tests/endianness-test$(EXESUF)
+check-qtest-mips-$(CONFIG_ISA_TESTDEV) = tests/endianness-test$(EXESUF)
 
-check-qtest-mips64-y = tests/endianness-test$(EXESUF)
+check-qtest-mips64-$(CONFIG_ISA_TESTDEV) = tests/endianness-test$(EXESUF)
 
-check-qtest-mips64el-y = 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-moxie-$(CONFIG_ISA_TESTDEV) = tests/boot-serial-test$(EXESUF)
 
-check-qtest-ppc-y = tests/endianness-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)
@@ -358,16 +358,16 @@ check-qtest-ppc64-y += tests/numa-test$(EXESUF)
 check-qtest-ppc64-$(CONFIG_IVSHMEM) += tests/ivshmem-test$(EXESUF)
 check-qtest-ppc64-y += tests/cpu-plug-test$(EXESUF)
 
-check-qtest-sh4-y = tests/endianness-test$(EXESUF)
+check-qtest-sh4-$(CONFIG_ISA_TESTDEV) = tests/endianness-test$(EXESUF)
 
-check-qtest-sh4eb-y = 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-y = tests/endianness-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)
 
-- 
2.17.1

Re: [Qemu-devel] [PATCH 13/25] check: Only test isa-testdev when it is compiled in

[Thomas Huth]

On 17.07.2018 13:33, Juan Quintela wrote:
[...]
> @@ -319,15 +319,15 @@ check-qtest-m68k-y = tests/boot-serial-test$(EXESUF)
>  
>  check-qtest-microblaze-y = tests/boot-serial-test$(EXESUF)
>  
> -check-qtest-mips-y = tests/endianness-test$(EXESUF)
> +check-qtest-mips-$(CONFIG_ISA_TESTDEV) = tests/endianness-test$(EXESUF)
>  
> -check-qtest-mips64-y = tests/endianness-test$(EXESUF)
> +check-qtest-mips64-$(CONFIG_ISA_TESTDEV) = tests/endianness-test$(EXESUF)
>  
> -check-qtest-mips64el-y = 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-moxie-$(CONFIG_ISA_TESTDEV) = tests/boot-serial-test$(EXESUF)

boot-serial-test is not related to ISA_TESTDEV, so that change looks
wrong to me.

 Thomas

[Qemu-devel] [PATCH 14/25] check: Only test ioh3420 when it is compiled in

[Juan Quintela]

Signed-off-by: Juan Quintela <quintela@redhat.com>
---
 tests/Makefile.include | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/tests/Makefile.include b/tests/Makefile.include
index a56d423303..3b555660bd 100644
--- a/tests/Makefile.include
+++ b/tests/Makefile.include
@@ -278,8 +278,8 @@ check-qtest-i386-y += tests/pvpanic-test$(EXESUF)
 gcov-files-i386-y += i386-softmmu/hw/misc/pvpanic.c
 check-qtest-i386-y += tests/i82801b11-test$(EXESUF)
 gcov-files-i386-y += hw/pci-bridge/i82801b11.c
-check-qtest-i386-y += tests/ioh3420-test$(EXESUF)
-gcov-files-i386-y += hw/pci-bridge/ioh3420.c
+check-qtest-i386-$(CONFIG_IOH3420) += tests/ioh3420-test$(EXESUF)
+gcov-files-i386-$(CONFIG_IOH3420) += hw/pci-bridge/ioh3420.c
 check-qtest-i386-y += tests/usb-hcd-ohci-test$(EXESUF)
 gcov-files-i386-y += hw/usb/hcd-ohci.c
 check-qtest-i386-y += tests/usb-hcd-uhci-test$(EXESUF)
-- 
2.17.1

Re: [Qemu-devel] [PATCH 14/25] check: Only test ioh3420 when it is compiled in

[Thomas Huth]

On 17.07.2018 13:33, Juan Quintela wrote:
> Signed-off-by: Juan Quintela <quintela@redhat.com>
> ---
>  tests/Makefile.include | 4 ++--
>  1 file changed, 2 insertions(+), 2 deletions(-)
> 
> diff --git a/tests/Makefile.include b/tests/Makefile.include
> index a56d423303..3b555660bd 100644
> --- a/tests/Makefile.include
> +++ b/tests/Makefile.include
> @@ -278,8 +278,8 @@ check-qtest-i386-y += tests/pvpanic-test$(EXESUF)
>  gcov-files-i386-y += i386-softmmu/hw/misc/pvpanic.c
>  check-qtest-i386-y += tests/i82801b11-test$(EXESUF)
>  gcov-files-i386-y += hw/pci-bridge/i82801b11.c
> -check-qtest-i386-y += tests/ioh3420-test$(EXESUF)
> -gcov-files-i386-y += hw/pci-bridge/ioh3420.c
> +check-qtest-i386-$(CONFIG_IOH3420) += tests/ioh3420-test$(EXESUF)
> +gcov-files-i386-$(CONFIG_IOH3420) += hw/pci-bridge/ioh3420.c
>  check-qtest-i386-y += tests/usb-hcd-ohci-test$(EXESUF)
>  gcov-files-i386-y += hw/usb/hcd-ohci.c
>  check-qtest-i386-y += tests/usb-hcd-uhci-test$(EXESUF)

Reviewed-by: Thomas Huth <thuth@redhat.com>

[Qemu-devel] [PATCH 15/25] check: Only test i82801b11 when it is compiled in

[Juan Quintela]

Signed-off-by: Juan Quintela <quintela@redhat.com>
---
 tests/Makefile.include | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/tests/Makefile.include b/tests/Makefile.include
index 3b555660bd..b0aa79909b 100644
--- a/tests/Makefile.include
+++ b/tests/Makefile.include
@@ -276,8 +276,8 @@ gcov-files-i386-y += hw/net/net_rx_pkt.c
 gcov-files-i386-y += hw/net/net_tx_pkt.c
 check-qtest-i386-y += tests/pvpanic-test$(EXESUF)
 gcov-files-i386-y += i386-softmmu/hw/misc/pvpanic.c
-check-qtest-i386-y += tests/i82801b11-test$(EXESUF)
-gcov-files-i386-y += hw/pci-bridge/i82801b11.c
+check-qtest-i386-$(CONFIG_I82801B11) += tests/i82801b11-test$(EXESUF)
+gcov-files-i386-$(CONFIG_I82801B11) += hw/pci-bridge/i82801b11.c
 check-qtest-i386-$(CONFIG_IOH3420) += tests/ioh3420-test$(EXESUF)
 gcov-files-i386-$(CONFIG_IOH3420) += hw/pci-bridge/ioh3420.c
 check-qtest-i386-y += tests/usb-hcd-ohci-test$(EXESUF)
-- 
2.17.1

Re: [Qemu-devel] [PATCH 15/25] check: Only test i82801b11 when it is compiled in

[Thomas Huth]

On 17.07.2018 13:33, Juan Quintela wrote:
> Signed-off-by: Juan Quintela <quintela@redhat.com>
> ---
>  tests/Makefile.include | 4 ++--
>  1 file changed, 2 insertions(+), 2 deletions(-)
> 
> diff --git a/tests/Makefile.include b/tests/Makefile.include
> index 3b555660bd..b0aa79909b 100644
> --- a/tests/Makefile.include
> +++ b/tests/Makefile.include
> @@ -276,8 +276,8 @@ gcov-files-i386-y += hw/net/net_rx_pkt.c
>  gcov-files-i386-y += hw/net/net_tx_pkt.c
>  check-qtest-i386-y += tests/pvpanic-test$(EXESUF)
>  gcov-files-i386-y += i386-softmmu/hw/misc/pvpanic.c
> -check-qtest-i386-y += tests/i82801b11-test$(EXESUF)
> -gcov-files-i386-y += hw/pci-bridge/i82801b11.c
> +check-qtest-i386-$(CONFIG_I82801B11) += tests/i82801b11-test$(EXESUF)
> +gcov-files-i386-$(CONFIG_I82801B11) += hw/pci-bridge/i82801b11.c
>  check-qtest-i386-$(CONFIG_IOH3420) += tests/ioh3420-test$(EXESUF)
>  gcov-files-i386-$(CONFIG_IOH3420) += hw/pci-bridge/ioh3420.c
>  check-qtest-i386-y += tests/usb-hcd-ohci-test$(EXESUF)

Reviewed-by: Thomas Huth <thuth@redhat.com>

[Qemu-devel] [PATCH 16/25] check: Only test sdhci when it is compiled in

[Juan Quintela]

Signed-off-by: Juan Quintela <quintela@redhat.com>
---
 tests/Makefile.include | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/tests/Makefile.include b/tests/Makefile.include
index b0aa79909b..868a41986b 100644
--- a/tests/Makefile.include
+++ b/tests/Makefile.include
@@ -307,7 +307,7 @@ check-qtest-i386-y += tests/migration-test$(EXESUF)
 check-qtest-i386-y += tests/test-x86-cpuid-compat$(EXESUF)
 check-qtest-i386-y += tests/numa-test$(EXESUF)
 check-qtest-x86_64-y += $(check-qtest-i386-y)
-check-qtest-x86_64-y += tests/sdhci-test$(EXESUF)
+check-qtest-x86_64-$(CONFIG_SDHCI) += tests/sdhci-test$(EXESUF)
 gcov-files-i386-y += i386-softmmu/hw/timer/mc146818rtc.c
 gcov-files-x86_64-y = $(subst i386-softmmu/,x86_64-softmmu/,$(gcov-files-i386-y))
 
@@ -381,10 +381,10 @@ gcov-files-arm-y += arm-softmmu/hw/block/virtio-blk.c
 check-qtest-arm-y += tests/test-arm-mptimer$(EXESUF)
 gcov-files-arm-y += hw/timer/arm_mptimer.c
 check-qtest-arm-y += tests/boot-serial-test$(EXESUF)
-check-qtest-arm-y += tests/sdhci-test$(EXESUF)
+check-qtest-arm-$(CONFIG_SDHCI) += tests/sdhci-test$(EXESUF)
 
 check-qtest-aarch64-y = tests/numa-test$(EXESUF)
-check-qtest-aarch64-y += tests/sdhci-test$(EXESUF)
+check-qtest-aarch64-$(CONFIG_SDHCI) += tests/sdhci-test$(EXESUF)
 check-qtest-aarch64-y += tests/boot-serial-test$(EXESUF)
 
 check-qtest-microblazeel-y = $(check-qtest-microblaze-y)
-- 
2.17.1

Re: [Qemu-devel] [PATCH 16/25] check: Only test sdhci when it is compiled in

[Thomas Huth]

On 17.07.2018 13:33, Juan Quintela wrote:
> Signed-off-by: Juan Quintela <quintela@redhat.com>
> ---
>  tests/Makefile.include | 6 +++---
>  1 file changed, 3 insertions(+), 3 deletions(-)
> 
> diff --git a/tests/Makefile.include b/tests/Makefile.include
> index b0aa79909b..868a41986b 100644
> --- a/tests/Makefile.include
> +++ b/tests/Makefile.include
> @@ -307,7 +307,7 @@ check-qtest-i386-y += tests/migration-test$(EXESUF)
>  check-qtest-i386-y += tests/test-x86-cpuid-compat$(EXESUF)
>  check-qtest-i386-y += tests/numa-test$(EXESUF)
>  check-qtest-x86_64-y += $(check-qtest-i386-y)
> -check-qtest-x86_64-y += tests/sdhci-test$(EXESUF)
> +check-qtest-x86_64-$(CONFIG_SDHCI) += tests/sdhci-test$(EXESUF)
>  gcov-files-i386-y += i386-softmmu/hw/timer/mc146818rtc.c
>  gcov-files-x86_64-y = $(subst i386-softmmu/,x86_64-softmmu/,$(gcov-files-i386-y))
>  
> @@ -381,10 +381,10 @@ gcov-files-arm-y += arm-softmmu/hw/block/virtio-blk.c
>  check-qtest-arm-y += tests/test-arm-mptimer$(EXESUF)
>  gcov-files-arm-y += hw/timer/arm_mptimer.c
>  check-qtest-arm-y += tests/boot-serial-test$(EXESUF)
> -check-qtest-arm-y += tests/sdhci-test$(EXESUF)
> +check-qtest-arm-$(CONFIG_SDHCI) += tests/sdhci-test$(EXESUF)
>  
>  check-qtest-aarch64-y = tests/numa-test$(EXESUF)
> -check-qtest-aarch64-y += tests/sdhci-test$(EXESUF)
> +check-qtest-aarch64-$(CONFIG_SDHCI) += tests/sdhci-test$(EXESUF)
>  check-qtest-aarch64-y += tests/boot-serial-test$(EXESUF)
>  
>  check-qtest-microblazeel-y = $(check-qtest-microblaze-y)
> 

Reviewed-by: Thomas Huth <thuth@redhat.com>

[Qemu-devel] [PATCH 17/25] check: Only test wdt_ib700 when it is compiled in

[Juan Quintela]

Signed-off-by: Juan Quintela <quintela@redhat.com>
---
 tests/Makefile.include | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/tests/Makefile.include b/tests/Makefile.include
index 868a41986b..f635517a68 100644
--- a/tests/Makefile.include
+++ b/tests/Makefile.include
@@ -265,9 +265,9 @@ 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-y += tests/wdt_ib700-test$(EXESUF)
+check-qtest-i386-$(CONFIG_WDT_IB700) += tests/wdt_ib700-test$(EXESUF)
 check-qtest-i386-y += tests/tco-test$(EXESUF)
-gcov-files-i386-y += hw/watchdog/watchdog.c hw/watchdog/wdt_ib700.c
+gcov-files-i386-$(CONFIG_WDT_IB700) += hw/watchdog/watchdog.c hw/watchdog/wdt_ib700.c
 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)
-- 
2.17.1

Re: [Qemu-devel] [PATCH 17/25] check: Only test wdt_ib700 when it is compiled in

[Thomas Huth]

On 17.07.2018 13:33, Juan Quintela wrote:
> Signed-off-by: Juan Quintela <quintela@redhat.com>
> ---
>  tests/Makefile.include | 4 ++--
>  1 file changed, 2 insertions(+), 2 deletions(-)
> 
> diff --git a/tests/Makefile.include b/tests/Makefile.include
> index 868a41986b..f635517a68 100644
> --- a/tests/Makefile.include
> +++ b/tests/Makefile.include
> @@ -265,9 +265,9 @@ 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-y += tests/wdt_ib700-test$(EXESUF)
> +check-qtest-i386-$(CONFIG_WDT_IB700) += tests/wdt_ib700-test$(EXESUF)
>  check-qtest-i386-y += tests/tco-test$(EXESUF)
> -gcov-files-i386-y += hw/watchdog/watchdog.c hw/watchdog/wdt_ib700.c
> +gcov-files-i386-$(CONFIG_WDT_IB700) += hw/watchdog/watchdog.c hw/watchdog/wdt_ib700.c
>  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)

In case you respin: Move the two ib700 lines next to each other again
while you're at it?

Reviewed-by: Thomas Huth <thuth@redhat.com>

[Qemu-devel] [PATCH 18/25] check: Only test pvpanic when it is compiled in

[Juan Quintela]

There was not possible to compile out pvpanic.  Use the same trick
that applesmc.

Signed-off-by: Juan Quintela <quintela@redhat.com>
---
 hw/misc/pvpanic.c         | 11 -----------
 include/hw/misc/pvpanic.h | 11 ++++++++++-
 tests/Makefile.include    |  4 ++--
 3 files changed, 12 insertions(+), 14 deletions(-)

diff --git a/hw/misc/pvpanic.c b/hw/misc/pvpanic.c
index b26250dec9..9d8961ba0c 100644
--- a/hw/misc/pvpanic.c
+++ b/hw/misc/pvpanic.c
@@ -99,17 +99,6 @@ static void pvpanic_isa_realizefn(DeviceState *dev, Error **errp)
     isa_register_ioport(d, &s->io, s->ioport);
 }
 
-#define PVPANIC_IOPORT_PROP "ioport"
-
-uint16_t pvpanic_port(void)
-{
-    Object *o = object_resolve_path_type("", TYPE_PVPANIC, NULL);
-    if (!o) {
-        return 0;
-    }
-    return object_property_get_uint(o, PVPANIC_IOPORT_PROP, NULL);
-}
-
 static Property pvpanic_isa_properties[] = {
     DEFINE_PROP_UINT16(PVPANIC_IOPORT_PROP, PVPanicState, ioport, 0x505),
     DEFINE_PROP_END_OF_LIST(),
diff --git a/include/hw/misc/pvpanic.h b/include/hw/misc/pvpanic.h
index 36a54e270c..1ee071a703 100644
--- a/include/hw/misc/pvpanic.h
+++ b/include/hw/misc/pvpanic.h
@@ -16,6 +16,15 @@
 
 #define TYPE_PVPANIC "pvpanic"
 
-uint16_t pvpanic_port(void);
+#define PVPANIC_IOPORT_PROP "ioport"
+
+static inline uint16_t pvpanic_port(void)
+{
+    Object *o = object_resolve_path_type("", TYPE_PVPANIC, NULL);
+    if (!o) {
+        return 0;
+    }
+    return object_property_get_uint(o, PVPANIC_IOPORT_PROP, NULL);
+}
 
 #endif
diff --git a/tests/Makefile.include b/tests/Makefile.include
index f635517a68..31d124ee44 100644
--- a/tests/Makefile.include
+++ b/tests/Makefile.include
@@ -274,8 +274,8 @@ 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-y += tests/pvpanic-test$(EXESUF)
-gcov-files-i386-y += i386-softmmu/hw/misc/pvpanic.c
+check-qtest-i386-$(CONFIG_PVPANIC) += tests/pvpanic-test$(EXESUF)
+gcov-files-i386-$(CONFIG_PVPANIC) += i386-softmmu/hw/misc/pvpanic.c
 check-qtest-i386-$(CONFIG_I82801B11) += tests/i82801b11-test$(EXESUF)
 gcov-files-i386-$(CONFIG_I82801B11) += hw/pci-bridge/i82801b11.c
 check-qtest-i386-$(CONFIG_IOH3420) += tests/ioh3420-test$(EXESUF)
-- 
2.17.1

Re: [Qemu-devel] [PATCH 18/25] check: Only test pvpanic when it is compiled in

[Thomas Huth]

On 17.07.2018 13:33, Juan Quintela wrote:
> There was not possible to compile out pvpanic.  Use the same trick
> that applesmc.

Either "It is not possible" or "There is no possibility" ? And that
"that" in the second sentence also sounds wrong.

Apart from that:

Reviewed-by: Thomas Huth <thuth@redhat.com>

[Qemu-devel] [PATCH 19/25] check: Only test nvme when it is compiled in

[Juan Quintela]

Signed-off-by: Juan Quintela <quintela@redhat.com>
---
 tests/Makefile.include | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/tests/Makefile.include b/tests/Makefile.include
index 31d124ee44..b3e707e8c3 100644
--- a/tests/Makefile.include
+++ b/tests/Makefile.include
@@ -222,8 +222,8 @@ check-qtest-pci-$(CONFIG_EEPRO100_PCI) += tests/eepro100-test$(EXESUF)
 gcov-files-pci-$(CONFIG_EEPRO100_PCI) += hw/net/eepro100.c
 check-qtest-pci-$(CONFIG_NE2000_PCI) += tests/ne2000-test$(EXESUF)
 gcov-files-pci-$(CONFIG_NE2000_PCI) += hw/net/ne2000.c
-check-qtest-pci-y += tests/nvme-test$(EXESUF)
-gcov-files-pci-y += hw/block/nvme.c
+check-qtest-pci-$(CONFIG_NVME_PCI) += tests/nvme-test$(EXESUF)
+gcov-files-pci-$(CONFIG_NVME_PCI) += hw/block/nvme.c
 check-qtest-pci-$(CONFIG_AC97) += tests/ac97-test$(EXESUF)
 gcov-files-pci-$(CONFIG_AC97) += hw/audio/ac97.c
 check-qtest-pci-$(CONFIG_ES1370) += tests/es1370-test$(EXESUF)
-- 
2.17.1

Re: [Qemu-devel] [PATCH 19/25] check: Only test nvme when it is compiled in

[Thomas Huth]

On 17.07.2018 13:33, Juan Quintela wrote:
> Signed-off-by: Juan Quintela <quintela@redhat.com>
> ---
>  tests/Makefile.include | 4 ++--
>  1 file changed, 2 insertions(+), 2 deletions(-)
> 
> diff --git a/tests/Makefile.include b/tests/Makefile.include
> index 31d124ee44..b3e707e8c3 100644
> --- a/tests/Makefile.include
> +++ b/tests/Makefile.include
> @@ -222,8 +222,8 @@ check-qtest-pci-$(CONFIG_EEPRO100_PCI) += tests/eepro100-test$(EXESUF)
>  gcov-files-pci-$(CONFIG_EEPRO100_PCI) += hw/net/eepro100.c
>  check-qtest-pci-$(CONFIG_NE2000_PCI) += tests/ne2000-test$(EXESUF)
>  gcov-files-pci-$(CONFIG_NE2000_PCI) += hw/net/ne2000.c
> -check-qtest-pci-y += tests/nvme-test$(EXESUF)
> -gcov-files-pci-y += hw/block/nvme.c
> +check-qtest-pci-$(CONFIG_NVME_PCI) += tests/nvme-test$(EXESUF)
> +gcov-files-pci-$(CONFIG_NVME_PCI) += hw/block/nvme.c
>  check-qtest-pci-$(CONFIG_AC97) += tests/ac97-test$(EXESUF)
>  gcov-files-pci-$(CONFIG_AC97) += hw/audio/ac97.c
>  check-qtest-pci-$(CONFIG_ES1370) += tests/es1370-test$(EXESUF)

Reviewed-by: Thomas Huth <thuth@redhat.com>

[Qemu-devel] [PATCH 20/25] check: Only test usb-xhci-nec when it is compiled in

[Juan Quintela]

Signed-off-by: Juan Quintela <quintela@redhat.com>
---
 tests/Makefile.include | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/tests/Makefile.include b/tests/Makefile.include
index b3e707e8c3..ccf71bddcc 100644
--- a/tests/Makefile.include
+++ b/tests/Makefile.include
@@ -288,8 +288,8 @@ check-qtest-i386-y += tests/usb-hcd-ehci-test$(EXESUF)
 gcov-files-i386-y += hw/usb/hcd-ehci.c
 gcov-files-i386-y += hw/usb/dev-hid.c
 gcov-files-i386-y += hw/usb/dev-storage.c
-check-qtest-i386-y += tests/usb-hcd-xhci-test$(EXESUF)
-gcov-files-i386-y += hw/usb/hcd-xhci.c
+check-qtest-i386-$(CONFIG_USB_XHCI_NEC) += tests/usb-hcd-xhci-test$(EXESUF)
+gcov-files-i386-$(CONFIG_USB_XHCI) += hw/usb/hcd-xhci.c
 check-qtest-i386-y += tests/cpu-plug-test$(EXESUF)
 check-qtest-i386-y += tests/q35-test$(EXESUF)
 check-qtest-i386-y += tests/vmgenid-test$(EXESUF)
@@ -347,8 +347,8 @@ check-qtest-ppc64-y += tests/usb-hcd-ohci-test$(EXESUF)
 gcov-files-ppc64-y += hw/usb/hcd-ohci.c
 check-qtest-ppc64-y += tests/usb-hcd-uhci-test$(EXESUF)
 gcov-files-ppc64-y += hw/usb/hcd-uhci.c
-check-qtest-ppc64-y += tests/usb-hcd-xhci-test$(EXESUF)
-gcov-files-ppc64-y += hw/usb/hcd-xhci.c
+check-qtest-ppc64-$(CONFIG_USB_XHCI_NEC) += tests/usb-hcd-xhci-test$(EXESUF)
+gcov-files-ppc64-$(CONFIG_USB_XHCI) += hw/usb/hcd-xhci.c
 check-qtest-ppc64-y += $(check-qtest-virtio-y)
 check-qtest-ppc64-$(CONFIG_SLIRP) += tests/test-netfilter$(EXESUF)
 check-qtest-ppc64-$(CONFIG_POSIX) += tests/test-filter-mirror$(EXESUF)
-- 
2.17.1

Re: [Qemu-devel] [PATCH 20/25] check: Only test usb-xhci-nec when it is compiled in

[Thomas Huth]

On 17.07.2018 13:33, Juan Quintela wrote:
> Signed-off-by: Juan Quintela <quintela@redhat.com>
> ---
>  tests/Makefile.include | 8 ++++----
>  1 file changed, 4 insertions(+), 4 deletions(-)
> 
> diff --git a/tests/Makefile.include b/tests/Makefile.include
> index b3e707e8c3..ccf71bddcc 100644
> --- a/tests/Makefile.include
> +++ b/tests/Makefile.include
> @@ -288,8 +288,8 @@ check-qtest-i386-y += tests/usb-hcd-ehci-test$(EXESUF)
>  gcov-files-i386-y += hw/usb/hcd-ehci.c
>  gcov-files-i386-y += hw/usb/dev-hid.c
>  gcov-files-i386-y += hw/usb/dev-storage.c
> -check-qtest-i386-y += tests/usb-hcd-xhci-test$(EXESUF)
> -gcov-files-i386-y += hw/usb/hcd-xhci.c
> +check-qtest-i386-$(CONFIG_USB_XHCI_NEC) += tests/usb-hcd-xhci-test$(EXESUF)
> +gcov-files-i386-$(CONFIG_USB_XHCI) += hw/usb/hcd-xhci.c
>  check-qtest-i386-y += tests/cpu-plug-test$(EXESUF)
>  check-qtest-i386-y += tests/q35-test$(EXESUF)
>  check-qtest-i386-y += tests/vmgenid-test$(EXESUF)
> @@ -347,8 +347,8 @@ check-qtest-ppc64-y += tests/usb-hcd-ohci-test$(EXESUF)
>  gcov-files-ppc64-y += hw/usb/hcd-ohci.c
>  check-qtest-ppc64-y += tests/usb-hcd-uhci-test$(EXESUF)
>  gcov-files-ppc64-y += hw/usb/hcd-uhci.c
> -check-qtest-ppc64-y += tests/usb-hcd-xhci-test$(EXESUF)
> -gcov-files-ppc64-y += hw/usb/hcd-xhci.c
> +check-qtest-ppc64-$(CONFIG_USB_XHCI_NEC) += tests/usb-hcd-xhci-test$(EXESUF)
> +gcov-files-ppc64-$(CONFIG_USB_XHCI) += hw/usb/hcd-xhci.c
>  check-qtest-ppc64-y += $(check-qtest-virtio-y)
>  check-qtest-ppc64-$(CONFIG_SLIRP) += tests/test-netfilter$(EXESUF)
>  check-qtest-ppc64-$(CONFIG_POSIX) += tests/test-filter-mirror$(EXESUF)

I wonder whether the gcov lines are still up-to-date, or whether they
should include hcd-xhci-nec.c as well? (See commit 0bbb2f3df1ffd9ccf713
for the split)

 Thomas

Re: [Qemu-devel] [PATCH 20/25] check: Only test usb-xhci-nec when it is compiled in

[Juan Quintela]

Thomas Huth <thuth@redhat.com> wrote:
> On 17.07.2018 13:33, Juan Quintela wrote:
>> Signed-off-by: Juan Quintela <quintela@redhat.com>
>> ---
>>  tests/Makefile.include | 8 ++++----
>>  1 file changed, 4 insertions(+), 4 deletions(-)
>> 
>> diff --git a/tests/Makefile.include b/tests/Makefile.include
>> index b3e707e8c3..ccf71bddcc 100644
>> --- a/tests/Makefile.include
>> +++ b/tests/Makefile.include
>> @@ -288,8 +288,8 @@ check-qtest-i386-y += tests/usb-hcd-ehci-test$(EXESUF)
>>  gcov-files-i386-y += hw/usb/hcd-ehci.c
>>  gcov-files-i386-y += hw/usb/dev-hid.c
>>  gcov-files-i386-y += hw/usb/dev-storage.c
>> -check-qtest-i386-y += tests/usb-hcd-xhci-test$(EXESUF)
>> -gcov-files-i386-y += hw/usb/hcd-xhci.c
>> +check-qtest-i386-$(CONFIG_USB_XHCI_NEC) += tests/usb-hcd-xhci-test$(EXESUF)
>> +gcov-files-i386-$(CONFIG_USB_XHCI) += hw/usb/hcd-xhci.c
>>  check-qtest-i386-y += tests/cpu-plug-test$(EXESUF)
>>  check-qtest-i386-y += tests/q35-test$(EXESUF)
>>  check-qtest-i386-y += tests/vmgenid-test$(EXESUF)
>> @@ -347,8 +347,8 @@ check-qtest-ppc64-y += tests/usb-hcd-ohci-test$(EXESUF)
>>  gcov-files-ppc64-y += hw/usb/hcd-ohci.c
>>  check-qtest-ppc64-y += tests/usb-hcd-uhci-test$(EXESUF)
>>  gcov-files-ppc64-y += hw/usb/hcd-uhci.c
>> -check-qtest-ppc64-y += tests/usb-hcd-xhci-test$(EXESUF)
>> -gcov-files-ppc64-y += hw/usb/hcd-xhci.c
>> +check-qtest-ppc64-$(CONFIG_USB_XHCI_NEC) += tests/usb-hcd-xhci-test$(EXESUF)
>> +gcov-files-ppc64-$(CONFIG_USB_XHCI) += hw/usb/hcd-xhci.c
>>  check-qtest-ppc64-y += $(check-qtest-virtio-y)
>>  check-qtest-ppc64-$(CONFIG_SLIRP) += tests/test-netfilter$(EXESUF)
>>  check-qtest-ppc64-$(CONFIG_POSIX) += tests/test-filter-mirror$(EXESUF)
>
> I wonder whether the gcov lines are still up-to-date, or whether they
> should include hcd-xhci-nec.c as well? (See commit 0bbb2f3df1ffd9ccf713
> for the split)

I don't even know how to launch gcov.  Not sure if I should put the
$(CONFIG_foo) there.  File is not consistent at all.

Later, Juan.

Re: [Qemu-devel] [PATCH 20/25] check: Only test usb-xhci-nec when it is compiled in

[Juan Quintela]

Thomas Huth <thuth@redhat.com> wrote:
> On 17.07.2018 13:33, Juan Quintela wrote:
>> Signed-off-by: Juan Quintela <quintela@redhat.com>
>> ---
>>  tests/Makefile.include | 8 ++++----
>>  1 file changed, 4 insertions(+), 4 deletions(-)
>> 
>> diff --git a/tests/Makefile.include b/tests/Makefile.include
>> index b3e707e8c3..ccf71bddcc 100644
>> --- a/tests/Makefile.include
>> +++ b/tests/Makefile.include
>> @@ -288,8 +288,8 @@ check-qtest-i386-y += tests/usb-hcd-ehci-test$(EXESUF)
>>  gcov-files-i386-y += hw/usb/hcd-ehci.c
>>  gcov-files-i386-y += hw/usb/dev-hid.c
>>  gcov-files-i386-y += hw/usb/dev-storage.c
>> -check-qtest-i386-y += tests/usb-hcd-xhci-test$(EXESUF)
>> -gcov-files-i386-y += hw/usb/hcd-xhci.c
>> +check-qtest-i386-$(CONFIG_USB_XHCI_NEC) += tests/usb-hcd-xhci-test$(EXESUF)
>> +gcov-files-i386-$(CONFIG_USB_XHCI) += hw/usb/hcd-xhci.c
>>  check-qtest-i386-y += tests/cpu-plug-test$(EXESUF)
>>  check-qtest-i386-y += tests/q35-test$(EXESUF)
>>  check-qtest-i386-y += tests/vmgenid-test$(EXESUF)
>> @@ -347,8 +347,8 @@ check-qtest-ppc64-y += tests/usb-hcd-ohci-test$(EXESUF)
>>  gcov-files-ppc64-y += hw/usb/hcd-ohci.c
>>  check-qtest-ppc64-y += tests/usb-hcd-uhci-test$(EXESUF)
>>  gcov-files-ppc64-y += hw/usb/hcd-uhci.c
>> -check-qtest-ppc64-y += tests/usb-hcd-xhci-test$(EXESUF)
>> -gcov-files-ppc64-y += hw/usb/hcd-xhci.c
>> +check-qtest-ppc64-$(CONFIG_USB_XHCI_NEC) += tests/usb-hcd-xhci-test$(EXESUF)
>> +gcov-files-ppc64-$(CONFIG_USB_XHCI) += hw/usb/hcd-xhci.c
>>  check-qtest-ppc64-y += $(check-qtest-virtio-y)
>>  check-qtest-ppc64-$(CONFIG_SLIRP) += tests/test-netfilter$(EXESUF)
>>  check-qtest-ppc64-$(CONFIG_POSIX) += tests/test-filter-mirror$(EXESUF)
>
> I wonder whether the gcov lines are still up-to-date, or whether they
> should include hcd-xhci-nec.c as well? (See commit 0bbb2f3df1ffd9ccf713
> for the split)

Added the hcd-xhci-nec.c file to gcov.  I still don't know how to launch
gcowv :-(  So no clue about how up-to-date the lines are.

Later, Juan.

Re: [Qemu-devel] [PATCH 20/25] check: Only test usb-xhci-nec when it is compiled in

[Thomas Huth]

On 07/26/2018 05:09 PM, Juan Quintela wrote:
> Thomas Huth <thuth@redhat.com> wrote:
>> On 17.07.2018 13:33, Juan Quintela wrote:
[...]
>>> @@ -347,8 +347,8 @@ check-qtest-ppc64-y += tests/usb-hcd-ohci-test$(EXESUF)
>>>  gcov-files-ppc64-y += hw/usb/hcd-ohci.c
>>>  check-qtest-ppc64-y += tests/usb-hcd-uhci-test$(EXESUF)
>>>  gcov-files-ppc64-y += hw/usb/hcd-uhci.c
>>> -check-qtest-ppc64-y += tests/usb-hcd-xhci-test$(EXESUF)
>>> -gcov-files-ppc64-y += hw/usb/hcd-xhci.c
>>> +check-qtest-ppc64-$(CONFIG_USB_XHCI_NEC) += tests/usb-hcd-xhci-test$(EXESUF)
>>> +gcov-files-ppc64-$(CONFIG_USB_XHCI) += hw/usb/hcd-xhci.c
>>>  check-qtest-ppc64-y += $(check-qtest-virtio-y)
>>>  check-qtest-ppc64-$(CONFIG_SLIRP) += tests/test-netfilter$(EXESUF)
>>>  check-qtest-ppc64-$(CONFIG_POSIX) += tests/test-filter-mirror$(EXESUF)
>>
>> I wonder whether the gcov lines are still up-to-date, or whether they
>> should include hcd-xhci-nec.c as well? (See commit 0bbb2f3df1ffd9ccf713
>> for the split)
> 
> Added the hcd-xhci-nec.c file to gcov.  I still don't know how to launch
> gcowv :-(  So no clue about how up-to-date the lines are.

See docs/devel/testing.rst - this file contains some explanations.

 Cheers,
  Thomas

[Qemu-devel] [PATCH 21/25] check: Only test usb-ohci when it is compiled in

[Juan Quintela]

Signed-off-by: Juan Quintela <quintela@redhat.com>
---
 tests/Makefile.include | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/tests/Makefile.include b/tests/Makefile.include
index ccf71bddcc..3a78ada070 100644
--- a/tests/Makefile.include
+++ b/tests/Makefile.include
@@ -280,8 +280,8 @@ check-qtest-i386-$(CONFIG_I82801B11) += tests/i82801b11-test$(EXESUF)
 gcov-files-i386-$(CONFIG_I82801B11) += hw/pci-bridge/i82801b11.c
 check-qtest-i386-$(CONFIG_IOH3420) += tests/ioh3420-test$(EXESUF)
 gcov-files-i386-$(CONFIG_IOH3420) += hw/pci-bridge/ioh3420.c
-check-qtest-i386-y += tests/usb-hcd-ohci-test$(EXESUF)
-gcov-files-i386-y += hw/usb/hcd-ohci.c
+check-qtest-i386-$(CONFIG_USB_OHCI) += tests/usb-hcd-ohci-test$(EXESUF)
+gcov-files-i386-$(CONFIG_USB_OHCI) += hw/usb/hcd-ohci.c
 check-qtest-i386-y += tests/usb-hcd-uhci-test$(EXESUF)
 gcov-files-i386-y += hw/usb/hcd-uhci.c
 check-qtest-i386-y += tests/usb-hcd-ehci-test$(EXESUF)
@@ -343,8 +343,8 @@ check-qtest-ppc64-y += tests/pnv-xscom-test$(EXESUF)
 check-qtest-ppc64-y += tests/migration-test$(EXESUF)
 check-qtest-ppc64-y += tests/rtas-test$(EXESUF)
 check-qtest-ppc64-$(CONFIG_SLIRP) += tests/pxe-test$(EXESUF)
-check-qtest-ppc64-y += tests/usb-hcd-ohci-test$(EXESUF)
-gcov-files-ppc64-y += hw/usb/hcd-ohci.c
+check-qtest-ppc64-$(CONFIG_USB_OHCI) += tests/usb-hcd-ohci-test$(EXESUF)
+gcov-files-ppc64-$(CONFIG_USB_OHCI) += hw/usb/hcd-ohci.c
 check-qtest-ppc64-y += tests/usb-hcd-uhci-test$(EXESUF)
 gcov-files-ppc64-y += hw/usb/hcd-uhci.c
 check-qtest-ppc64-$(CONFIG_USB_XHCI_NEC) += tests/usb-hcd-xhci-test$(EXESUF)
-- 
2.17.1

Re: [Qemu-devel] [PATCH 21/25] check: Only test usb-ohci when it is compiled in

[Thomas Huth]

On 17.07.2018 13:33, Juan Quintela wrote:
> Signed-off-by: Juan Quintela <quintela@redhat.com>
> ---
>  tests/Makefile.include | 8 ++++----
>  1 file changed, 4 insertions(+), 4 deletions(-)
> 
> diff --git a/tests/Makefile.include b/tests/Makefile.include
> index ccf71bddcc..3a78ada070 100644
> --- a/tests/Makefile.include
> +++ b/tests/Makefile.include
> @@ -280,8 +280,8 @@ check-qtest-i386-$(CONFIG_I82801B11) += tests/i82801b11-test$(EXESUF)
>  gcov-files-i386-$(CONFIG_I82801B11) += hw/pci-bridge/i82801b11.c
>  check-qtest-i386-$(CONFIG_IOH3420) += tests/ioh3420-test$(EXESUF)
>  gcov-files-i386-$(CONFIG_IOH3420) += hw/pci-bridge/ioh3420.c
> -check-qtest-i386-y += tests/usb-hcd-ohci-test$(EXESUF)
> -gcov-files-i386-y += hw/usb/hcd-ohci.c
> +check-qtest-i386-$(CONFIG_USB_OHCI) += tests/usb-hcd-ohci-test$(EXESUF)
> +gcov-files-i386-$(CONFIG_USB_OHCI) += hw/usb/hcd-ohci.c
>  check-qtest-i386-y += tests/usb-hcd-uhci-test$(EXESUF)
>  gcov-files-i386-y += hw/usb/hcd-uhci.c
>  check-qtest-i386-y += tests/usb-hcd-ehci-test$(EXESUF)
> @@ -343,8 +343,8 @@ check-qtest-ppc64-y += tests/pnv-xscom-test$(EXESUF)
>  check-qtest-ppc64-y += tests/migration-test$(EXESUF)
>  check-qtest-ppc64-y += tests/rtas-test$(EXESUF)
>  check-qtest-ppc64-$(CONFIG_SLIRP) += tests/pxe-test$(EXESUF)
> -check-qtest-ppc64-y += tests/usb-hcd-ohci-test$(EXESUF)
> -gcov-files-ppc64-y += hw/usb/hcd-ohci.c
> +check-qtest-ppc64-$(CONFIG_USB_OHCI) += tests/usb-hcd-ohci-test$(EXESUF)
> +gcov-files-ppc64-$(CONFIG_USB_OHCI) += hw/usb/hcd-ohci.c
>  check-qtest-ppc64-y += tests/usb-hcd-uhci-test$(EXESUF)
>  gcov-files-ppc64-y += hw/usb/hcd-uhci.c
>  check-qtest-ppc64-$(CONFIG_USB_XHCI_NEC) += tests/usb-hcd-xhci-test$(EXESUF)

Reviewed-by: Thomas Huth <thuth@redhat.com>

[Qemu-devel] [PATCH 22/25] check: Only test usb-uhci devices when they are compiled in

[Juan Quintela]

Signed-off-by: Juan Quintela <quintela@redhat.com>
---
 tests/Makefile.include | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/tests/Makefile.include b/tests/Makefile.include
index 3a78ada070..27f50e3231 100644
--- a/tests/Makefile.include
+++ b/tests/Makefile.include
@@ -282,8 +282,8 @@ check-qtest-i386-$(CONFIG_IOH3420) += tests/ioh3420-test$(EXESUF)
 gcov-files-i386-$(CONFIG_IOH3420) += hw/pci-bridge/ioh3420.c
 check-qtest-i386-$(CONFIG_USB_OHCI) += tests/usb-hcd-ohci-test$(EXESUF)
 gcov-files-i386-$(CONFIG_USB_OHCI) += hw/usb/hcd-ohci.c
-check-qtest-i386-y += tests/usb-hcd-uhci-test$(EXESUF)
-gcov-files-i386-y += hw/usb/hcd-uhci.c
+check-qtest-i386-$(CONFIG_USB_UHCI) += tests/usb-hcd-uhci-test$(EXESUF)
+gcov-files-i386-$(CONFIG_USB_UHCI) += hw/usb/hcd-uhci.c
 check-qtest-i386-y += tests/usb-hcd-ehci-test$(EXESUF)
 gcov-files-i386-y += hw/usb/hcd-ehci.c
 gcov-files-i386-y += hw/usb/dev-hid.c
@@ -345,8 +345,8 @@ check-qtest-ppc64-y += tests/rtas-test$(EXESUF)
 check-qtest-ppc64-$(CONFIG_SLIRP) += tests/pxe-test$(EXESUF)
 check-qtest-ppc64-$(CONFIG_USB_OHCI) += tests/usb-hcd-ohci-test$(EXESUF)
 gcov-files-ppc64-$(CONFIG_USB_OHCI) += hw/usb/hcd-ohci.c
-check-qtest-ppc64-y += tests/usb-hcd-uhci-test$(EXESUF)
-gcov-files-ppc64-y += hw/usb/hcd-uhci.c
+check-qtest-ppc64-$(CONFIG_USB_UHCI) += tests/usb-hcd-uhci-test$(EXESUF)
+gcov-files-ppc64-$(CONFIG_USB_UHCI) += hw/usb/hcd-uhci.c
 check-qtest-ppc64-$(CONFIG_USB_XHCI_NEC) += tests/usb-hcd-xhci-test$(EXESUF)
 gcov-files-ppc64-$(CONFIG_USB_XHCI) += hw/usb/hcd-xhci.c
 check-qtest-ppc64-y += $(check-qtest-virtio-y)
-- 
2.17.1

Re: [Qemu-devel] [PATCH 22/25] check: Only test usb-uhci devices when they are compiled in

[Thomas Huth]

On 17.07.2018 13:33, Juan Quintela wrote:
> Signed-off-by: Juan Quintela <quintela@redhat.com>
> ---
>  tests/Makefile.include | 8 ++++----
>  1 file changed, 4 insertions(+), 4 deletions(-)
> 
> diff --git a/tests/Makefile.include b/tests/Makefile.include
> index 3a78ada070..27f50e3231 100644
> --- a/tests/Makefile.include
> +++ b/tests/Makefile.include
> @@ -282,8 +282,8 @@ check-qtest-i386-$(CONFIG_IOH3420) += tests/ioh3420-test$(EXESUF)
>  gcov-files-i386-$(CONFIG_IOH3420) += hw/pci-bridge/ioh3420.c
>  check-qtest-i386-$(CONFIG_USB_OHCI) += tests/usb-hcd-ohci-test$(EXESUF)
>  gcov-files-i386-$(CONFIG_USB_OHCI) += hw/usb/hcd-ohci.c
> -check-qtest-i386-y += tests/usb-hcd-uhci-test$(EXESUF)
> -gcov-files-i386-y += hw/usb/hcd-uhci.c
> +check-qtest-i386-$(CONFIG_USB_UHCI) += tests/usb-hcd-uhci-test$(EXESUF)
> +gcov-files-i386-$(CONFIG_USB_UHCI) += hw/usb/hcd-uhci.c
>  check-qtest-i386-y += tests/usb-hcd-ehci-test$(EXESUF)
>  gcov-files-i386-y += hw/usb/hcd-ehci.c
>  gcov-files-i386-y += hw/usb/dev-hid.c
> @@ -345,8 +345,8 @@ check-qtest-ppc64-y += tests/rtas-test$(EXESUF)
>  check-qtest-ppc64-$(CONFIG_SLIRP) += tests/pxe-test$(EXESUF)
>  check-qtest-ppc64-$(CONFIG_USB_OHCI) += tests/usb-hcd-ohci-test$(EXESUF)
>  gcov-files-ppc64-$(CONFIG_USB_OHCI) += hw/usb/hcd-ohci.c
> -check-qtest-ppc64-y += tests/usb-hcd-uhci-test$(EXESUF)
> -gcov-files-ppc64-y += hw/usb/hcd-uhci.c
> +check-qtest-ppc64-$(CONFIG_USB_UHCI) += tests/usb-hcd-uhci-test$(EXESUF)
> +gcov-files-ppc64-$(CONFIG_USB_UHCI) += hw/usb/hcd-uhci.c
>  check-qtest-ppc64-$(CONFIG_USB_XHCI_NEC) += tests/usb-hcd-xhci-test$(EXESUF)
>  gcov-files-ppc64-$(CONFIG_USB_XHCI) += hw/usb/hcd-xhci.c
>  check-qtest-ppc64-y += $(check-qtest-virtio-y)
> 

Reviewed-by: Thomas Huth <thuth@redhat.com>

[Qemu-devel] [PATCH 23/25] check: Only test usb-ehci when it is compiled in

[Juan Quintela]

Signed-off-by: Juan Quintela <quintela@redhat.com>
---
 tests/Makefile.include | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/tests/Makefile.include b/tests/Makefile.include
index 27f50e3231..731443387d 100644
--- a/tests/Makefile.include
+++ b/tests/Makefile.include
@@ -284,8 +284,8 @@ check-qtest-i386-$(CONFIG_USB_OHCI) += tests/usb-hcd-ohci-test$(EXESUF)
 gcov-files-i386-$(CONFIG_USB_OHCI) += hw/usb/hcd-ohci.c
 check-qtest-i386-$(CONFIG_USB_UHCI) += tests/usb-hcd-uhci-test$(EXESUF)
 gcov-files-i386-$(CONFIG_USB_UHCI) += hw/usb/hcd-uhci.c
-check-qtest-i386-y += tests/usb-hcd-ehci-test$(EXESUF)
-gcov-files-i386-y += hw/usb/hcd-ehci.c
+check-qtest-i386-$(CONFIG_USB_EHCI) += tests/usb-hcd-ehci-test$(EXESUF)
+gcov-files-i386-$(CONFIG_USB_EHCI) += hw/usb/hcd-ehci.c
 gcov-files-i386-y += hw/usb/dev-hid.c
 gcov-files-i386-y += hw/usb/dev-storage.c
 check-qtest-i386-$(CONFIG_USB_XHCI_NEC) += tests/usb-hcd-xhci-test$(EXESUF)
-- 
2.17.1

Re: [Qemu-devel] [PATCH 23/25] check: Only test usb-ehci when it is compiled in

[Thomas Huth]

On 17.07.2018 13:34, Juan Quintela wrote:
> Signed-off-by: Juan Quintela <quintela@redhat.com>
> ---
>  tests/Makefile.include | 4 ++--
>  1 file changed, 2 insertions(+), 2 deletions(-)
> 
> diff --git a/tests/Makefile.include b/tests/Makefile.include
> index 27f50e3231..731443387d 100644
> --- a/tests/Makefile.include
> +++ b/tests/Makefile.include
> @@ -284,8 +284,8 @@ check-qtest-i386-$(CONFIG_USB_OHCI) += tests/usb-hcd-ohci-test$(EXESUF)
>  gcov-files-i386-$(CONFIG_USB_OHCI) += hw/usb/hcd-ohci.c
>  check-qtest-i386-$(CONFIG_USB_UHCI) += tests/usb-hcd-uhci-test$(EXESUF)
>  gcov-files-i386-$(CONFIG_USB_UHCI) += hw/usb/hcd-uhci.c
> -check-qtest-i386-y += tests/usb-hcd-ehci-test$(EXESUF)
> -gcov-files-i386-y += hw/usb/hcd-ehci.c
> +check-qtest-i386-$(CONFIG_USB_EHCI) += tests/usb-hcd-ehci-test$(EXESUF)
> +gcov-files-i386-$(CONFIG_USB_EHCI) += hw/usb/hcd-ehci.c
>  gcov-files-i386-y += hw/usb/dev-hid.c
>  gcov-files-i386-y += hw/usb/dev-storage.c
>  check-qtest-i386-$(CONFIG_USB_XHCI_NEC) += tests/usb-hcd-xhci-test$(EXESUF)
> 

Reviewed-by: Thomas Huth <thuth@redhat.com>

[Qemu-devel] [PATCH 24/25] check: Only test ivshm when it is compiled in

[Juan Quintela]

Signed-off-by: Juan Quintela <quintela@redhat.com>
---
 tests/Makefile.include | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/tests/Makefile.include b/tests/Makefile.include
index 731443387d..188f555600 100644
--- a/tests/Makefile.include
+++ b/tests/Makefile.include
@@ -243,8 +243,8 @@ gcov-files-pci-y += hw/display/virtio-gpu-pci.c
 gcov-files-pci-$(CONFIG_VIRTIO_VGA) += hw/display/virtio-vga.c
 check-qtest-pci-$(CONFIG_HDA) += tests/intel-hda-test$(EXESUF)
 gcov-files-pci-$(CONFIG_HDA) += hw/audio/intel-hda.c hw/audio/hda-codec.c
-check-qtest-pci-$(CONFIG_IVSHMEM) += tests/ivshmem-test$(EXESUF)
-gcov-files-pci-y += hw/misc/ivshmem.c
+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
 
@@ -355,7 +355,7 @@ check-qtest-ppc64-$(CONFIG_POSIX) += tests/test-filter-mirror$(EXESUF)
 check-qtest-ppc64-$(CONFIG_RTL8139_PCI) += tests/test-filter-redirector$(EXESUF)
 check-qtest-ppc64-y += tests/display-vga-test$(EXESUF)
 check-qtest-ppc64-y += tests/numa-test$(EXESUF)
-check-qtest-ppc64-$(CONFIG_IVSHMEM) += tests/ivshmem-test$(EXESUF)
+check-qtest-ppc64-$(CONFIG_IVSHMEM_DEVICE) += tests/ivshmem-test$(EXESUF)
 check-qtest-ppc64-y += tests/cpu-plug-test$(EXESUF)
 
 check-qtest-sh4-$(CONFIG_ISA_TESTDEV) = tests/endianness-test$(EXESUF)
-- 
2.17.1

[Qemu-devel] [PATCH 25/25] check: Only test tpm devices when they are compiled in

[Juan Quintela]

Signed-off-by: Juan Quintela <quintela@redhat.com>
---
 tests/Makefile.include | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/tests/Makefile.include b/tests/Makefile.include
index 188f555600..0ac4b960bc 100644
--- a/tests/Makefile.include
+++ b/tests/Makefile.include
@@ -296,10 +296,10 @@ check-qtest-i386-y += tests/vmgenid-test$(EXESUF)
 gcov-files-i386-y += hw/pci-host/q35.c
 check-qtest-i386-$(CONFIG_VHOST_USER_NET_TEST_i386) += tests/vhost-user-test$(EXESUF)
 check-qtest-x86_64-$(call lor, $(CONFIG_VHOST_USER_NET_TEST_i386), $(CONFIG_VHOST_USER_NET_TEST_x86_64)) += tests/vhost-user-test$(EXESUF)
-check-qtest-i386-$(CONFIG_TPM) += tests/tpm-crb-swtpm-test$(EXESUF)
-check-qtest-i386-$(CONFIG_TPM) += tests/tpm-crb-test$(EXESUF)
-check-qtest-i386-$(CONFIG_TPM) += tests/tpm-tis-swtpm-test$(EXESUF)
-check-qtest-i386-$(CONFIG_TPM) += tests/tpm-tis-test$(EXESUF)
+check-qtest-i386-$(CONFIG_TPM_CRB) += tests/tpm-crb-swtpm-test$(EXESUF)
+check-qtest-i386-$(CONFIG_TPM_CRB) += tests/tpm-crb-test$(EXESUF)
+check-qtest-i386-$(CONFIG_TPM_TIS) += tests/tpm-tis-swtpm-test$(EXESUF)
+check-qtest-i386-$(CONFIG_TPM_TIS) += tests/tpm-tis-test$(EXESUF)
 check-qtest-i386-$(CONFIG_SLIRP) += tests/test-netfilter$(EXESUF)
 check-qtest-i386-$(CONFIG_POSIX) += tests/test-filter-mirror$(EXESUF)
 check-qtest-i386-$(CONFIG_RTL8139_PCI) += tests/test-filter-redirector$(EXESUF)
-- 
2.17.1