From patchwork Fri Oct 28 22:26:51 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Greg Kurz X-Patchwork-Id: 688654 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [IPv6:2001:4830:134:3::11]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 3t5JL56jqMz9ssP for ; Sat, 29 Oct 2016 09:27:57 +1100 (AEDT) Received: from localhost ([::1]:52142 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1c0Fct-0007p8-5Q for incoming@patchwork.ozlabs.org; Fri, 28 Oct 2016 18:27:51 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:57301) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1c0FcF-0007XS-0p for qemu-devel@nongnu.org; Fri, 28 Oct 2016 18:27:11 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1c0FcA-0008Cf-4I for qemu-devel@nongnu.org; Fri, 28 Oct 2016 18:27:11 -0400 Received: from 2.mo3.mail-out.ovh.net ([46.105.75.36]:33241) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1c0Fc9-0008CY-Us for qemu-devel@nongnu.org; Fri, 28 Oct 2016 18:27:06 -0400 Received: from player797.ha.ovh.net (b9.ovh.net [213.186.33.59]) by mo3.mail-out.ovh.net (Postfix) with ESMTP id 2457550CAC for ; Sat, 29 Oct 2016 00:27:04 +0200 (CEST) Received: from [192.168.66.108] (unknown [91.224.149.27]) (Authenticated sender: groug@kaod.org) by player797.ha.ovh.net (Postfix) with ESMTPSA id 8BDE42E0080; Sat, 29 Oct 2016 00:26:59 +0200 (CEST) From: Greg Kurz To: qemu-devel@nongnu.org Date: Sat, 29 Oct 2016 00:26:51 +0200 Message-ID: <147769361167.18836.11552142196753043969.stgit@bahia> User-Agent: StGit/0.17.1-dirty MIME-Version: 1.0 X-Ovh-Tracer-Id: 15039489484541630928 X-VR-SPAMSTATE: OK X-VR-SPAMSCORE: -100 X-VR-SPAMCAUSE: gggruggvucftvghtrhhoucdtuddrfeelvddrjeeggdduudcutefuodetggdotefrodftvfcurfhrohhfihhlvgemucfqggfjpdevjffgvefmvefgnecuuegrihhlohhuthemuceftddtnecusecvtfgvtghiphhivghnthhsucdlqddutddtmd X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 46.105.75.36 Subject: [Qemu-devel] [PATCH] 9pfs: drop abusive error message from virtfs_reset() 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: Greg Kurz , "Aneesh Kumar K.V" Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: "Qemu-devel" The virtfs_reset() function is called either when the virtio-9p device gets reset, or when the client starts a new 9P session. In both cases, if it finds fids from a previous session, the following is printed in the monitor: 9pfs:virtfs_reset: One or more uncluncked fids found during reset For example, if a linux guest with a mounted 9P share is reset from the monitor with system_reset, the message will be printed. This is abusive since these fids are now clunked and the state is clean. Signed-off-by: Greg Kurz Reviewed-by: Eric Blake --- hw/9pfs/9p.c | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/hw/9pfs/9p.c b/hw/9pfs/9p.c index 1050b89ec720..aea7e9d39206 100644 --- a/hw/9pfs/9p.c +++ b/hw/9pfs/9p.c @@ -535,7 +535,7 @@ static int coroutine_fn v9fs_mark_fids_unreclaim(V9fsPDU *pdu, V9fsPath *path) static void coroutine_fn virtfs_reset(V9fsPDU *pdu) { V9fsState *s = pdu->s; - V9fsFidState *fidp = NULL; + V9fsFidState *fidp; /* Free all fids */ while (s->fid_list) { @@ -548,11 +548,6 @@ static void coroutine_fn virtfs_reset(V9fsPDU *pdu) free_fid(pdu, fidp); } } - if (fidp) { - /* One or more unclunked fids found... */ - error_report("9pfs:%s: One or more uncluncked fids " - "found during reset", __func__); - } } #define P9_QID_TYPE_DIR 0x80