From patchwork Mon Mar 2 15:46:28 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Laurent Vivier X-Patchwork-Id: 11415751 Return-Path: Received: from mail.kernel.org (pdx-korg-mail-1.web.codeaurora.org [172.30.200.123]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 78C35924 for ; Mon, 2 Mar 2020 15:47:27 +0000 (UTC) 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 mail.kernel.org (Postfix) with ESMTPS id 4F6AF21556 for ; Mon, 2 Mar 2020 15:47:27 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=fail reason="signature verification failed" (1024-bit key) header.d=redhat.com header.i=@redhat.com header.b="Ig/DB64V" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 4F6AF21556 Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=redhat.com Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=qemu-devel-bounces+patchwork-qemu-devel=patchwork.kernel.org@nongnu.org Received: from localhost ([::1]:34384 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1j8nHy-0001o0-Fi for patchwork-qemu-devel@patchwork.kernel.org; Mon, 02 Mar 2020 10:47:26 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:44072) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1j8nHK-0000zZ-LJ for qemu-devel@nongnu.org; Mon, 02 Mar 2020 10:46:47 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1j8nHJ-0001zw-7e for qemu-devel@nongnu.org; Mon, 02 Mar 2020 10:46:46 -0500 Received: from us-smtp-1.mimecast.com ([207.211.31.81]:20367 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 1j8nHJ-0001y0-45 for qemu-devel@nongnu.org; Mon, 02 Mar 2020 10:46:45 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1583164003; 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; bh=rrDCMvtCjY4G5cVth8ArRi1GVxIA+sqFn1ld0LSdu5w=; b=Ig/DB64Vy77PWQb4eXufZ4mZBPhXCJSJxhasufLDoq03M/MCfhAWsWCQWHd/WiPCrGgB1I EcSJAqnjrBCh32w7ZmcqPZNNXAAQuOPMKdo2UUFe4qYKNZddoTF2fLYoWu99tH72tI4mPQ B85sOnFo0pr7empbU+u7VeE/zbFFLU8= Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-97-4S2F2JLhOMuFrIToEB8D6Q-1; Mon, 02 Mar 2020 10:46:42 -0500 X-MC-Unique: 4S2F2JLhOMuFrIToEB8D6Q-1 Received: from smtp.corp.redhat.com (int-mx04.intmail.prod.int.phx2.redhat.com [10.5.11.14]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id E20DB1051EAA; Mon, 2 Mar 2020 15:46:40 +0000 (UTC) Received: from thinkpad.redhat.com (ovpn-117-17.ams2.redhat.com [10.36.117.17]) by smtp.corp.redhat.com (Postfix) with ESMTP id 1C3725D9C9; Mon, 2 Mar 2020 15:46:30 +0000 (UTC) From: Laurent Vivier To: qemu-devel@nongnu.org Subject: [PATCH v3 1/3] tests/vhost-user-bridge: move to contrib/ Date: Mon, 2 Mar 2020 16:46:28 +0100 Message-Id: <20200302154630.45620-1-lvivier@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.14 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] [fuzzy] X-Received-From: 207.211.31.81 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: Fam Zheng , Laurent Vivier , Juan Quintela , =?utf-8?q?Alex_Benn=C3=A9e?= , "Michael S. Tsirkin" , "Dr. David Alan Gilbert" , Stefan Hajnoczi , =?utf-8?q?Marc-Andr=C3=A9_Lureau?= , =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= Errors-To: qemu-devel-bounces+patchwork-qemu-devel=patchwork.kernel.org@nongnu.org Sender: "Qemu-devel" vhost-user-bridge is not a test. Move it to contrib/. It will be built with: make vhost-user-bridge Suggested-by: Dr. David Alan Gilbert Signed-off-by: Laurent Vivier Reviewed-by: Philippe Mathieu-Daudé Reviewed-by: Juan Quintela Reviewed-by: Stefan Hajnoczi --- Notes: v3: don't add vhost-user-bridge to the tools list libvhost-user doesn't build on MacOSX and for instance vhost-user-blk is also built only on demand v2: update docs Makefile | 3 +++ Makefile.objs | 1 + contrib/vhost-user-bridge/Makefile.objs | 1 + tests/vhost-user-bridge.c => contrib/vhost-user-bridge/main.c | 0 docs/devel/migration.rst | 2 +- tests/Makefile.include | 1 - 6 files changed, 6 insertions(+), 2 deletions(-) create mode 100644 contrib/vhost-user-bridge/Makefile.objs rename tests/vhost-user-bridge.c => contrib/vhost-user-bridge/main.c (100%) diff --git a/Makefile b/Makefile index aa9cc0b58475..218b8259a49a 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/Makefile.objs b/Makefile.objs index 8a1cbe8000e6..c282ff77dda5 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 000000000000..36a8d9b49a05 --- /dev/null +++ b/contrib/vhost-user-bridge/Makefile.objs @@ -0,0 +1 @@ +vhost-user-bridge-obj-y = main.o 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/docs/devel/migration.rst b/docs/devel/migration.rst index e88918f7639e..d00424460e23 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 edcbd475aa70..2dc95c52c82d 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