From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:59716) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ffOwk-00012x-Qt for qemu-devel@nongnu.org; Tue, 17 Jul 2018 08:19:19 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1ffOwe-0000q1-LN for qemu-devel@nongnu.org; Tue, 17 Jul 2018 08:19:14 -0400 Received: from mx3-rdu2.redhat.com ([66.187.233.73]:39760 helo=mx1.redhat.com) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1ffOwe-0000pd-Ec for qemu-devel@nongnu.org; Tue, 17 Jul 2018 08:19:08 -0400 Received: from smtp.corp.redhat.com (int-mx04.intmail.prod.int.rdu2.redhat.com [10.11.54.4]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 1137F77885 for ; Tue, 17 Jul 2018 12:19:08 +0000 (UTC) Date: Tue, 17 Jul 2018 14:19:05 +0200 From: Cornelia Huck Message-ID: <20180717141905.7ead8dd7.cohuck@redhat.com> In-Reply-To: <20180717120414.5852-10-quintela@redhat.com> References: <20180717120414.5852-1-quintela@redhat.com> <20180717120414.5852-10-quintela@redhat.com> MIME-Version: 1.0 Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: 7bit Subject: Re: [Qemu-devel] [PATCH 09/14] check: Only test virtio-balloon when it is compiled in List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: Juan Quintela Cc: qemu-devel@nongnu.org, lvivier@redhat.com, dgilbert@redhat.com, peterx@redhat.com On Tue, 17 Jul 2018 14:04:09 +0200 Juan Quintela wrote: > Signed-off-by: Juan Quintela > --- > hw/virtio/virtio-pci.c | 5 ++++- > tests/Makefile.include | 6 +++--- > 2 files changed, 7 insertions(+), 4 deletions(-) > > diff --git a/hw/virtio/virtio-pci.c b/hw/virtio/virtio-pci.c > index 3a01fe90f0..bdbc7ab78d 100644 > --- a/hw/virtio/virtio-pci.c > +++ b/hw/virtio/virtio-pci.c > @@ -2287,7 +2287,7 @@ static const TypeInfo vhost_vsock_pci_info = { > #endif > > /* virtio-balloon-pci */ > - > +#ifdef CONFIG_VIRTIO_BALLOON > static Property virtio_balloon_pci_properties[] = { > DEFINE_PROP_UINT32("class", VirtIOPCIProxy, class_code, 0), > DEFINE_PROP_END_OF_LIST(), > @@ -2341,6 +2341,7 @@ static const TypeInfo virtio_balloon_pci_info = { > .instance_init = virtio_balloon_pci_instance_init, > .class_init = virtio_balloon_pci_class_init, > }; > +#endif > > /* virtio-serial-pci */ > > @@ -2711,7 +2712,9 @@ static void virtio_pci_register_types(void) > type_register_static(&vhost_user_blk_pci_info); > #endif > type_register_static(&virtio_scsi_pci_info); > +#ifdef CONFIG_VIRTIO_BALLOON > type_register_static(&virtio_balloon_pci_info); > +#endif > type_register_static(&virtio_serial_pci_info); > type_register_static(&virtio_net_pci_info); > #ifdef CONFIG_VHOST_SCSI You only make virtio-balloon-pci conditional... > diff --git a/tests/Makefile.include b/tests/Makefile.include > index 9193945c24..bb30c56795 100644 > --- a/tests/Makefile.include > +++ b/tests/Makefile.include > @@ -191,8 +191,8 @@ gcov-files-virtioserial-y += hw/char/virtio-console.c > gcov-files-virtio-y += i386-softmmu/hw/virtio/virtio.c > check-qtest-virtio-y += tests/virtio-net-test$(EXESUF) > gcov-files-virtio-y += i386-softmmu/hw/net/virtio-net.c > -check-qtest-virtio-y += tests/virtio-balloon-test$(EXESUF) > -gcov-files-virtio-y += i386-softmmu/hw/virtio/virtio-balloon.c > +check-qtest-virtio-$(CONFIG_VIRTIO_BALLOON) += tests/virtio-balloon-test$(EXESUF) > +gcov-files-virtio-$(CONFIG_VIRTIO_BALLOON) += i386-softmmu/hw/virtio/virtio-balloon.c > check-qtest-virtio-y += tests/virtio-blk-test$(EXESUF) > gcov-files-virtio-y += i386-softmmu/hw/block/virtio-blk.c > check-qtest-virtio-y += tests/virtio-rng-test$(EXESUF) > @@ -397,7 +397,7 @@ check-qtest-s390x-$(CONFIG_SLIRP) += tests/test-netfilter$(EXESUF) > check-qtest-s390x-$(CONFIG_POSIX) += tests/test-filter-mirror$(EXESUF) > check-qtest-s390x-$(CONFIG_POSIX) += tests/test-filter-redirector$(EXESUF) > check-qtest-s390x-y += tests/drive_del-test$(EXESUF) > -check-qtest-s390x-y += tests/virtio-balloon-test$(EXESUF) > +check-qtest-s390x-$(CONFIG_VIRTIO_BALLOON) += tests/virtio-balloon-test$(EXESUF) ...but the test uses virtio-balloon-ccw on s390x. > check-qtest-s390x-y += tests/virtio-console-test$(EXESUF) > check-qtest-s390x-y += tests/virtio-serial-test$(EXESUF) > check-qtest-s390x-y += tests/cpu-plug-test$(EXESUF) Same for the other virtio device types.