From nobody Tue Feb 10 06:25:01 2026 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 1543238595457786.0079190103281; Mon, 26 Nov 2018 05:23:15 -0800 (PST) Received: from localhost ([::1]:35917 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gRGr4-0006KS-8q for importer@patchew.org; Mon, 26 Nov 2018 08:23:14 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:60049) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gRGot-00055y-NJ for qemu-devel@nongnu.org; Mon, 26 Nov 2018 08:21:04 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1gRGol-0007wh-PN for qemu-devel@nongnu.org; Mon, 26 Nov 2018 08:20:59 -0500 Received: from mail-wr1-x441.google.com ([2a00:1450:4864:20::441]:43151) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1gRGol-0007vs-J7 for qemu-devel@nongnu.org; Mon, 26 Nov 2018 08:20:51 -0500 Received: by mail-wr1-x441.google.com with SMTP id r10so18854828wrs.10 for ; Mon, 26 Nov 2018 05:20:51 -0800 (PST) Received: from 640k.lan ([93.56.166.5]) by smtp.gmail.com with ESMTPSA id i16sm951672wmd.28.2018.11.26.05.20.48 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 26 Nov 2018 05:20:49 -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; bh=NK5z4gw/ErISJPP3IewAVQ5dOaifFWWr95WppkzXJx4=; b=lvJXwBYxjUA8Fb+01gWH8EfJkcerfjLf8kPnv1zFYzBDcKY/4sslk3STftUfTK3V0c XigVFc1/gZgi6kP6GYJJKBt+5FBSuba/pvYc1RMFiNpWc5uuvxBr4t+V95hILWHWg6Xo X8FVUGvEu4SVmNi9fDqbOhyr3dx7+kb4tPNLVLW2Skfxan8LUsyT+moBfQNlznon93y6 HAj+xZbazocPJTbr1+LCDYAhigVQoVTxsXAQ8UPOKEipSS/T3UkLyOuokpsv5ScJJsYq 3kJwS5I2NP77oiFQr2fW7dQXGWRyd0Tk7myWonJEct+qYkcCZgQi1uf4aWWD8za9xUZ3 LY7w== 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; bh=NK5z4gw/ErISJPP3IewAVQ5dOaifFWWr95WppkzXJx4=; b=RV7VLHSw3KbOAaF4hSPU/eXf0yMQgpBFl5kBO4/IBf5b28eilO8x5RAZ7hwbfBn1ob gLggKuV78AkiSmhAvHY1omPHr0gPhOHBiE/cfSjFyOOzTHNM9QEBRSoNQr2rYfHLNUX2 aiTqwLSDshWKeW/ZljlpsdnDeP7v4Rd8JtfSlt0kIEtUSYuYRp2Sq7iZPYtCyaRaR7wQ ug+cQqTF/BkxAXtGpRckr7NZq6cbRr8Ei9SwCswKGgwUvqO54nTQiGJcCu7F2XKq2JZS st+/Hbl9kNdWZuPeS/GCFTuMR6IfKwSBscwn1fcP/X4Hi9+qABdwu9jgm/yl96LZInLk RyNA== X-Gm-Message-State: AA+aEWYEki5D7B3HteCypMNoLIzpuya1xxXyGwX6y56P3QU1Ww5q443r 1gacQCUJw7xlueuO4Nl0m/g4nbTZ X-Google-Smtp-Source: AFSGD/USEsVmxj5csGnRK+LTpqe4o4gJTtntnS07R4yeBHp6dG1ew9jdcFjck6sdNEZn5elhJ1D0QA== X-Received: by 2002:a5d:4492:: with SMTP id j18mr23308535wrq.236.1543238450015; Mon, 26 Nov 2018 05:20:50 -0800 (PST) From: Paolo Bonzini To: qemu-devel@nongnu.org Date: Mon, 26 Nov 2018 14:20:42 +0100 Message-Id: <1543238443-4993-5-git-send-email-pbonzini@redhat.com> X-Mailer: git-send-email 1.8.3.1 In-Reply-To: <1543238443-4993-1-git-send-email-pbonzini@redhat.com> References: <1543238443-4993-1-git-send-email-pbonzini@redhat.com> X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2a00:1450:4864:20::441 Subject: [Qemu-devel] [PATCH 4/5] vhost-net: compile it on all targets that have virtio-net. 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: =?UTF-8?q?Marc-Andr=C3=A9=20Lureau?= , "Michael S. Tsirkin" Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" This shows a preexisting bug: if a KVM target did not have virtio-net enabl= ed, it would fail with undefined symbols when vhost was enabled. This must now be fixed, lest targets that have no virtio-net fail to compile. Signed-off-by: Paolo Bonzini Reviewed-by: Philippe Mathieu-Daud=C3=A9 Tested-by: Philippe Mathieu-Daud=C3=A9 --- configure | 11 ++++------- hw/net/Makefile.objs | 4 ++-- include/exec/poison.h | 1 - tests/Makefile.include | 5 +---- 4 files changed, 7 insertions(+), 14 deletions(-) diff --git a/configure b/configure index cda17ef..b3b4464 100755 --- a/configure +++ b/configure @@ -6512,7 +6512,10 @@ 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 +if test "$vhost_net" =3D "yes" ; then + echo "CONFIG_VHOST_NET=3Dy" >> $config_host_mak +fi +if test "$vhost_net_user" =3D "yes" ; then echo "CONFIG_VHOST_NET_USER=3Dy" >> $config_host_mak fi if test "$vhost_crypto" =3D "yes" ; then @@ -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/hw/net/Makefile.objs b/hw/net/Makefile.objs index c2705e6..2d7ee0a 100644 --- a/hw/net/Makefile.objs +++ b/hw/net/Makefile.objs @@ -37,8 +37,8 @@ obj-$(CONFIG_PSERIES) +=3D spapr_llan.o obj-$(CONFIG_XILINX_ETHLITE) +=3D xilinx_ethlite.o =20 obj-$(CONFIG_VIRTIO_NET) +=3D virtio-net.o -obj-$(CONFIG_VHOST_NET) +=3D vhost_net.o -common-obj-$(call lnot,$(CONFIG_VHOST_NET)) +=3D vhost_net-stub.o +common-obj-$(call land,$(CONFIG_VIRTIO_NET),$(CONFIG_VHOST_NET)) +=3D vhos= t_net.o +common-obj-$(call lnot,$(call land,$(CONFIG_VIRTIO_NET),$(CONFIG_VHOST_NET= ))) +=3D vhost_net-stub.o common-obj-$(CONFIG_ALL) +=3D vhost_net-stub.o =20 obj-$(CONFIG_ETSEC) +=3D fsl_etsec/etsec.o fsl_etsec/registers.o \ diff --git a/include/exec/poison.h b/include/exec/poison.h index 32d5378..b158632 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/tests/Makefile.include b/tests/Makefile.include index fb0b449..03a64ce 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 1.8.3.1