From nobody Fri Nov 7 14:31:55 2025 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.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 209.51.188.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 [209.51.188.17]) by mx.zohomail.com with SMTPS id 1548094124907934.6764503347732; Mon, 21 Jan 2019 10:08:44 -0800 (PST) Received: from localhost ([127.0.0.1]:57362 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gle03-0005bh-36 for importer@patchew.org; Mon, 21 Jan 2019 13:08:43 -0500 Received: from eggs.gnu.org ([209.51.188.92]:51463) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gldxz-0004F0-Iw for qemu-devel@nongnu.org; Mon, 21 Jan 2019 13:06:37 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1gldxw-0003yh-Ph for qemu-devel@nongnu.org; Mon, 21 Jan 2019 13:06:34 -0500 Received: from mail-wm1-x344.google.com ([2a00:1450:4864:20::344]:36961) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1gldxw-0003wJ-Fy for qemu-devel@nongnu.org; Mon, 21 Jan 2019 13:06:32 -0500 Received: by mail-wm1-x344.google.com with SMTP id g67so11691724wmd.2 for ; Mon, 21 Jan 2019 10:06:30 -0800 (PST) Received: from 640k.lan ([93.56.166.5]) by smtp.gmail.com with ESMTPSA id 133sm56197732wme.9.2019.01.21.10.06.28 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 21 Jan 2019 10:06:28 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=sender:from:to:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=wIxkK9UkKmULWOVqyL63cw2o/fGiM4LqrWOHaONMMr4=; b=mDr2mck1iVzGLI+vJwstOO+/QSmCethkF5TCoebY/RE62cQwkba9OySXgOgyHPML6N F6XkrxVwxeLUT5vlDQ5YbO+wIePUwUN+q/PsmTK47Gngki+mWPvO+lIb6TJSpCXV0FxG KXojBLBtOylDBUDVok1PB2WWb/bQeH0TVdi9ZmHeYPb1wFNOFxZpm8TiGNZxpb+cvzr1 uLVOm2WbElVOmAit3GRM5Mlp50IHlvvdyFQ6ZuHD7qtX3VjkHXm3Cm0Nc+iivWV1ewtk +D/B6kCYx+wdHf70MYaA/jDKTf8Jr28xLF3acM9BPeMNIOIanQzHJvh8dJP89R+Ez9nF vj+Q== 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:subject:date:message-id :in-reply-to:references:mime-version:content-transfer-encoding; bh=wIxkK9UkKmULWOVqyL63cw2o/fGiM4LqrWOHaONMMr4=; b=YpaGXxiFQVKvuqgZrs4Hcg16ggLbt7mpXgX9slDk3f9bYeuSMj/uV/ktn9QgeagVS0 LSkO7HfOD0oXkga8SA+R2TlYYkQe1vZgGSFDWFVClhufHRa8+xk56iUY4vR/QwRBOxgc gkvRascb/g1K0zq6M1KlBNl32L858U+J2Bo+c3YhhgXwOqpekTGj7xYtTq+dE+Y7sSlw YcAPRPwLTHPjsGLmOHvTvbF18NOYJeyQbajatqynEC3POdgO2WGi0tNWDIFwcRpvg/n+ VCxN+PQkkGFfOq5KRM7B01K3gBqGuHH/FLE/GfGn4a10ytJJQj2ZJ7bJ85wIXuv6VVk5 zp9w== X-Gm-Message-State: AJcUukc2tOB3DzuiMp7HGa6aakFvf8Qc7StsqvmpVcc6+h4zXj7tnEBL /kPlDEDnn5U6YFzuUT7vUmVheDbJ X-Google-Smtp-Source: ALg8bN7fwJybIllWNY1FyibtZj8YZ+73ZKkzLqJfN3ntDsvhhsIaVGVUSWr1JiRNv2e6DFUDMnbk4A== X-Received: by 2002:a1c:9855:: with SMTP id a82mr431308wme.20.1548093989117; Mon, 21 Jan 2019 10:06:29 -0800 (PST) From: Paolo Bonzini To: qemu-devel@nongnu.org Date: Mon, 21 Jan 2019 19:05:37 +0100 Message-Id: <1548093980-43088-7-git-send-email-pbonzini@redhat.com> X-Mailer: git-send-email 1.8.3.1 In-Reply-To: <1548093980-43088-1-git-send-email-pbonzini@redhat.com> References: <1548093980-43088-1-git-send-email-pbonzini@redhat.com> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" 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] [PULL 06/49] 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: , Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) 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. Reviewed-by: Philippe Mathieu-Daud=C3=A9 Signed-off-by: Paolo Bonzini Reviewed-by: Thomas Huth Message-Id: <1543851204-41186-5-git-send-email-pbonzini@redhat.com> --- configure | 11 ++++------- hw/net/Makefile.objs | 4 ++-- hw/net/vhost_net.c | 4 +--- include/exec/poison.h | 1 - tests/Makefile.include | 5 +---- tests/vhost-user-test.c | 16 +++++++++++----- 6 files changed, 19 insertions(+), 22 deletions(-) diff --git a/configure b/configure index 73bbbd6..fca5861 100755 --- a/configure +++ b/configure @@ -6554,7 +6554,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 @@ -7327,12 +7330,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/hw/net/vhost_net.c b/hw/net/vhost_net.c index ae3ca23..be3cc88 100644 --- a/hw/net/vhost_net.c +++ b/hw/net/vhost_net.c @@ -25,8 +25,6 @@ =20 =20 #include -#include -#include #include #include =20 @@ -134,7 +132,7 @@ static int vhost_net_get_fd(NetClientState *backend) return tap_get_fd(backend); default: fprintf(stderr, "vhost-net requires tap backend\n"); - return -EBADFD; + return -ENOSYS; } } =20 diff --git a/include/exec/poison.h b/include/exec/poison.h index ecdc83c..1a7a57b 100644 --- a/include/exec/poison.h +++ b/include/exec/poison.h @@ -86,7 +86,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 5e6b2c7..443ac4d 100644 --- a/tests/Makefile.include +++ b/tests/Makefile.include @@ -207,10 +207,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) diff --git a/tests/vhost-user-test.c b/tests/vhost-user-test.c index 84e50d8..e7900fa 100644 --- a/tests/vhost-user-test.c +++ b/tests/vhost-user-test.c @@ -27,10 +27,13 @@ #include "libqos/malloc-pc.h" #include "hw/virtio/virtio-net.h" =20 -#include -#include -#include +#include "standard-headers/linux/vhost_types.h" +#include "standard-headers/linux/virtio_ids.h" +#include "standard-headers/linux/virtio_net.h" + +#ifdef CONFIG_LINUX #include +#endif =20 =20 #define QEMU_CMD_MEM " -m %d -object memory-backend-file,id=3Dmem,size= =3D%dM," \ @@ -442,6 +445,7 @@ static void chr_read(void *opaque, const uint8_t *buf, = int size) g_mutex_unlock(&s->data_mutex); } =20 +#ifdef CONFIG_LINUX static const char *init_hugepagefs(const char *path) { struct statfs fs; @@ -468,6 +472,7 @@ static const char *init_hugepagefs(const char *path) =20 return path; } +#endif =20 static TestServer *test_server_new(const gchar *name) { @@ -951,13 +956,14 @@ int main(int argc, char **argv) } g_assert(tmpfs); =20 + root =3D tmpfs; +#ifdef CONFIG_LINUX hugefs =3D getenv("QTEST_HUGETLBFS_PATH"); if (hugefs) { root =3D init_hugepagefs(hugefs); g_assert(root); - } else { - root =3D tmpfs; } +#endif =20 loop =3D g_main_loop_new(NULL, FALSE); /* run the main loop thread so the chardev may operate */ --=20 1.8.3.1