From nobody Thu Nov 6 18:20:56 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; dkim=fail; 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 1542292451852593.1893596193578; Thu, 15 Nov 2018 06:34:11 -0800 (PST) Received: from localhost ([::1]:39191 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gNIig-0003a9-ME for importer@patchew.org; Thu, 15 Nov 2018 09:34:10 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:34867) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gNIgJ-0002HS-2N for qemu-devel@nongnu.org; Thu, 15 Nov 2018 09:31:50 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1gNIgB-0003wY-Dn for qemu-devel@nongnu.org; Thu, 15 Nov 2018 09:31:39 -0500 Received: from mail-wm1-x344.google.com ([2a00:1450:4864:20::344]:51013) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1gNIg7-0003ro-E0 for qemu-devel@nongnu.org; Thu, 15 Nov 2018 09:31:33 -0500 Received: by mail-wm1-x344.google.com with SMTP id 124-v6so19158264wmw.0 for ; Thu, 15 Nov 2018 06:31:30 -0800 (PST) Received: from localhost.localdomain ([93.56.166.5]) by smtp.gmail.com with ESMTPSA id x194-v6sm55262620wmd.41.2018.11.15.06.31.28 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Thu, 15 Nov 2018 06:31:28 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=JRdNPF1MXqI8p2p0w2RzxFj+0XpHIthZAC2gUeb8rag=; b=mbkS/2tNtm4+qj7Jjf+jXYXJNjQ64PxA/tX5T37miMuP45C3cDcnUhZXk9m/OUN8w4 SmV0u/ASrZXKSh7kxf9ZScnsRitp79itZJ9CI1k6oj6y7TuBsG5EaE7gbAwMkVJLNgXd sAjj7+bFjtcdJ7MZV6Xp4Q1ocM5aMifPqUq7giwJVM9ursRiQLt7/HYnedF5vaihXpcZ 4irrXFQ9mjg9ZfKvrS0UkTp9uhNQMMvtFwgbuADwI6NRNqEyhdWMGsaXb5m2/GS2I8AW JfKw7S0Be9yOaDRV3H5CrrPwW2fkd06VvIMbNKwxlCZExE15eNyshyaeSIuMhnYTfp93 hv+g== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :in-reply-to:references:mime-version:content-transfer-encoding; bh=JRdNPF1MXqI8p2p0w2RzxFj+0XpHIthZAC2gUeb8rag=; b=CtZZ2Ei8ZeB8lj7UhuhIc0WfefRwqHDuY+fyCEbPglbB5E7D3t4F0ra6JlDuLD8Z+l f1tCtQwX5I49FVtVuEkhtnXre3okOedzf2+w8FfRHumf4r0Ywr52V/izbhHEsxolFThW 1ugPssfYIHTWefgBMkuDZqB6M4/oMZlWywu/K6hr5xsdTf+ftGX5SA9pNfActbOGqgJB B3ThmFXYzUZ6DZ9nr5hDaf1GW4Jmadm5uGDiIXMwYnriZ8UQIDQ0mrG844lKdWvE/Jlh VFOQVDsi/dJPDWItuwtbCijJOEy5kxh6FryTGaVjr3SzC1lWhpObmNnuDKh4KfIWe814 M21g== X-Gm-Message-State: AGRZ1gI+ctaj3/YQ9kqzGWxlHuF+5FS8UHg9+TbH/m0NHztfI14VK5LF Fq/jNBJdBUhN3EuQfkwQusPhh7Vm X-Google-Smtp-Source: AJdET5dE7LT+l0Bk4DU/GFUloGY88tvDcFRVoQdiLEhD3f6sRBGznHk83U67nV7K0mY5X+932d37qQ== X-Received: by 2002:a1c:6783:: with SMTP id b125-v6mr5274982wmc.147.1542292289401; Thu, 15 Nov 2018 06:31:29 -0800 (PST) From: Paolo Bonzini To: qemu-devel@nongnu.org Date: Thu, 15 Nov 2018 15:31:17 +0100 Message-Id: <20181115143124.19234-4-pbonzini@redhat.com> X-Mailer: git-send-email 2.19.1 In-Reply-To: <20181115143124.19234-1-pbonzini@redhat.com> References: <20181115143124.19234-1-pbonzini@redhat.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2a00:1450:4864:20::344 Subject: [Qemu-devel] [PATCH 03/10] vhost-net: compile it for all targets 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, =?UTF-8?q?Marc-Andr=C3=A9=20Lureau?= , jasowang@redhat.com, mst@redhat.com Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) Content-Type: text/plain; charset="utf-8" Currently vhost-net is compiled only for KVM-enabled targets. This is not needed anymore because ioeventfd is supported and emulated by the memory core. Compile it and vhost-user-test for all targets. While at it, fix the annoying typo CONFIG_VHOST_NET_USED. Signed-off-by: Paolo Bonzini --- configure | 13 +++++-------- include/exec/poison.h | 1 - net/net.c | 2 +- tests/Makefile.include | 5 +---- 4 files changed, 7 insertions(+), 14 deletions(-) diff --git a/configure b/configure index 5b1d83ea26..d8317e1832 100755 --- a/configure +++ b/configure @@ -6512,8 +6512,11 @@ fi if test "$vhost_scsi" =3D "yes" ; then echo "CONFIG_VHOST_SCSI=3Dy" >> $config_host_mak fi -if test "$vhost_net" =3D "yes" -a "$vhost_user" =3D "yes"; then - echo "CONFIG_VHOST_NET_USED=3Dy" >> $config_host_mak +if test "$vhost_net" =3D "yes" ; then + echo "CONFIG_VHOST_NET=3Dy" >> $config_host_mak + if test "$vhost_user" =3D "yes"; then + echo "CONFIG_VHOST_NET_USER=3Dy" >> $config_host_mak + fi fi if test "$vhost_crypto" =3D "yes" ; then echo "CONFIG_VHOST_CRYPTO=3Dy" >> $config_host_mak @@ -7275,12 +7278,6 @@ if supported_xen_target $target; then fi if supported_kvm_target $target; then echo "CONFIG_KVM=3Dy" >> $config_target_mak - if test "$vhost_net" =3D "yes" ; then - echo "CONFIG_VHOST_NET=3Dy" >> $config_target_mak - if test "$vhost_user" =3D "yes" ; then - echo "CONFIG_VHOST_USER_NET_TEST_$target_name=3Dy" >> $config_= host_mak - fi - fi fi if supported_hax_target $target; then echo "CONFIG_HAX=3Dy" >> $config_target_mak diff --git a/include/exec/poison.h b/include/exec/poison.h index 32d53789f8..b158632791 100644 --- a/include/exec/poison.h +++ b/include/exec/poison.h @@ -85,7 +85,6 @@ #pragma GCC poison CONFIG_XTENSA_DIS =20 #pragma GCC poison CONFIG_LINUX_USER -#pragma GCC poison CONFIG_VHOST_NET #pragma GCC poison CONFIG_KVM #pragma GCC poison CONFIG_SOFTMMU =20 diff --git a/net/net.c b/net/net.c index 07c194a8f6..95a74add6c 100644 --- a/net/net.c +++ b/net/net.c @@ -955,7 +955,7 @@ static int (* const net_client_init_fun[NET_CLIENT_DRIV= ER__MAX])( [NET_CLIENT_DRIVER_BRIDGE] =3D net_init_bridge, #endif [NET_CLIENT_DRIVER_HUBPORT] =3D net_init_hubport, -#ifdef CONFIG_VHOST_NET_USED +#ifdef CONFIG_VHOST_NET_USER [NET_CLIENT_DRIVER_VHOST_USER] =3D net_init_vhost_user, #endif #ifdef CONFIG_L2TPV3 diff --git a/tests/Makefile.include b/tests/Makefile.include index fb0b449c02..03a64ce9c8 100644 --- a/tests/Makefile.include +++ b/tests/Makefile.include @@ -204,10 +204,7 @@ check-qtest-i386-$(CONFIG_USB_XHCI_NEC) +=3D tests/usb= -hcd-xhci-test$(EXESUF) check-qtest-i386-y +=3D tests/cpu-plug-test$(EXESUF) check-qtest-i386-y +=3D tests/q35-test$(EXESUF) check-qtest-i386-y +=3D tests/vmgenid-test$(EXESUF) -check-qtest-i386-$(CONFIG_VHOST_USER_NET_TEST_i386) +=3D tests/vhost-user-= test$(EXESUF) -ifeq ($(CONFIG_VHOST_USER_NET_TEST_i386),) -check-qtest-x86_64-$(CONFIG_VHOST_USER_NET_TEST_x86_64) +=3D tests/vhost-u= ser-test$(EXESUF) -endif +check-qtest-i386-$(CONFIG_VHOST_NET_USER) +=3D tests/vhost-user-test$(EXES= UF) check-qtest-i386-$(CONFIG_TPM_CRB) +=3D tests/tpm-crb-swtpm-test$(EXESUF) check-qtest-i386-$(CONFIG_TPM_CRB) +=3D tests/tpm-crb-test$(EXESUF) check-qtest-i386-$(CONFIG_TPM_TIS) +=3D tests/tpm-tis-swtpm-test$(EXESUF) --=20 2.19.1