From nobody Sun May 19 10:01:22 2024 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; 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 ARC-Seal: i=1; a=rsa-sha256; t=1557218825; cv=none; d=zoho.com; s=zohoarc; b=OMuBE3hF/FHwkmZBTm5m8OmSjDpt9OGlwilG2KOI8lpvXxxW6cEQFFBH3dvNFMaCFK8wsGxJYY3Pj6V0K+IqrqnjdxNCcQ6NmTdMzk9Nr9IYWwbWN/z7UBBTRG4skNsr8sLdol237L4PtlOqnGXxpRbt5t5C3bOmMQpulFV/AIk= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zoho.com; s=zohoarc; t=1557218825; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To:ARC-Authentication-Results; bh=x3+pu9e9UB9qjrWvXt3IslAnB6QLXo/xbgy3Ps3aSLI=; b=aj38CMhuivbsXCxqZCarNtI+SJZAqRfeLVNngK3/3+c4OpOqOF+0JYx+i/2Uvihas5BCGAYy1nVfOzpyBvWu4xbxKV1o4ayzZN0Ztv0s2sMAZULJ58IK1PrzkJUlDm+SW3BvmQ2VHtAwp2gJ7pq3e7fS8uvy3LrmKuuyNQnKHzI= ARC-Authentication-Results: i=1; mx.zoho.com; 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 Return-Path: Received: from lists.gnu.org (209.51.188.17 [209.51.188.17]) by mx.zohomail.com with SMTPS id 155721882575199.15007080608211; Tue, 7 May 2019 01:47:05 -0700 (PDT) Received: from localhost ([127.0.0.1]:42424 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1hNvkW-0005Mq-Gz for importer@patchew.org; Tue, 07 May 2019 04:46:56 -0400 Received: from eggs.gnu.org ([209.51.188.92]:35321) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1hNvij-0004Ko-N3 for qemu-devel@nongnu.org; Tue, 07 May 2019 04:45:06 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1hNvii-0006PX-Rt for qemu-devel@nongnu.org; Tue, 07 May 2019 04:45:05 -0400 Received: from mx0a-001b2d01.pphosted.com ([148.163.156.1]:50704) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1hNvii-0006MS-G1 for qemu-devel@nongnu.org; Tue, 07 May 2019 04:45:04 -0400 Received: from pps.filterd (m0098409.ppops.net [127.0.0.1]) by mx0a-001b2d01.pphosted.com (8.16.0.27/8.16.0.27) with SMTP id x478g0Ad030349 for ; Tue, 7 May 2019 04:44:57 -0400 Received: from e06smtp07.uk.ibm.com (e06smtp07.uk.ibm.com [195.75.94.103]) by mx0a-001b2d01.pphosted.com with ESMTP id 2sb59jmb8w-1 (version=TLSv1.2 cipher=AES256-GCM-SHA384 bits=256 verify=NOT) for ; Tue, 07 May 2019 04:44:56 -0400 Received: from localhost by e06smtp07.uk.ibm.com with IBM ESMTP SMTP Gateway: Authorized Use Only! Violators will be prosecuted for from ; Tue, 7 May 2019 09:44:54 +0100 Received: from b06cxnps3074.portsmouth.uk.ibm.com (9.149.109.194) by e06smtp07.uk.ibm.com (192.168.101.137) with IBM ESMTP SMTP Gateway: Authorized Use Only! Violators will be prosecuted; (version=TLSv1/SSLv3 cipher=AES256-GCM-SHA384 bits=256/256) Tue, 7 May 2019 09:44:50 +0100 Received: from d06av23.portsmouth.uk.ibm.com (d06av23.portsmouth.uk.ibm.com [9.149.105.59]) by b06cxnps3074.portsmouth.uk.ibm.com (8.14.9/8.14.9/NCO v10.0) with ESMTP id x478inNm61538536 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Tue, 7 May 2019 08:44:50 GMT Received: from d06av23.portsmouth.uk.ibm.com (unknown [127.0.0.1]) by IMSVA (Postfix) with ESMTP id CEFC0A405D; Tue, 7 May 2019 08:44:49 +0000 (GMT) Received: from d06av23.portsmouth.uk.ibm.com (unknown [127.0.0.1]) by IMSVA (Postfix) with ESMTP id AACE4A4055; Tue, 7 May 2019 08:44:49 +0000 (GMT) Received: from bahia.lan (unknown [9.145.26.205]) by d06av23.portsmouth.uk.ibm.com (Postfix) with ESMTP; Tue, 7 May 2019 08:44:49 +0000 (GMT) From: Greg Kurz To: qemu-devel@nongnu.org Date: Tue, 07 May 2019 10:44:49 +0200 In-Reply-To: <155721868351.451636.16735088470797960209.stgit@bahia.lan> References: <155721868351.451636.16735088470797960209.stgit@bahia.lan> User-Agent: StGit/unknown-version MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-TM-AS-GCONF: 00 x-cbid: 19050708-0028-0000-0000-0000036B1A75 X-IBM-AV-DETECTION: SAVI=unused REMOTE=unused XFE=unused x-cbparentid: 19050708-0029-0000-0000-0000242A9281 Message-Id: <155721868932.451636.17837774103334071645.stgit@bahia.lan> X-Proofpoint-Virus-Version: vendor=fsecure engine=2.50.10434:, , definitions=2019-05-07_04:, , signatures=0 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 priorityscore=1501 malwarescore=0 suspectscore=1 phishscore=0 bulkscore=0 spamscore=0 clxscore=1034 lowpriorityscore=0 mlxscore=0 impostorscore=0 mlxlogscore=725 adultscore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.0.1-1810050000 definitions=main-1905070057 X-detected-operating-system: by eggs.gnu.org: GNU/Linux 3.x [generic] X-Received-From: 148.163.156.1 Subject: [Qemu-devel] [PATCH 1/6] fsdev: Drop unused extern declaration 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: Paolo Bonzini , Thomas Huth , Greg Kurz Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" This is a leftover of the handle backend, removed in QEMU 4.0. Signed-off-by: Greg Kurz Reviewed-by: Thomas Huth --- fsdev/qemu-fsdev.h | 1 - 1 file changed, 1 deletion(-) diff --git a/fsdev/qemu-fsdev.h b/fsdev/qemu-fsdev.h index d9716b414492..844159d1e1ff 100644 --- a/fsdev/qemu-fsdev.h +++ b/fsdev/qemu-fsdev.h @@ -41,7 +41,6 @@ typedef struct FsDriverListEntry { int qemu_fsdev_add(QemuOpts *opts, Error **errp); FsDriverEntry *get_fsdev_fsentry(char *id); extern FileOperations local_ops; -extern FileOperations handle_ops; extern FileOperations synth_ops; extern FileOperations proxy_ops; #endif From nobody Sun May 19 10:01:22 2024 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; 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 ARC-Seal: i=1; a=rsa-sha256; t=1557218828; cv=none; d=zoho.com; s=zohoarc; b=QdWsfJD4I63MJbab/t9nmWzXhDZmec8wCqT1eeHu+v0sUg9Ce/rhWmifZ7ySLC39Kru3RapSMIz29iAxVEapiJUy5pcfNjFJJQC65W3H06OZWqjhg8KDb5SK2Ch4AMkvwrKZCC0qKQu6MIUNhyqGHJ62wK7K0hh09xNh1jsfdNE= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zoho.com; s=zohoarc; t=1557218828; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To:ARC-Authentication-Results; bh=YhOjv2pbZA8qpAUkWXMUOYeC8iyomzVXbQhtS/q8pvg=; b=SteHfq0Ag/+FNy+rqUjrQfchxvND32jp3s7Plf7+d2Dat5bh8WviUlsf7ppA/ywtWuQQ2kWwkkP+DlI09+7m8i7UMbOcqlTMqpsDBxCsJSL6HHHnjIXoNPFcJD/acd5alwe6L0luOrnJFosM3/Nk/AO09N0nc9U2+akf05Z4GOU= ARC-Authentication-Results: i=1; mx.zoho.com; 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 Return-Path: Received: from lists.gnu.org (209.51.188.17 [209.51.188.17]) by mx.zohomail.com with SMTPS id 155721882855329.49754445638689; Tue, 7 May 2019 01:47:08 -0700 (PDT) Received: from localhost ([127.0.0.1]:42422 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1hNvkW-0005M1-JF for importer@patchew.org; Tue, 07 May 2019 04:46:56 -0400 Received: from eggs.gnu.org ([209.51.188.92]:35324) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1hNvik-0004Kq-0U for qemu-devel@nongnu.org; Tue, 07 May 2019 04:45:06 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1hNvij-0006Pn-3i for qemu-devel@nongnu.org; Tue, 07 May 2019 04:45:05 -0400 Received: from mx0b-001b2d01.pphosted.com ([148.163.158.5]:56202 helo=mx0a-001b2d01.pphosted.com) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1hNvii-0006PJ-UJ for qemu-devel@nongnu.org; Tue, 07 May 2019 04:45:05 -0400 Received: from pps.filterd (m0098413.ppops.net [127.0.0.1]) by mx0b-001b2d01.pphosted.com (8.16.0.27/8.16.0.27) with SMTP id x478fheL118570 for ; Tue, 7 May 2019 04:45:02 -0400 Received: from e06smtp04.uk.ibm.com (e06smtp04.uk.ibm.com [195.75.94.100]) by mx0b-001b2d01.pphosted.com with ESMTP id 2sb4t4nhsa-1 (version=TLSv1.2 cipher=AES256-GCM-SHA384 bits=256 verify=NOT) for ; Tue, 07 May 2019 04:45:01 -0400 Received: from localhost by e06smtp04.uk.ibm.com with IBM ESMTP SMTP Gateway: Authorized Use Only! Violators will be prosecuted for from ; Tue, 7 May 2019 09:44:58 +0100 Received: from b06cxnps3075.portsmouth.uk.ibm.com (9.149.109.195) by e06smtp04.uk.ibm.com (192.168.101.134) with IBM ESMTP SMTP Gateway: Authorized Use Only! Violators will be prosecuted; (version=TLSv1/SSLv3 cipher=AES256-GCM-SHA384 bits=256/256) Tue, 7 May 2019 09:44:56 +0100 Received: from d06av24.portsmouth.uk.ibm.com (d06av24.portsmouth.uk.ibm.com [9.149.105.60]) by b06cxnps3075.portsmouth.uk.ibm.com (8.14.9/8.14.9/NCO v10.0) with ESMTP id x478itHS61276294 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Tue, 7 May 2019 08:44:55 GMT Received: from d06av24.portsmouth.uk.ibm.com (unknown [127.0.0.1]) by IMSVA (Postfix) with ESMTP id 6B3F342049; Tue, 7 May 2019 08:44:55 +0000 (GMT) Received: from d06av24.portsmouth.uk.ibm.com (unknown [127.0.0.1]) by IMSVA (Postfix) with ESMTP id 3C31742047; Tue, 7 May 2019 08:44:55 +0000 (GMT) Received: from bahia.lan (unknown [9.145.26.205]) by d06av24.portsmouth.uk.ibm.com (Postfix) with ESMTP; Tue, 7 May 2019 08:44:55 +0000 (GMT) From: Greg Kurz To: qemu-devel@nongnu.org Date: Tue, 07 May 2019 10:44:54 +0200 In-Reply-To: <155721868351.451636.16735088470797960209.stgit@bahia.lan> References: <155721868351.451636.16735088470797960209.stgit@bahia.lan> User-Agent: StGit/unknown-version MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-TM-AS-GCONF: 00 x-cbid: 19050708-0016-0000-0000-000002791C1D X-IBM-AV-DETECTION: SAVI=unused REMOTE=unused XFE=unused x-cbparentid: 19050708-0017-0000-0000-000032D5C4A7 Message-Id: <155721869488.451636.17943384710743134351.stgit@bahia.lan> X-Proofpoint-Virus-Version: vendor=fsecure engine=2.50.10434:, , definitions=2019-05-07_04:, , signatures=0 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 priorityscore=1501 malwarescore=0 suspectscore=1 phishscore=0 bulkscore=0 spamscore=0 clxscore=1034 lowpriorityscore=0 mlxscore=0 impostorscore=0 mlxlogscore=607 adultscore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.0.1-1810050000 definitions=main-1905070057 X-detected-operating-system: by eggs.gnu.org: GNU/Linux 3.x [generic] X-Received-From: 148.163.158.5 Subject: [Qemu-devel] [PATCH 2/6] fsdev: Drop unused opaque field 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: Paolo Bonzini , Thomas Huth , Greg Kurz Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" This was introduced along with -fsdev but it never got used. Signed-off-by: Greg Kurz Reviewed-by: Thomas Huth --- fsdev/file-op-9p.h | 1 - 1 file changed, 1 deletion(-) diff --git a/fsdev/file-op-9p.h b/fsdev/file-op-9p.h index 3fa062b39f1b..c757c8099f54 100644 --- a/fsdev/file-op-9p.h +++ b/fsdev/file-op-9p.h @@ -147,7 +147,6 @@ struct FileOperations int (*renameat)(FsContext *ctx, V9fsPath *olddir, const char *old_name, V9fsPath *newdir, const char *new_name); int (*unlinkat)(FsContext *ctx, V9fsPath *dir, const char *name, int f= lags); - void *opaque; }; =20 #endif From nobody Sun May 19 10:01:22 2024 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; 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 ARC-Seal: i=1; a=rsa-sha256; t=1557218962; cv=none; d=zoho.com; s=zohoarc; b=fGVQLHbVnX5KfGuqMHi53yKcdMU6sz3q4WhS6kTB1fWZ/Ch3kXhVxi0KQqkdxRpi2LVWAoFAR9b6wF91ZsPmiEQGY23e+0o/d4i8P/p55RbtEm8Wn+AYDPv/A10eFlgIk2Z7/iK3RfPbRag3710HkoPPt4Kx4LOXmc2uNGI9xe8= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zoho.com; s=zohoarc; t=1557218962; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To:ARC-Authentication-Results; bh=ICh0rVm1650CBpQ4+4wH6LPxdXkRd/OB0BNutgZtOyw=; b=HrvsumtxrQTGvZt8zeFgYRTkhCqNiFC9oJE7/62zaNRcTpHzYiDqHZIcbY91Yf6EeVe67Sba7poXCCOxwYNUb7mXq/muNB80gs1MbeNNFA1cAUlsUW/5FePhQR164sCZFfUlqIKhZNQlNjSx0+7HYwwexASW6Rjg/jTAs74P5VQ= ARC-Authentication-Results: i=1; mx.zoho.com; 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 Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1557218962132663.7071194380776; Tue, 7 May 2019 01:49:22 -0700 (PDT) Received: from localhost ([127.0.0.1]:42445 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1hNvmp-0007AP-6h for importer@patchew.org; Tue, 07 May 2019 04:49:19 -0400 Received: from eggs.gnu.org ([209.51.188.92]:35339) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1hNvil-0004LQ-NZ for qemu-devel@nongnu.org; Tue, 07 May 2019 04:45:08 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1hNvik-0006QZ-Ls for qemu-devel@nongnu.org; Tue, 07 May 2019 04:45:07 -0400 Received: from mx0b-001b2d01.pphosted.com ([148.163.158.5]:52816 helo=mx0a-001b2d01.pphosted.com) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1hNvik-0006QO-FT for qemu-devel@nongnu.org; Tue, 07 May 2019 04:45:06 -0400 Received: from pps.filterd (m0098421.ppops.net [127.0.0.1]) by mx0a-001b2d01.pphosted.com (8.16.0.27/8.16.0.27) with SMTP id x478ffgg047187 for ; Tue, 7 May 2019 04:45:06 -0400 Received: from e06smtp02.uk.ibm.com (e06smtp02.uk.ibm.com [195.75.94.98]) by mx0a-001b2d01.pphosted.com with ESMTP id 2sb6m2rejp-1 (version=TLSv1.2 cipher=AES256-GCM-SHA384 bits=256 verify=NOT) for ; Tue, 07 May 2019 04:45:05 -0400 Received: from localhost by e06smtp02.uk.ibm.com with IBM ESMTP SMTP Gateway: Authorized Use Only! Violators will be prosecuted for from ; Tue, 7 May 2019 09:45:04 +0100 Received: from b06cxnps4074.portsmouth.uk.ibm.com (9.149.109.196) by e06smtp02.uk.ibm.com (192.168.101.132) with IBM ESMTP SMTP Gateway: Authorized Use Only! Violators will be prosecuted; (version=TLSv1/SSLv3 cipher=AES256-GCM-SHA384 bits=256/256) Tue, 7 May 2019 09:45:02 +0100 Received: from d06av25.portsmouth.uk.ibm.com (d06av25.portsmouth.uk.ibm.com [9.149.105.61]) by b06cxnps4074.portsmouth.uk.ibm.com (8.14.9/8.14.9/NCO v10.0) with ESMTP id x478j1kv50856062 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Tue, 7 May 2019 08:45:01 GMT Received: from d06av25.portsmouth.uk.ibm.com (unknown [127.0.0.1]) by IMSVA (Postfix) with ESMTP id 011D711C05B; Tue, 7 May 2019 08:45:01 +0000 (GMT) Received: from d06av25.portsmouth.uk.ibm.com (unknown [127.0.0.1]) by IMSVA (Postfix) with ESMTP id C604F11C05E; Tue, 7 May 2019 08:45:00 +0000 (GMT) Received: from bahia.lan (unknown [9.145.26.205]) by d06av25.portsmouth.uk.ibm.com (Postfix) with ESMTP; Tue, 7 May 2019 08:45:00 +0000 (GMT) From: Greg Kurz To: qemu-devel@nongnu.org Date: Tue, 07 May 2019 10:45:00 +0200 In-Reply-To: <155721868351.451636.16735088470797960209.stgit@bahia.lan> References: <155721868351.451636.16735088470797960209.stgit@bahia.lan> User-Agent: StGit/unknown-version MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-TM-AS-GCONF: 00 x-cbid: 19050708-0008-0000-0000-000002E41364 X-IBM-AV-DETECTION: SAVI=unused REMOTE=unused XFE=unused x-cbparentid: 19050708-0009-0000-0000-000022508F08 Message-Id: <155721870044.451636.8272207759150286399.stgit@bahia.lan> X-Proofpoint-Virus-Version: vendor=fsecure engine=2.50.10434:, , definitions=2019-05-07_04:, , signatures=0 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 priorityscore=1501 malwarescore=0 suspectscore=1 phishscore=0 bulkscore=0 spamscore=0 clxscore=1034 lowpriorityscore=0 mlxscore=0 impostorscore=0 mlxlogscore=951 adultscore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.0.1-1810050000 definitions=main-1905070057 X-detected-operating-system: by eggs.gnu.org: GNU/Linux 3.x [generic] X-Received-From: 148.163.158.5 Subject: [Qemu-devel] [PATCH 3/6] fsdev: Move some types definition to qemu-fsdev.c 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: Paolo Bonzini , Thomas Huth , Greg Kurz Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" It would make sense for these types to be defined in a header file if we had an API for fsdrivers to register themselves. In practice, we only have three of them and it is very unlikely we add new ones since the future of file sharing between host and guest is the upcoming virtio-fs. Move the types to qemu-fsdev.c instead since they are only used there. Signed-off-by: Greg Kurz Reviewed-by: Thomas Huth --- fsdev/qemu-fsdev.c | 23 +++++++++++++++++++++++ fsdev/qemu-fsdev.h | 24 ------------------------ 2 files changed, 23 insertions(+), 24 deletions(-) diff --git a/fsdev/qemu-fsdev.c b/fsdev/qemu-fsdev.c index 54cb36a2124b..e972bd698cf5 100644 --- a/fsdev/qemu-fsdev.c +++ b/fsdev/qemu-fsdev.c @@ -18,6 +18,29 @@ #include "qemu/error-report.h" #include "qemu/option.h" =20 +/* + * A table to store the various file systems and their callback operations. + * ----------------- + * fstype | ops + * ----------------- + * local | local_ops + * . | + * . | + * . | + * . | + * ----------------- + * etc + */ +typedef struct FsDriverTable { + const char *name; + FileOperations *ops; +} FsDriverTable; + +typedef struct FsDriverListEntry { + FsDriverEntry fse; + QTAILQ_ENTRY(FsDriverListEntry) next; +} FsDriverListEntry; + static QTAILQ_HEAD(, FsDriverListEntry) fsdriver_entries =3D QTAILQ_HEAD_INITIALIZER(fsdriver_entries); =20 diff --git a/fsdev/qemu-fsdev.h b/fsdev/qemu-fsdev.h index 844159d1e1ff..52a53977701a 100644 --- a/fsdev/qemu-fsdev.h +++ b/fsdev/qemu-fsdev.h @@ -14,30 +14,6 @@ #define QEMU_FSDEV_H #include "file-op-9p.h" =20 - -/* - * A table to store the various file systems and their callback operations. - * ----------------- - * fstype | ops - * ----------------- - * local | local_ops - * . | - * . | - * . | - * . | - * ----------------- - * etc - */ -typedef struct FsDriverTable { - const char *name; - FileOperations *ops; -} FsDriverTable; - -typedef struct FsDriverListEntry { - FsDriverEntry fse; - QTAILQ_ENTRY(FsDriverListEntry) next; -} FsDriverListEntry; - int qemu_fsdev_add(QemuOpts *opts, Error **errp); FsDriverEntry *get_fsdev_fsentry(char *id); extern FileOperations local_ops; From nobody Sun May 19 10:01:22 2024 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; 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 ARC-Seal: i=1; a=rsa-sha256; t=1557218965; cv=none; d=zoho.com; s=zohoarc; b=bJQk33WM8/aK4c3+CTnv1aEoukqxNfPVLSywLwfnxfdxT/A4jwee8nt6KvXQk9fSGfoh/QhIvQPLc1MN1Au4fv1FLxb4HSlK9JNTSSoaRfsfZtwf7mJgfWhus0B6vo4Hr8kwxOsS/jfbJm+acK44560fvpIoMvjDYbIaKRgq2S0= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zoho.com; s=zohoarc; t=1557218965; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To:ARC-Authentication-Results; bh=qtlya4n2Gc+m8EPcQIydRSBaLb5RLsn1SdJB7L+CnJI=; b=UXD3VndxC58pmfvgyveqhqKQyrnIx6sSnsTeFF13wdbvM9bMXhvwhjMTe8JsdV54VTUF5wBsxAdKnn0LlVqiAxDgpzSWp62z3RAiIjLE0XXMzy85eUJ7W6HTJBWhNycdJAyzaeAqutOkihDHUVwo6dGoncjD2lZdyYLooA7iuqk= ARC-Authentication-Results: i=1; mx.zoho.com; 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 Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1557218965193281.25445095519547; Tue, 7 May 2019 01:49:25 -0700 (PDT) Received: from localhost ([127.0.0.1]:42447 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1hNvmq-0007Ai-2a for importer@patchew.org; Tue, 07 May 2019 04:49:20 -0400 Received: from eggs.gnu.org ([209.51.188.92]:35361) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1hNviu-0004Y1-9y for qemu-devel@nongnu.org; Tue, 07 May 2019 04:45:17 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1hNvit-0006Xk-8e for qemu-devel@nongnu.org; Tue, 07 May 2019 04:45:16 -0400 Received: from mx0a-001b2d01.pphosted.com ([148.163.156.1]:59606) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1hNvit-0006XH-0k for qemu-devel@nongnu.org; Tue, 07 May 2019 04:45:15 -0400 Received: from pps.filterd (m0098399.ppops.net [127.0.0.1]) by mx0a-001b2d01.pphosted.com (8.16.0.27/8.16.0.27) with SMTP id x478ffSV020155 for ; Tue, 7 May 2019 04:45:14 -0400 Received: from e06smtp07.uk.ibm.com (e06smtp07.uk.ibm.com [195.75.94.103]) by mx0a-001b2d01.pphosted.com with ESMTP id 2sb4776xq1-1 (version=TLSv1.2 cipher=AES256-GCM-SHA384 bits=256 verify=NOT) for ; Tue, 07 May 2019 04:45:11 -0400 Received: from localhost by e06smtp07.uk.ibm.com with IBM ESMTP SMTP Gateway: Authorized Use Only! Violators will be prosecuted for from ; Tue, 7 May 2019 09:45:09 +0100 Received: from b06cxnps4076.portsmouth.uk.ibm.com (9.149.109.198) by e06smtp07.uk.ibm.com (192.168.101.137) with IBM ESMTP SMTP Gateway: Authorized Use Only! Violators will be prosecuted; (version=TLSv1/SSLv3 cipher=AES256-GCM-SHA384 bits=256/256) Tue, 7 May 2019 09:45:07 +0100 Received: from d06av26.portsmouth.uk.ibm.com (d06av26.portsmouth.uk.ibm.com [9.149.105.62]) by b06cxnps4076.portsmouth.uk.ibm.com (8.14.9/8.14.9/NCO v10.0) with ESMTP id x478j63652953254 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Tue, 7 May 2019 08:45:06 GMT Received: from d06av26.portsmouth.uk.ibm.com (unknown [127.0.0.1]) by IMSVA (Postfix) with ESMTP id 877F1AE04D; Tue, 7 May 2019 08:45:06 +0000 (GMT) Received: from d06av26.portsmouth.uk.ibm.com (unknown [127.0.0.1]) by IMSVA (Postfix) with ESMTP id 59E2FAE057; Tue, 7 May 2019 08:45:06 +0000 (GMT) Received: from bahia.lan (unknown [9.145.26.205]) by d06av26.portsmouth.uk.ibm.com (Postfix) with ESMTP; Tue, 7 May 2019 08:45:06 +0000 (GMT) From: Greg Kurz To: qemu-devel@nongnu.org Date: Tue, 07 May 2019 10:45:06 +0200 In-Reply-To: <155721868351.451636.16735088470797960209.stgit@bahia.lan> References: <155721868351.451636.16735088470797960209.stgit@bahia.lan> User-Agent: StGit/unknown-version MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-TM-AS-GCONF: 00 x-cbid: 19050708-0028-0000-0000-0000036B1A77 X-IBM-AV-DETECTION: SAVI=unused REMOTE=unused XFE=unused x-cbparentid: 19050708-0029-0000-0000-0000242A9284 Message-Id: <155721870600.451636.3427944860976861371.stgit@bahia.lan> X-Proofpoint-Virus-Version: vendor=fsecure engine=2.50.10434:, , definitions=2019-05-07_04:, , signatures=0 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 priorityscore=1501 malwarescore=0 suspectscore=1 phishscore=0 bulkscore=0 spamscore=0 clxscore=1034 lowpriorityscore=0 mlxscore=0 impostorscore=0 mlxlogscore=999 adultscore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.0.1-1810050000 definitions=main-1905070057 X-detected-operating-system: by eggs.gnu.org: GNU/Linux 3.x [generic] X-Received-From: 148.163.156.1 Subject: [Qemu-devel] [PATCH 4/6] fsdev: Error out when unsupported option is passed 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: Paolo Bonzini , Thomas Huth , Greg Kurz Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" Each fsdriver only supports a subset of the options that can be passed to -fsdev. Unsupported options are simply ignored. This could cause the user to erroneously think QEMU has a bug. Enforce strict checking of supported options for all fsdrivers. This shouldn't impact libvirt, since it doesn't know about he synth and proxy fsdrivers. Signed-off-by: Greg Kurz Reviewed-by: Eric Blake --- fsdev/qemu-fsdev.c | 74 ++++++++++++++++++++++++++++++++++++++++++++++++= ++-- 1 file changed, 71 insertions(+), 3 deletions(-) diff --git a/fsdev/qemu-fsdev.c b/fsdev/qemu-fsdev.c index e972bd698cf5..077a8c4e2bca 100644 --- a/fsdev/qemu-fsdev.c +++ b/fsdev/qemu-fsdev.c @@ -34,6 +34,7 @@ typedef struct FsDriverTable { const char *name; FileOperations *ops; + const char **opts; } FsDriverTable; =20 typedef struct FsDriverListEntry { @@ -44,12 +45,75 @@ typedef struct FsDriverListEntry { static QTAILQ_HEAD(, FsDriverListEntry) fsdriver_entries =3D QTAILQ_HEAD_INITIALIZER(fsdriver_entries); =20 +#define COMMON_FS_DRIVER_OPTIONS "id", "fsdriver", "readonly" + static FsDriverTable FsDrivers[] =3D { - { .name =3D "local", .ops =3D &local_ops}, - { .name =3D "synth", .ops =3D &synth_ops}, - { .name =3D "proxy", .ops =3D &proxy_ops}, + { + .name =3D "local", + .ops =3D &local_ops, + .opts =3D (const char * []) { + COMMON_FS_DRIVER_OPTIONS, + "security_model", + "path", + "writeout", + "fmode", + "dmode", + "throttling.bps-total", + "throttling.bps-read", + "throttling.bps-write", + "throttling.iops-total", + "throttling.iops-read", + "throttling.iops-write", + "throttling.bps-total-max", + "throttling.bps-read-max", + "throttling.bps-write-max", + "throttling.iops-total-max", + "throttling.iops-read-max", + "throttling.iops-write-max", + "throttling.bps-total-max-length", + "throttling.bps-read-max-length", + "throttling.bps-write-max-length", + "throttling.iops-total-max-length", + "throttling.iops-read-max-length", + "throttling.iops-write-max-length", + "throttling.iops-size", + }, + }, + { + .name =3D "synth", + .ops =3D &synth_ops, + .opts =3D (const char * []) { + COMMON_FS_DRIVER_OPTIONS, + }, + }, + { + .name =3D "proxy", + .ops =3D &proxy_ops, + .opts =3D (const char * []) { + COMMON_FS_DRIVER_OPTIONS, + "socket", + "sock_fd", + "writeout", + }, + }, }; =20 +static int validate_opt(void *opaque, const char *name, const char *value, + Error **errp) +{ + FsDriverTable *drv =3D opaque; + const char **opt; + + for (opt =3D drv->opts; *opt; opt++) { + if (!strcmp(*opt, name)) { + return 0; + } + } + + error_setg(errp, "'%s' is invalid for fsdriver '%s'", name, drv->name); + return -1; +} + int qemu_fsdev_add(QemuOpts *opts, Error **errp) { int i; @@ -80,6 +144,10 @@ int qemu_fsdev_add(QemuOpts *opts, Error **errp) return -1; } =20 + if (qemu_opt_foreach(opts, validate_opt, &FsDrivers[i], errp)) { + return -1; + } + fsle =3D g_malloc0(sizeof(*fsle)); fsle->fse.fsdev_id =3D g_strdup(fsdev_id); fsle->fse.ops =3D FsDrivers[i].ops; From nobody Sun May 19 10:01:22 2024 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; 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 ARC-Seal: i=1; a=rsa-sha256; t=1557218962; cv=none; d=zoho.com; s=zohoarc; b=AuMnSK14FYIMmyM1Y/Nj5nnuDCiBAhtIfQY+aCOk1KuXiN5ghIWCn8ABEVharDWWpliQFqJdg9ZYN4fgJeYo2vFeQpaoJwe5Edftt5L6sKTAO3hUKZOIBV4sgj8R0bwK48p+FkfH0ta0iCgmxD4DeULqOHca9SfDNNpOaKvR/g8= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zoho.com; s=zohoarc; t=1557218962; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To:ARC-Authentication-Results; bh=KN/5C5lp5IZFSnUiBQbBiektpVAIqyMw267Gq4SuHkY=; b=hlF4lOk6ZvrEbm9b1KmsjPJVPqbB3658Cywf54B70zuTF8DlYTs/bojLWuxUFEsGI/KSIzmpxHnO2UvnpIoZaqqsaynVEHwfw/A5OVjgPlweeZfoymdJVsJObadLPol/1P8n0+gqAXDz694793vdrZVywunsDQgVF3WAUDlaP8w= ARC-Authentication-Results: i=1; mx.zoho.com; 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 Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1557218962007801.3314228546915; Tue, 7 May 2019 01:49:22 -0700 (PDT) Received: from localhost ([127.0.0.1]:42443 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1hNvmn-00078v-NK for importer@patchew.org; Tue, 07 May 2019 04:49:17 -0400 Received: from eggs.gnu.org ([209.51.188.92]:35397) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1hNvj1-0004dL-C4 for qemu-devel@nongnu.org; Tue, 07 May 2019 04:45:25 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1hNvj0-0006gc-Bl for qemu-devel@nongnu.org; Tue, 07 May 2019 04:45:23 -0400 Received: from mx0a-001b2d01.pphosted.com ([148.163.156.1]:37946) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1hNvj0-0006fo-0X for qemu-devel@nongnu.org; Tue, 07 May 2019 04:45:22 -0400 Received: from pps.filterd (m0098394.ppops.net [127.0.0.1]) by mx0a-001b2d01.pphosted.com (8.16.0.27/8.16.0.27) with SMTP id x478fuaZ028849 for ; Tue, 7 May 2019 04:45:21 -0400 Received: from e06smtp03.uk.ibm.com (e06smtp03.uk.ibm.com [195.75.94.99]) by mx0a-001b2d01.pphosted.com with ESMTP id 2sb40ef1wb-1 (version=TLSv1.2 cipher=AES256-GCM-SHA384 bits=256 verify=NOT) for ; Tue, 07 May 2019 04:45:20 -0400 Received: from localhost by e06smtp03.uk.ibm.com with IBM ESMTP SMTP Gateway: Authorized Use Only! Violators will be prosecuted for from ; Tue, 7 May 2019 09:45:16 +0100 Received: from b06cxnps4074.portsmouth.uk.ibm.com (9.149.109.196) by e06smtp03.uk.ibm.com (192.168.101.133) with IBM ESMTP SMTP Gateway: Authorized Use Only! Violators will be prosecuted; (version=TLSv1/SSLv3 cipher=AES256-GCM-SHA384 bits=256/256) Tue, 7 May 2019 09:45:14 +0100 Received: from b06wcsmtp001.portsmouth.uk.ibm.com (b06wcsmtp001.portsmouth.uk.ibm.com [9.149.105.160]) by b06cxnps4074.portsmouth.uk.ibm.com (8.14.9/8.14.9/NCO v10.0) with ESMTP id x478jD4X47644684 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Tue, 7 May 2019 08:45:13 GMT Received: from b06wcsmtp001.portsmouth.uk.ibm.com (unknown [127.0.0.1]) by IMSVA (Postfix) with ESMTP id 2C1B6A4054; Tue, 7 May 2019 08:45:12 +0000 (GMT) Received: from b06wcsmtp001.portsmouth.uk.ibm.com (unknown [127.0.0.1]) by IMSVA (Postfix) with ESMTP id EDB18A4067; Tue, 7 May 2019 08:45:11 +0000 (GMT) Received: from bahia.lan (unknown [9.145.26.205]) by b06wcsmtp001.portsmouth.uk.ibm.com (Postfix) with ESMTP; Tue, 7 May 2019 08:45:11 +0000 (GMT) From: Greg Kurz To: qemu-devel@nongnu.org Date: Tue, 07 May 2019 10:45:11 +0200 In-Reply-To: <155721868351.451636.16735088470797960209.stgit@bahia.lan> References: <155721868351.451636.16735088470797960209.stgit@bahia.lan> User-Agent: StGit/unknown-version MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-TM-AS-GCONF: 00 x-cbid: 19050708-0012-0000-0000-00000319186D X-IBM-AV-DETECTION: SAVI=unused REMOTE=unused XFE=unused x-cbparentid: 19050708-0013-0000-0000-000021519484 Message-Id: <155721871159.451636.6528273080303910901.stgit@bahia.lan> X-Proofpoint-Virus-Version: vendor=fsecure engine=2.50.10434:, , definitions=2019-05-07_04:, , signatures=0 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 priorityscore=1501 malwarescore=0 suspectscore=1 phishscore=0 bulkscore=0 spamscore=0 clxscore=1034 lowpriorityscore=0 mlxscore=0 impostorscore=0 mlxlogscore=964 adultscore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.0.1-1810050000 definitions=main-1905070057 X-detected-operating-system: by eggs.gnu.org: GNU/Linux 3.x [generic] X-Received-From: 148.163.156.1 Subject: [Qemu-devel] [PATCH 5/6] vl: Deprecate -virtfs_synth 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: Paolo Bonzini , Thomas Huth , Greg Kurz Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" The synth fsdriver never got used for anything else but the QTest testcase for VirtIO 9P. And even there, QTest directly uses -fsdev synth and -device virtio-9p-{pci|device}. Signed-off-by: Greg Kurz --- This should be Cc'd to libvir-list@redhat.com according to MAINTAINERS, but libvirt doesn't know about -virtfs_synth, so I choose to not spam :) --- qemu-deprecated.texi | 4 ++++ qemu-options.hx | 3 ++- vl.c | 5 +++++ 3 files changed, 11 insertions(+), 1 deletion(-) diff --git a/qemu-deprecated.texi b/qemu-deprecated.texi index 842e71b11dcc..f0ff065e7dc1 100644 --- a/qemu-deprecated.texi +++ b/qemu-deprecated.texi @@ -72,6 +72,10 @@ backend settings instead of environment variables. To e= ase migration to the new format, the ``-audiodev-help'' option can be used to convert the current values of the environment variables to ``-audiodev'' options. =20 +@subsection -virtfs_synth (since 4.1) + +The ``-virtfs_synth'' argument is now deprecated with no replacement. + @section QEMU Machine Protocol (QMP) commands =20 @subsection block-dirty-bitmap-add "autoload" parameter (since 2.12.0) diff --git a/qemu-options.hx b/qemu-options.hx index 51802cbb266a..9c5cc2e6bf70 100644 --- a/qemu-options.hx +++ b/qemu-options.hx @@ -1368,7 +1368,8 @@ DEF("virtfs_synth", 0, QEMU_OPTION_virtfs_synth, STEXI @item -virtfs_synth @findex -virtfs_synth -Create synthetic file system image +Create synthetic file system image. Note that this option is deprecated wi= th +no replacement. ETEXI =20 DEF("iscsi", HAS_ARG, QEMU_OPTION_iscsi, diff --git a/vl.c b/vl.c index d9fea0a11966..c010cb3e98df 100644 --- a/vl.c +++ b/vl.c @@ -3507,6 +3507,11 @@ int main(int argc, char **argv, char **envp) QemuOpts *fsdev; QemuOpts *device; =20 + warn_report("The -virtfs_synth option is deprecated and wi= ll " + "be removed soon. If the -virtfs_synth option = is " + "still useful for you, please send a mail to " + "qemu-devel@nongnu.org with your usecase."); + fsdev =3D qemu_opts_create(qemu_find_opts("fsdev"), "v_syn= th", 1, NULL); if (!fsdev) { From nobody Sun May 19 10:01:22 2024 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; 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 ARC-Seal: i=1; a=rsa-sha256; t=1557219078; cv=none; d=zoho.com; s=zohoarc; b=eqV+LqW98XZcLI7/TtHosttWukVjYdJRBXU6aU4GN38D84h9n6KiebsRs4sJ2r4GB6tgvFi4LBmDNUuDR8ndUsR+4yOxaV9FRlTHUxdoyvcOxicL0FtSw5j6xuQLf7iLph8ojKwh7dt4Brh1rFhyCYXeauRpz5OnaYgN0HEjwxg= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zoho.com; s=zohoarc; t=1557219078; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To:ARC-Authentication-Results; bh=jNvbhuIBmP4goDVx3zF/RWZge5DDb9P0r57KWnOCnkA=; b=hadLekZ4+Ua196wVCIpH1U2T/9xcDERTfD9Wmy62odr38gYS5VbtZRgI83+f3zBmj7X2fq3iQFKcExInoH3zOBbDcrajPyjpwPA7ri2FdlAoHdT5d0l3fi2zbN1zuOnDCkHOGs9oBvuHv+yitfrDIueoZcwRwgdK2fJ+glIa2sY= ARC-Authentication-Results: i=1; mx.zoho.com; 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 Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1557219078738892.138545892017; Tue, 7 May 2019 01:51:18 -0700 (PDT) Received: from localhost ([127.0.0.1]:42510 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1hNvoh-0000c3-Os for importer@patchew.org; Tue, 07 May 2019 04:51:15 -0400 Received: from eggs.gnu.org ([209.51.188.92]:35408) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1hNvj5-0004hK-RB for qemu-devel@nongnu.org; Tue, 07 May 2019 04:45:34 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1hNvj4-0006iN-2X for qemu-devel@nongnu.org; Tue, 07 May 2019 04:45:27 -0400 Received: from mx0a-001b2d01.pphosted.com ([148.163.156.1]:56420) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1hNvj3-0006hz-Px for qemu-devel@nongnu.org; Tue, 07 May 2019 04:45:26 -0400 Received: from pps.filterd (m0098410.ppops.net [127.0.0.1]) by mx0a-001b2d01.pphosted.com (8.16.0.27/8.16.0.27) with SMTP id x478fgOp108593 for ; Tue, 7 May 2019 04:45:25 -0400 Received: from e06smtp07.uk.ibm.com (e06smtp07.uk.ibm.com [195.75.94.103]) by mx0a-001b2d01.pphosted.com with ESMTP id 2sb5xb28gs-1 (version=TLSv1.2 cipher=AES256-GCM-SHA384 bits=256 verify=NOT) for ; Tue, 07 May 2019 04:45:24 -0400 Received: from localhost by e06smtp07.uk.ibm.com with IBM ESMTP SMTP Gateway: Authorized Use Only! Violators will be prosecuted for from ; Tue, 7 May 2019 09:45:22 +0100 Received: from b06cxnps4074.portsmouth.uk.ibm.com (9.149.109.196) by e06smtp07.uk.ibm.com (192.168.101.137) with IBM ESMTP SMTP Gateway: Authorized Use Only! Violators will be prosecuted; (version=TLSv1/SSLv3 cipher=AES256-GCM-SHA384 bits=256/256) Tue, 7 May 2019 09:45:18 +0100 Received: from d06av21.portsmouth.uk.ibm.com (d06av21.portsmouth.uk.ibm.com [9.149.105.232]) by b06cxnps4074.portsmouth.uk.ibm.com (8.14.9/8.14.9/NCO v10.0) with ESMTP id x478jHGw26935378 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Tue, 7 May 2019 08:45:17 GMT Received: from d06av21.portsmouth.uk.ibm.com (unknown [127.0.0.1]) by IMSVA (Postfix) with ESMTP id B0CA852052; Tue, 7 May 2019 08:45:17 +0000 (GMT) Received: from bahia.lan (unknown [9.145.26.205]) by d06av21.portsmouth.uk.ibm.com (Postfix) with ESMTP id 825805204F; Tue, 7 May 2019 08:45:17 +0000 (GMT) From: Greg Kurz To: qemu-devel@nongnu.org Date: Tue, 07 May 2019 10:45:17 +0200 In-Reply-To: <155721868351.451636.16735088470797960209.stgit@bahia.lan> References: <155721868351.451636.16735088470797960209.stgit@bahia.lan> User-Agent: StGit/unknown-version MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-TM-AS-GCONF: 00 x-cbid: 19050708-0028-0000-0000-0000036B1A7A X-IBM-AV-DETECTION: SAVI=unused REMOTE=unused XFE=unused x-cbparentid: 19050708-0029-0000-0000-0000242A9286 Message-Id: <155721871721.451636.4261205814714842408.stgit@bahia.lan> X-Proofpoint-Virus-Version: vendor=fsecure engine=2.50.10434:, , definitions=2019-05-07_04:, , signatures=0 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 priorityscore=1501 malwarescore=0 suspectscore=0 phishscore=0 bulkscore=0 spamscore=0 clxscore=1034 lowpriorityscore=0 mlxscore=0 impostorscore=0 mlxlogscore=999 adultscore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.0.1-1810050000 definitions=main-1905070057 X-detected-operating-system: by eggs.gnu.org: GNU/Linux 3.x [generic] X-Received-From: 148.163.156.1 Subject: [Qemu-devel] [PATCH 6/6] virtfs: Fix documentation of -fsdev and -virtfs 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: Paolo Bonzini , Thomas Huth , Greg Kurz Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" This fixes several things: - add "id" description to -virtfs documentation - split the description into several lines in both usage and documentation for accurateness and clarity - add documentation and usage of the synth fsdriver - add "throttling.*" description to -fsdev local - add some missing periods Buglink: https://bugs.launchpad.net/qemu/+bug/1581976 Signed-off-by: Greg Kurz --- qemu-options.hx | 84 +++++++++++++++++++++++++++++++++++++++------------= ---- 1 file changed, 60 insertions(+), 24 deletions(-) diff --git a/qemu-options.hx b/qemu-options.hx index 9c5cc2e6bf70..975342dfbd66 100644 --- a/qemu-options.hx +++ b/qemu-options.hx @@ -1232,26 +1232,35 @@ the write back by pressing @key{C-a s} (@pxref{disk= _images}). ETEXI =20 DEF("fsdev", HAS_ARG, QEMU_OPTION_fsdev, - "-fsdev fsdriver,id=3Did[,path=3Dpath,][security_model=3D{mapped-xattr= |mapped-file|passthrough|none}]\n" - " [,writeout=3Dimmediate][,readonly][,socket=3Dsocket|sock_fd=3Dsock_f= d][,fmode=3Dfmode][,dmode=3Ddmode]\n" + "-fsdev local,id=3Did,path=3Dpath,security_model=3Dmapped-xattr|mapped= -file|passthrough|none\n" + " [,writeout=3Dimmediate][,readonly][,fmode=3Dfmode][,dmode=3Ddmode]\n" " [[,throttling.bps-total=3Db]|[[,throttling.bps-read=3Dr][,throttling= .bps-write=3Dw]]]\n" " [[,throttling.iops-total=3Di]|[[,throttling.iops-read=3Dr][,throttli= ng.iops-write=3Dw]]]\n" " [[,throttling.bps-total-max=3Dbm]|[[,throttling.bps-read-max=3Drm][,= throttling.bps-write-max=3Dwm]]]\n" " [[,throttling.iops-total-max=3Dim]|[[,throttling.iops-read-max=3Dirm= ][,throttling.iops-write-max=3Diwm]]]\n" - " [[,throttling.iops-size=3Dis]]\n", + " [[,throttling.iops-size=3Dis]]\n" + "-fsdev proxy,id=3Did,socket=3Dsocket[,writeout=3Dimmediate][,readonly= ]\n" + "-fsdev proxy,id=3Did,sock_fd=3Dsock_fd[,writeout=3Dimmediate][,readon= ly]\n" + "-fsdev synth,id=3Did\n", QEMU_ARCH_ALL) =20 STEXI =20 -@item -fsdev @var{fsdriver},id=3D@var{id},path=3D@var{path},[security_mode= l=3D@var{security_model}][,writeout=3D@var{writeout}][,readonly][,socket=3D= @var{socket}|sock_fd=3D@var{sock_fd}][,fmode=3D@var{fmode}][,dmode=3D@var{d= mode}] +@item -fsdev local,id=3D@var{id},path=3D@var{path},security_model=3D@var{s= ecurity_model} [,writeout=3D@var{writeout}][,readonly][,fmode=3D@var{fmode}= ][,dmode=3D@var{dmode}] [,throttling.@var{option}=3D@var{value}[,throttling= .@var{option}=3D@var{value}[,...]]] +@itemx -fsdev proxy,id=3D@var{id},socket=3D@var{socket}[,writeout=3D@var{w= riteout}][,readonly] +@itemx -fsdev proxy,id=3D@var{id},sock_fd=3D@var{sock_fd}[,writeout=3D@var= {writeout}][,readonly] +@itemx -fsdev synth,id=3D@var{id}[,readonly] @findex -fsdev Define a new file system device. Valid options are: @table @option -@item @var{fsdriver} -This option specifies the fs driver backend to use. -Currently "local" and "proxy" file system drivers are supported. +@item local +Accesses to the filesystem are done by QEMU. +@item proxy +Accesses to the filesystem are done by virtfs-proxy-helper(1). +@item synth +Synthetic filesystem, only used by QTests. @item id=3D@var{id} -Specifies identifier for this device +Specifies identifier for this device. @item path=3D@var{path} Specifies the export path for the file system device. Files under this path will be available to the 9p client on the guest. @@ -1279,17 +1288,33 @@ Enables exporting 9p share as a readonly mount for = guests. By default read-write access is given. @item socket=3D@var{socket} Enables proxy filesystem driver to use passed socket file for communicating -with virtfs-proxy-helper +with virtfs-proxy-helper(1). @item sock_fd=3D@var{sock_fd} Enables proxy filesystem driver to use passed socket descriptor for -communicating with virtfs-proxy-helper. Usually a helper like libvirt -will create socketpair and pass one of the fds as sock_fd +communicating with virtfs-proxy-helper(1). Usually a helper like libvirt +will create socketpair and pass one of the fds as sock_fd. @item fmode=3D@var{fmode} Specifies the default mode for newly created files on the host. Works only with security models "mapped-xattr" and "mapped-file". @item dmode=3D@var{dmode} Specifies the default mode for newly created directories on the host. Works only with security models "mapped-xattr" and "mapped-file". +@item throttling.bps-total=3D@var{b},throttling.bps-read=3D@var{r},throttl= ing.bps-write=3D@var{w} +Specify bandwidth throttling limits in bytes per second, either for all re= quest +types or for reads or writes only. +@item throttling.bps-total-max=3D@var{bm},bps-read-max=3D@var{rm},bps-writ= e-max=3D@var{wm} +Specify bursts in bytes per second, either for all request types or for re= ads +or writes only. Bursts allow the guest I/O to spike above the limit +temporarily. +@item throttling.iops-total=3D@var{i},throttling.iops-read=3D@var{r}, thro= ttling.iops-write=3D@var{w} +Specify request rate limits in requests per second, either for all request +types or for reads or writes only. +@item throttling.iops-total-max=3D@var{im},throttling.iops-read-max=3D@var= {irm}, throttling.iops-write-max=3D@var{iwm} +Specify bursts in requests per second, either for all request types or for= reads +or writes only. Bursts allow the guest I/O to spike above the limit tempo= rarily. +@item throttling.iops-size=3D@var{is} +Let every @var{is} bytes of a request count as a new request for iops +throttling purposes. @end table =20 -fsdev option is used along with -device driver "virtio-9p-pci". @@ -1297,30 +1322,39 @@ only with security models "mapped-xattr" and "mappe= d-file". Options for virtio-9p-pci driver are: @table @option @item fsdev=3D@var{id} -Specifies the id value specified along with -fsdev option +Specifies the id value specified along with -fsdev option. @item mount_tag=3D@var{mount_tag} -Specifies the tag name to be used by the guest to mount this export point +Specifies the tag name to be used by the guest to mount this export point. @end table =20 ETEXI =20 DEF("virtfs", HAS_ARG, QEMU_OPTION_virtfs, - "-virtfs local,path=3Dpath,mount_tag=3Dtag,security_model=3D[mapped-xa= ttr|mapped-file|passthrough|none]\n" - " [,id=3Did][,writeout=3Dimmediate][,readonly][,socket=3Dsocket= |sock_fd=3Dsock_fd][,fmode=3Dfmode][,dmode=3Ddmode]\n", + "-virtfs local,path=3Dpath,mount_tag=3Dtag,security_model=3Dmapped-xat= tr|mapped-file|passthrough|none\n" + " [,id=3Did][,writeout=3Dimmediate][,readonly][,fmode=3Dfmode][= ,dmode=3Ddmode]\n" + "-virtfs proxy,mount_tag=3Dtag,socket=3Dsocket[,id=3Did][,writeout=3Di= mmediate][,readonly]\n" + "-virtfs proxy,mount_tag=3Dtag,sock_fd=3Dsock_fd[,id=3Did][,writeout= =3Dimmediate][,readonly]\n" + "-virtfs synth,mount_tag=3Dtag[,id=3Did][,readonly]\n", QEMU_ARCH_ALL) =20 STEXI =20 -@item -virtfs @var{fsdriver}[,path=3D@var{path}],mount_tag=3D@var{mount_ta= g}[,security_model=3D@var{security_model}][,writeout=3D@var{writeout}][,rea= donly][,socket=3D@var{socket}|sock_fd=3D@var{sock_fd}][,fmode=3D@var{fmode}= ][,dmode=3D@var{dmode}] +@item -virtfs local,path=3D@var{path},mount_tag=3D@var{mount_tag} ,securit= y_model=3D@var{security_model}[,writeout=3D@var{writeout}][,readonly] [,fmo= de=3D@var{fmode}][,dmode=3D@var{dmode}] +@itemx -virtfs proxy,socket=3D@var{socket},mount_tag=3D@var{mount_tag} [,w= riteout=3D@var{writeout}][,readonly] +@itemx -virtfs proxy,sock_fd=3D@var{sock_fd},mount_tag=3D@var{mount_tag} [= ,writeout=3D@var{writeout}][,readonly] +@itemx -virtfs synth,mount_tag=3D@var{mount_tag} @findex -virtfs =20 -The general form of a Virtual File system pass-through options are: +Define a new filesystem device and expose it to the guest using a virtio-9= p-device. The general form of a Virtual File system pass-through options ar= e: @table @option -@item @var{fsdriver} -This option specifies the fs driver backend to use. -Currently "local" and "proxy" file system drivers are supported. +@item local +Accesses to the filesystem are done by QEMU. +@item proxy +Accesses to the filesystem are done by virtfs-proxy-helper(1). +@item synth +Synthetic filesystem, only used by QTests. @item id=3D@var{id} -Specifies identifier for this device +Specifies identifier for the filesystem device @item path=3D@var{path} Specifies the export path for the file system device. Files under this path will be available to the 9p client on the guest. @@ -1348,17 +1382,19 @@ Enables exporting 9p share as a readonly mount for = guests. By default read-write access is given. @item socket=3D@var{socket} Enables proxy filesystem driver to use passed socket file for -communicating with virtfs-proxy-helper. Usually a helper like libvirt -will create socketpair and pass one of the fds as sock_fd +communicating with virtfs-proxy-helper(1). Usually a helper like libvirt +will create socketpair and pass one of the fds as sock_fd. @item sock_fd Enables proxy filesystem driver to use passed 'sock_fd' as the socket -descriptor for interfacing with virtfs-proxy-helper +descriptor for interfacing with virtfs-proxy-helper(1). @item fmode=3D@var{fmode} Specifies the default mode for newly created files on the host. Works only with security models "mapped-xattr" and "mapped-file". @item dmode=3D@var{dmode} Specifies the default mode for newly created directories on the host. Works only with security models "mapped-xattr" and "mapped-file". +@item mount_tag=3D@var{mount_tag} +Specifies the tag name to be used by the guest to mount this export point. @end table ETEXI =20