From patchwork Tue Feb 25 15:14:56 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: "Michael S. Tsirkin" X-Patchwork-Id: 1244362 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=nongnu.org (client-ip=209.51.188.17; helo=lists.gnu.org; envelope-from=qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org; receiver=) Authentication-Results: ozlabs.org; dmarc=fail (p=none dis=none) header.from=redhat.com Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (1024-bit key; unprotected) header.d=redhat.com header.i=@redhat.com header.a=rsa-sha256 header.s=mimecast20190719 header.b=fb5SHJlv; dkim-atps=neutral Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 48RjSl4DG0z9sNg for ; Wed, 26 Feb 2020 02:26:15 +1100 (AEDT) Received: from localhost ([::1]:58794 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1j6c69-0005LI-FW for incoming@patchwork.ozlabs.org; Tue, 25 Feb 2020 10:26:13 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:56156) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1j6bvP-0002c1-EK for qemu-devel@nongnu.org; Tue, 25 Feb 2020 10:15:09 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1j6bvO-00020E-7e for qemu-devel@nongnu.org; Tue, 25 Feb 2020 10:15:07 -0500 Received: from us-smtp-2.mimecast.com ([205.139.110.61]:44416 helo=us-smtp-delivery-1.mimecast.com) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1j6bvN-0001zd-RM for qemu-devel@nongnu.org; Tue, 25 Feb 2020 10:15:06 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1582643705; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=G6c8L9eQw051eaC/4+i0vqRJfgJb3JB+2EyTASZyViM=; b=fb5SHJlvHg0pukXcjT5TFqeUs0Ep3aIoxunoaPisPyTgmz5ZHGDk9kvuiENsz9GSvcvB0Z ciKEmhDci0hXmT5KwBfOxVimnxq2zkFq4Rayh8UeFsUJA5B0mxPqqKQlMfiqbTY4Aoz5VC dU5KDVkPTmYN3clhI412QXkeJMPyec8= Received: from mail-qv1-f72.google.com (mail-qv1-f72.google.com [209.85.219.72]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-374-MJjGBozAOOWPI5MV2Fu4PA-1; Tue, 25 Feb 2020 10:15:03 -0500 X-MC-Unique: MJjGBozAOOWPI5MV2Fu4PA-1 Received: by mail-qv1-f72.google.com with SMTP id dr18so13232069qvb.14 for ; Tue, 25 Feb 2020 07:15:02 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:date:from:to:cc:subject:message-id:references :mime-version:content-disposition:content-transfer-encoding :in-reply-to; bh=mLvYfpxhMKRcFnvE2egjwCdKSrBCyKI8mHWugLjsqSQ=; b=tgqHwjvNkuZA/FtgFbkwWkJ5nTedmz58bbZXbnQ47SuB0A/TTzAodfM5YP0iffUDo1 75ajo7PWjrWxO05W4njJowG5OcEeJ0COdh4ElPud6L/TeiZ67mWN+7+vipX/oHqJ92Iq eNmuUnyK/0nRt5B4lHX4+kFxorrFahqHVXnbXqeoxvTaZEnbLpD9qCr9kxwx1x7zQhnw rz3DqSpCV0WY94whViWCeXBMYOSRK11SZEk+LsVMmkIUAqld1CIX2z8hWkKIAwePso1z QJq1zPXURRFcmkVjCVfPuKVN0HY7lK0ndXflmdnzCnI+yRXCqkJSOOdXnIOkHtbg5tRH j1jA== X-Gm-Message-State: APjAAAUPCB163SUYUDuSJdGzvrfXeghdgEnJRWglwriiSSicK/iwJ8EH Fp1QA1ia/I3BZpmCZ2vhfz+2cOzQ9qh8CnHtp6mc+s7gL9Ik831VA43W9pE5l7wRytgQiK0/b6S G8z10161TT0umLmE= X-Received: by 2002:a37:a84f:: with SMTP id r76mr9094502qke.101.1582643701996; Tue, 25 Feb 2020 07:15:01 -0800 (PST) X-Google-Smtp-Source: APXvYqzcM8OayS2VzLI0ns83pmppUBHCT9tR2BS8cVl7IPH7aOIZ8CLhUU8BIA2tx5p2TC6SDckCxw== X-Received: by 2002:a37:a84f:: with SMTP id r76mr9094469qke.101.1582643701737; Tue, 25 Feb 2020 07:15:01 -0800 (PST) Received: from redhat.com (bzq-79-178-2-214.red.bezeqint.net. [79.178.2.214]) by smtp.gmail.com with ESMTPSA id b7sm7668455qtj.78.2020.02.25.07.14.58 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 25 Feb 2020 07:15:00 -0800 (PST) Date: Tue, 25 Feb 2020 10:14:56 -0500 From: "Michael S. Tsirkin" To: qemu-devel@nongnu.org Subject: [PULL 30/32] tests/vhost-user-bridge: move to contrib/ Message-ID: <20200225151210.647797-31-mst@redhat.com> References: <20200225151210.647797-1-mst@redhat.com> MIME-Version: 1.0 In-Reply-To: <20200225151210.647797-1-mst@redhat.com> X-Mailer: git-send-email 2.24.1.751.gd10ce2899c X-Mutt-Fcc: =sent X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Disposition: inline X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 205.139.110.61 X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Laurent Vivier , Peter Maydell , Juan Quintela , "Dr . David Alan Gilbert" , Stefan Hajnoczi , Philippe =?utf-8?q?Mathieu-Dau?= =?utf-8?b?ZMOp?= Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: "Qemu-devel" From: Laurent Vivier vhost-user-bridge is not a test. Move it to contrib/ and add it to the tools list. It will be built only if tools (--enable-tools) and vhost-user (--enable-vhost-user) are enabled (both are set by default). Suggested-by: Dr. David Alan Gilbert Signed-off-by: Laurent Vivier Reviewed-by: Philippe Mathieu-Daudé Message-Id: <20200207095412.794912-1-lvivier@redhat.com> Reviewed-by: Michael S. Tsirkin Signed-off-by: Michael S. Tsirkin Reviewed-by: Stefan Hajnoczi --- configure | 3 +++ Makefile | 3 +++ tests/vhost-user-bridge.c => contrib/vhost-user-bridge/main.c | 0 Makefile.objs | 1 + contrib/vhost-user-bridge/Makefile.objs | 1 + docs/devel/migration.rst | 2 +- tests/Makefile.include | 1 - 7 files changed, 9 insertions(+), 2 deletions(-) rename tests/vhost-user-bridge.c => contrib/vhost-user-bridge/main.c (100%) create mode 100644 contrib/vhost-user-bridge/Makefile.objs diff --git a/configure b/configure index 48d6f89d57..de2b82b93c 100755 --- a/configure +++ b/configure @@ -6288,6 +6288,9 @@ if test "$want_tools" = "yes" ; then if [ "$curl" = "yes" ]; then tools="elf2dmp\$(EXESUF) $tools" fi + if [ "$vhost_user" = "yes" ]; then + tools="vhost-user-bridge\$(EXESUF) $tools" + fi fi if test "$softmmu" = yes ; then if test "$linux" = yes; then diff --git a/Makefile b/Makefile index aa9cc0b584..218b8259a4 100644 --- a/Makefile +++ b/Makefile @@ -445,6 +445,7 @@ dummy := $(call unnest-vars,, \ libvhost-user-obj-y \ vhost-user-scsi-obj-y \ vhost-user-blk-obj-y \ + vhost-user-bridge-obj-y \ vhost-user-input-obj-y \ vhost-user-gpu-obj-y \ qga-vss-dll-obj-y \ @@ -688,6 +689,8 @@ vhost-user-scsi$(EXESUF): $(vhost-user-scsi-obj-y) libvhost-user.a $(call LINK, $^) vhost-user-blk$(EXESUF): $(vhost-user-blk-obj-y) libvhost-user.a $(call LINK, $^) +vhost-user-bridge$(EXESUF): $(vhost-user-bridge-obj-y) libvhost-user.a + $(call LINK, $^) rdmacm-mux$(EXESUF): LIBS += "-libumad" rdmacm-mux$(EXESUF): $(rdmacm-mux-obj-y) $(COMMON_LDADDS) diff --git a/tests/vhost-user-bridge.c b/contrib/vhost-user-bridge/main.c similarity index 100% rename from tests/vhost-user-bridge.c rename to contrib/vhost-user-bridge/main.c diff --git a/Makefile.objs b/Makefile.objs index 8a1cbe8000..c282ff77dd 100644 --- a/Makefile.objs +++ b/Makefile.objs @@ -107,6 +107,7 @@ vhost-user-scsi.o-cflags := $(LIBISCSI_CFLAGS) vhost-user-scsi.o-libs := $(LIBISCSI_LIBS) vhost-user-scsi-obj-y = contrib/vhost-user-scsi/ vhost-user-blk-obj-y = contrib/vhost-user-blk/ +vhost-user-bridge-obj-y = contrib/vhost-user-bridge/ rdmacm-mux-obj-y = contrib/rdmacm-mux/ vhost-user-input-obj-y = contrib/vhost-user-input/ vhost-user-gpu-obj-y = contrib/vhost-user-gpu/ diff --git a/contrib/vhost-user-bridge/Makefile.objs b/contrib/vhost-user-bridge/Makefile.objs new file mode 100644 index 0000000000..36a8d9b49a --- /dev/null +++ b/contrib/vhost-user-bridge/Makefile.objs @@ -0,0 +1 @@ +vhost-user-bridge-obj-y = main.o diff --git a/docs/devel/migration.rst b/docs/devel/migration.rst index e88918f763..d00424460e 100644 --- a/docs/devel/migration.rst +++ b/docs/devel/migration.rst @@ -807,7 +807,7 @@ The Linux kernel userfault support works on `/dev/shm` memory and on `hugetlbfs` for hugetlbfs which may be a problem in some configurations). The vhost-user code in QEMU supports clients that have Postcopy support, -and the `vhost-user-bridge` (in `tests/`) and the DPDK package have changes +and the `vhost-user-bridge` (in `contrib/`) and the DPDK package have changes to support postcopy. The client needs to open a userfaultfd and register the areas diff --git a/tests/Makefile.include b/tests/Makefile.include index edcbd475aa..2dc95c52c8 100644 --- a/tests/Makefile.include +++ b/tests/Makefile.include @@ -588,7 +588,6 @@ include $(SRC_PATH)/tests/qtest/Makefile.include tests/test-qga$(EXESUF): qemu-ga$(EXESUF) tests/test-qga$(EXESUF): tests/test-qga.o $(qtest-obj-y) -tests/vhost-user-bridge$(EXESUF): tests/vhost-user-bridge.o $(test-util-obj-y) libvhost-user.a SPEED = quick