From nobody Wed Nov 5 02:35:14 2025 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) client-ip=208.118.235.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zohomail.com; spf=pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=redhat.com Return-Path: Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) by mx.zohomail.com with SMTPS id 1531829945512479.7969557956409; Tue, 17 Jul 2018 05:19:05 -0700 (PDT) Received: from localhost ([::1]:58942 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ffOwV-0000Zx-Ry for importer@patchew.org; Tue, 17 Jul 2018 08:18:59 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:55077) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ffOie-0005uo-Cn for qemu-devel@nongnu.org; Tue, 17 Jul 2018 08:04:43 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1ffOiY-0007WP-CP for qemu-devel@nongnu.org; Tue, 17 Jul 2018 08:04:40 -0400 Received: from mx3-rdu2.redhat.com ([66.187.233.73]:39334 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 1ffOiY-0007Uv-8b for qemu-devel@nongnu.org; Tue, 17 Jul 2018 08:04:34 -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 D26D877885 for ; Tue, 17 Jul 2018 12:04:33 +0000 (UTC) Received: from secure.mitica (ovpn-117-62.ams2.redhat.com [10.36.117.62]) by smtp.corp.redhat.com (Postfix) with ESMTP id B97B32026D68; Tue, 17 Jul 2018 12:04:32 +0000 (UTC) From: Juan Quintela To: qemu-devel@nongnu.org Date: Tue, 17 Jul 2018 14:04:11 +0200 Message-Id: <20180717120414.5852-12-quintela@redhat.com> In-Reply-To: <20180717120414.5852-1-quintela@redhat.com> References: <20180717120414.5852-1-quintela@redhat.com> X-Scanned-By: MIMEDefang 2.78 on 10.11.54.4 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.11.55.1]); Tue, 17 Jul 2018 12:04:33 +0000 (UTC) X-Greylist: inspected by milter-greylist-4.5.16 (mx1.redhat.com [10.11.55.1]); Tue, 17 Jul 2018 12:04:33 +0000 (UTC) for IP:'10.11.54.4' DOMAIN:'int-mx04.intmail.prod.int.rdu2.redhat.com' HELO:'smtp.corp.redhat.com' FROM:'quintela@redhat.com' RCPT:'' X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] [fuzzy] X-Received-From: 66.187.233.73 Subject: [Qemu-devel] [PATCH 11/14] check: Only test virtio-rng when it is compiled in X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: lvivier@redhat.com, dgilbert@redhat.com, peterx@redhat.com Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail: RSF_0 Z_629925259 SPT_0 Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Signed-off-by: Juan Quintela --- hw/virtio/virtio-pci.c | 6 ++++-- tests/Makefile.include | 4 ++-- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/hw/virtio/virtio-pci.c b/hw/virtio/virtio-pci.c index bdbc7ab78d..75c96990c0 100644 --- a/hw/virtio/virtio-pci.c +++ b/hw/virtio/virtio-pci.c @@ -2472,7 +2472,7 @@ static const TypeInfo virtio_net_pci_info =3D { }; =20 /* virtio-rng-pci */ - +#ifdef CONFIG_VIRTIO_RNG static void virtio_rng_pci_realize(VirtIOPCIProxy *vpci_dev, Error **errp) { VirtIORngPCI *vrng =3D VIRTIO_RNG_PCI(vpci_dev); @@ -2521,7 +2521,7 @@ static const TypeInfo virtio_rng_pci_info =3D { .instance_init =3D virtio_rng_initfn, .class_init =3D virtio_rng_pci_class_init, }; - +#endif /* virtio-input-pci */ =20 static Property virtio_input_pci_properties[] =3D { @@ -2693,7 +2693,9 @@ static const TypeInfo virtio_pci_bus_info =3D { =20 static void virtio_pci_register_types(void) { +#ifdef CONFIG_VIRTIO_RNG type_register_static(&virtio_rng_pci_info); +#endif type_register_static(&virtio_input_pci_info); type_register_static(&virtio_input_hid_pci_info); type_register_static(&virtio_keyboard_pci_info); diff --git a/tests/Makefile.include b/tests/Makefile.include index 7feda20577..a9cb5e926b 100644 --- a/tests/Makefile.include +++ b/tests/Makefile.include @@ -195,8 +195,8 @@ check-qtest-virtio-$(CONFIG_VIRTIO_BALLOON) +=3D tests/= virtio-balloon-test$(EXESUF gcov-files-virtio-$(CONFIG_VIRTIO_BALLOON) +=3D i386-softmmu/hw/virtio/vir= tio-balloon.c check-qtest-virtio-y +=3D tests/virtio-blk-test$(EXESUF) gcov-files-virtio-y +=3D i386-softmmu/hw/block/virtio-blk.c -check-qtest-virtio-y +=3D tests/virtio-rng-test$(EXESUF) -gcov-files-virtio-y +=3D hw/virtio/virtio-rng.c +check-qtest-virtio-$(CONFIG_VIRTIO_RNG) +=3D tests/virtio-rng-test$(EXESUF) +gcov-files-virtio-$(CONFIG_VIRTIO_RNG) +=3D hw/virtio/virtio-rng.c check-qtest-virtio-y +=3D tests/virtio-scsi-test$(EXESUF) gcov-files-virtio-y +=3D i386-softmmu/hw/scsi/virtio-scsi.c ifeq ($(CONFIG_VIRTIO)$(CONFIG_VIRTFS)$(CONFIG_PCI),yyy) --=20 2.17.1