From nobody Mon Nov 17 09:50:12 2025 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org ARC-Seal: i=1; a=rsa-sha256; t=1603453769; cv=none; d=zohomail.com; s=zohoarc; b=kxhLCMV1RH6yGhBfqAxbnFiba9CmDtQhqpXNRQtpOs6G7ap6Pp7C7RGApZRgXRnFVLZTQQx+5X4Aem+IsafKzxEsBpz6X/Cud1kumdPMoG6GiFJj0fDxlyvtC+oQRymX4i1QmVaNu+IFohz5thzlsbqcFFsqXikhqzUGz+ajTNQ= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1603453769; h=Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:Message-ID:References:Sender:Subject:To; bh=vfBC7OpKzd9ySk5IaL3NmFY0UnDYcnTUQwjaoV0ydyo=; b=Q+JrD+1FflgclzxD8UiFa8YM6oXTGqCVIQHnSLxO7XHeHQqoJaupdiSAisVtpVg+tfVq3+eHlfyAKhGx129p84rMnRsmIPfC/W0HYgHMEwXYniIM4U7I+GN1GUhxyQokpWZhRuagBbQp2iPSbSsQSuJI98Ha/wKClG/J8Za5QaU= ARC-Authentication-Results: i=1; mx.zohomail.com; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1603453769053738.2113532779247; Fri, 23 Oct 2020 04:49:29 -0700 (PDT) Received: from localhost ([::1]:45320 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1kVvZW-0005WZ-Vf for importer@patchew.org; Fri, 23 Oct 2020 07:49:27 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:57574) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kVvY0-0003sg-Gq for qemu-devel@nongnu.org; Fri, 23 Oct 2020 07:47:52 -0400 Received: from lizzy.crudebyte.com ([91.194.90.13]:40751) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kVvXo-0004HB-9H for qemu-devel@nongnu.org; Fri, 23 Oct 2020 07:47:52 -0400 Message-Id: In-Reply-To: References: From: Greg Kurz Date: Tue, 20 Oct 2020 18:09:14 +0200 Subject: [PULL 01/13] tests/9pfs: Factor out do_version() helper To: qemu-devel@nongnu.org, Peter Maydell Received-SPF: pass (zohomail.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; Received-SPF: none client-ip=91.194.90.13; envelope-from=ccc858509ddfa3f6244cc4caf92c4149b7269b43@lizzy.crudebyte.com; helo=lizzy.crudebyte.com X-detected-operating-system: by eggs.gnu.org: First seen = 2020/10/23 07:46:30 X-ACL-Warn: Detected OS = Linux 2.2.x-3.x [generic] [fuzzy] X-Spam_score_int: -15 X-Spam_score: -1.6 X-Spam_bar: - X-Spam_report: (-1.6 / 5.0 requ) BAYES_00=-1.9, HEADER_FROM_DIFFERENT_DOMAINS=0.25, SPF_HELO_NONE=0.001, SPF_NONE=0.001 autolearn=no autolearn_force=no X-Spam_action: no action 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: Greg Kurz Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" fs_version() is a top level test function. Factor out the reusable code to a separate helper instead of hijacking it in other tests. Signed-off-by: Greg Kurz Message-Id: <160321015403.266767.4533967728943968456.stgit@bahia.lan> Signed-off-by: Christian Schoenebeck --- tests/qtest/virtio-9p-test.c | 14 +++++++++----- 1 file changed, 9 insertions(+), 5 deletions(-) diff --git a/tests/qtest/virtio-9p-test.c b/tests/qtest/virtio-9p-test.c index c15908f27b..59bcea4c30 100644 --- a/tests/qtest/virtio-9p-test.c +++ b/tests/qtest/virtio-9p-test.c @@ -567,10 +567,8 @@ static void v9fs_rflush(P9Req *req) v9fs_req_free(req); } =20 -static void fs_version(void *obj, void *data, QGuestAllocator *t_alloc) +static void do_version(QVirtio9P *v9p) { - QVirtio9P *v9p =3D obj; - alloc =3D t_alloc; const char *version =3D "9P2000.L"; uint16_t server_len; char *server_version; @@ -585,13 +583,19 @@ static void fs_version(void *obj, void *data, QGuestA= llocator *t_alloc) g_free(server_version); } =20 +static void fs_version(void *obj, void *data, QGuestAllocator *t_alloc) +{ + alloc =3D t_alloc; + do_version(obj); +} + static void fs_attach(void *obj, void *data, QGuestAllocator *t_alloc) { QVirtio9P *v9p =3D obj; alloc =3D t_alloc; P9Req *req; =20 - fs_version(v9p, NULL, t_alloc); + do_version(v9p); req =3D v9fs_tattach(v9p, 0, getuid(), 0); v9fs_req_wait_for_reply(req, NULL); v9fs_rattach(req, NULL); @@ -831,7 +835,7 @@ static void fs_walk_dotdot(void *obj, void *data, QGues= tAllocator *t_alloc) v9fs_qid root_qid, *wqid; P9Req *req; =20 - fs_version(v9p, NULL, t_alloc); + do_version(v9p); req =3D v9fs_tattach(v9p, 0, getuid(), 0); v9fs_req_wait_for_reply(req, NULL); v9fs_rattach(req, &root_qid); --=20 2.20.1