From patchwork Sun Jul 29 21:27:39 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Leonid Bloch X-Patchwork-Id: 10548307 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 8016FA753 for ; Sun, 29 Jul 2018 21:30:14 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 6810829B2B for ; Sun, 29 Jul 2018 21:30:14 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 5BC3A29B2E; Sun, 29 Jul 2018 21:30:14 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-7.8 required=2.0 tests=BAD_ENC_HEADER,BAYES_00, DKIM_SIGNED,MAILING_LIST_MULTI,RCVD_IN_DNSWL_HI,T_DKIM_INVALID autolearn=ham version=3.3.1 Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id 9DA1829B2B for ; Sun, 29 Jul 2018 21:30:13 +0000 (UTC) Received: from localhost ([::1]:49676 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fjtGU-0003lE-ID for patchwork-qemu-devel@patchwork.kernel.org; Sun, 29 Jul 2018 17:30:10 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:33885) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fjtF2-00020U-8E for qemu-devel@nongnu.org; Sun, 29 Jul 2018 17:28:41 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1fjtEz-0000Wd-29 for qemu-devel@nongnu.org; Sun, 29 Jul 2018 17:28:40 -0400 Received: from mail-sn1nam02on0111.outbound.protection.outlook.com ([104.47.36.111]:45370 helo=NAM02-SN1-obe.outbound.protection.outlook.com) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1fjtEy-0000W0-Ou; Sun, 29 Jul 2018 17:28:36 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=janustech.onmicrosoft.com; s=selector1-janustech-com; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=wKSgoxAG3Nd2XzdsANGk8+Ibb51AHkkZmXJXtYGIB84=; b=riKI0DUxWKgct18Y7P4zhl8jd9TyYEfzeFdu1y11lsX0GRzXriOFGeO8bX5nyz+FcecED5LLyvh/W5hv8GLMMBqTmqKpMzG6GZwLH1scVew9jSajMENf7VwMNkPbw72EN0TPxRSk33WhM4lk09E8L+VbjIC3oYQJGPG5kFQLldI= Authentication-Results: spf=none (sender IP is ) smtp.mailfrom=lbloch@janustech.com; Received: from Jupiter.local (141.226.29.227) by CY1PR07MB2617.namprd07.prod.outlook.com (2a01:111:e400:c637::15) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.995.19; Sun, 29 Jul 2018 21:28:19 +0000 From: Leonid Bloch To: qemu-devel@nongnu.org Date: Mon, 30 Jul 2018 00:27:39 +0300 Message-Id: <20180729212744.23709-2-lbloch@janustech.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20180729212744.23709-1-lbloch@janustech.com> References: <20180729212744.23709-1-lbloch@janustech.com> MIME-Version: 1.0 X-Originating-IP: [141.226.29.227] X-ClientProxiedBy: HE1PR06CA0138.eurprd06.prod.outlook.com (2603:10a6:7:16::25) To CY1PR07MB2617.namprd07.prod.outlook.com (2a01:111:e400:c637::15) X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: fc6e645a-f31e-4637-48f8-08d5f59a35a4 X-Microsoft-Antispam: BCL:0; PCL:0; RULEID:(7020095)(4652040)(7021125)(8989117)(5600074)(711020)(4534165)(7022125)(4603075)(4627221)(201702281549075)(8990107)(7048125)(7024125)(7027125)(7028125)(7023125)(2017052603328)(7153060)(7193020); SRVR:CY1PR07MB2617; X-Microsoft-Exchange-Diagnostics: 1; CY1PR07MB2617; 3:ceX61RdDq/RRVvlTtA8WavFfyO76z8aQCALmR889SYWO4kdSSgyEFSEonfrHA7ICDARFvD1Tiqujh8YYnSwCAhztRfP02H+fQp5Qtucplt+qP5fJya21swOi2+GqnIGNRVjwAelV51VLZ62GKkHb9yU0avAQsMmZIO1/hS84ZcVEVP2/FlEJ/6yY6iD2SDmPe8n8O1ogOO3IcJNviPntXzOZOkmU5rFVYInUtULIUlKNYleRcxQpykGqbSebnAgo; 25:1bfvsuOr1T5qd7jg9Ue4Di1l/463t/cbIPtxusgQO3ykHrsRnFT5hTcWFIkwo1uoQq1h/9i+MApg3sXToC3YelIwkIKrA2oJIsL5V68e5mlayyemJoDqEIPsI1ZrjgavUXtif8nm+R/VrPEw43h3lrf5pChw1SY1frAF8zL1EoE6slW0c5LyGOE0g53myUSAXUjIH/bUQ1qfaQtNPLujqbxPM0cm9L44NPoXZPEXEGXs8Hvk+mRnrPmxYd2sneQZxVweNf2SE2Pepq7zsyB2X/sM5UpVcIVXCLfWjGJHUXnvWLMZtx6Y5IvwdqE+Ed9+e1aMqX47zFEnUvA+EumzFA==; 31:jsB1kjAthCWwAu3a2Tk2A+O+KbUrhq7s11Ozm48qMeGlR2RV6GIIYtGUahI56DH158xlxgkNjstqV60MnIjsSoxtfbUTCZkEDpZdfcJ+J8elQhWdDLyQgMlwpitocSoTgno2a7y+nwnhpz+M+wyBXGUnC4ysiLLTtgFPujPuEjFvlXfHuPeJVYAcT8ltCYBVVTWs4BxTP9mDn+wYocQqLcAmuBaJoAWcBg2CLBD5oLw= X-MS-TrafficTypeDiagnostic: CY1PR07MB2617: X-Microsoft-Antispam-PRVS: X-Exchange-Antispam-Report-Test: UriScan:; X-MS-Exchange-SenderADCheck: 1 X-Exchange-Antispam-Report-CFA-Test: BCL:0; PCL:0; RULEID:(6040522)(2401047)(5005006)(8121501046)(93006095)(93001095)(3231311)(944501410)(52105095)(3002001)(10201501046)(149027)(150027)(6041310)(2016111802025)(20161123560045)(20161123564045)(20161123562045)(20161123558120)(6072148)(6043046)(201708071742011)(7699016); SRVR:CY1PR07MB2617; BCL:0; PCL:0; RULEID:; SRVR:CY1PR07MB2617; X-Microsoft-Exchange-Diagnostics: 1; CY1PR07MB2617; 4:fm+lHLFzCuSqvpyn1di1YMcWBH61pa+UbySWqr6DoOjJj6w/x8tR3Q8IsSt7BbBAEEctHR6He/QIkt4F4nnjKDS343DoeiVL6Vp0lG7djCK8xqNuCcBahoWsvyohGLbpUDp6dFH0FWi/bOA9REmzwocts9FEvfjteaGmmIPhKsMV98b+caiNhQtB7M8PDAl0lv2YTbh9k6vYFD0i2y8q492ASvBVfUK1Jq+/HRi+ipGArMSZB+GSJ9gwhvNvJjHciooMVVIYvydrrXladsNmFg== X-Forefront-PRVS: 0748FF9A04 X-Forefront-Antispam-Report: SFV:NSPM; SFS:(10019020)(136003)(39830400003)(366004)(346002)(376002)(396003)(199004)(189003)(3846002)(6116002)(4326008)(53936002)(51416003)(316002)(107886003)(52116002)(26005)(486006)(81156014)(81166006)(8936002)(956004)(8676002)(16526019)(7736002)(186003)(6486002)(105586002)(476003)(305945005)(2616005)(6512007)(25786009)(478600001)(16586007)(66066001)(68736007)(47776003)(11346002)(54906003)(2906002)(2351001)(36756003)(106356001)(1076002)(76176011)(50466002)(5660300001)(6666003)(6506007)(446003)(386003)(2361001)(48376002)(97736004)(50226002)(6916009)(86362001)(142923001); DIR:OUT; SFP:1102; SCL:1; SRVR:CY1PR07MB2617; H:Jupiter.local; FPR:; SPF:None; LANG:en; PTR:InfoNoRecords; A:1; MX:1; Received-SPF: None (protection.outlook.com: janustech.com does not designate permitted sender hosts) X-Microsoft-Exchange-Diagnostics: =?us-ascii?Q?1; CY1PR07MB2617; 23:bbehdXBlmSHXiSic1gbcj1gMu1zIJY659SOh7huCw?= FiTBK3RsNg3bht3p7UhKpJDBIhhMl9XtqrEmUdkOcejbdmq59yu+3V8E3motKMYUCQsnonlNEY8BDWrUgP4bkzDFL9IVDYZ2mDwfj7Os/rY9ndNbuiHmsqWukWzGLauHbtAh82nbmD+CkSMpDIXwzmgiCf4AAjZwvwMC57qTA1ZAt6M8mNma2KIfJuEg/7TZwyGhL7PwYEznezEm3NilIFJkPjOdJvCFei49dyZ45Nv+6+U6n1ZxZ4pA09FbHhUYzZeM2GiVTbtwL4vIGHPix0t+SiWEdzKi96CbOsxqFREwgl30fL/4AKVzDr2vqj+LLi9QWjIDMqLGs+yGO1AV4HP/So9nHDlGcnDt3zwZ/KiFK9zOJ9YUd4tSeGparLA2IhVaVjkh6La81AAjocoQhEj9TTXY0s+nWwEt2pp7F13bKDjBGJScju3/6breS2/bbD2+KfyjL6zw6mdMKJxADLqYcXao/pa1OFqJYRLJUbm5xlXxF7o/IWRzrXVa/zuefF0IsP/BzGrMAVnZriTaTn9z3SOJ7LyAiNLc1Dapos6ep3YwBXlte5Esby0Tx38MW7Q6JvdQqVFuKM1VwGokqUMb7/KFA/FZIUlJ9Lii69dQIO737cKpDDOAB5OoJjUTu/y7LxrYzch63dz1u3r0TKO8tfJJzv2XfLpyPZs4Fk1lI6c1/GBb0H0kSb8mVStzokSniuguCTviHCrgh7QTVUaWhA3gr4XuCfqFwc4OOz1piXUjOpWXEDl1RQTRKVTC6FENltKgzcwxPFUH5XJt/KmqeuOys/CiBvl+Wi1Mlb/Svz3pzxZKGqAxBlf2GswhNmwE5aUFWTKQq8n6y10l+ths2/TvRkupFG3QwSG8pIa5bHwSzxwUf0er3Ae8yCPecnqcPTAfHW1NffwcVjUqpG2HJhUTKa5/myibay/RI8DwYyBsPCkxEIOyYlhkXkS2g1/DC6AoebOnk3D6LN2K6EPCaZBDiFgtEMaRepRdH90ZLiJpW4d22edszV0s/vRnkjYHPZqWISnpJPZ6vwzT44MolIaVIIQPIGchl7HHhZHcAG8UsJifgwxHD+4Dd0MmB8SJ1XJT9tiJQIo/0ty4BwXeyKv7sshCWzm1jtEdu0YodCzh9pqi/r4NElUVPc4LSZWvdCj32VfV1HerB1w2bYksKfWXG5TvaLJEROCIVXadNo9jDgcELPr1yZkpPPHE+XBNSxuo9q5qdE6MMuDOZJMusbowekj45gYm302Po7xvw== X-Microsoft-Antispam-Message-Info: Tu2jowfQw7a3ZJ8tn2NedL5Gk46UcyAhJbDLj9yr2gHJIc6V22AcAmYWxte579dFU4ylGb6djsWCgjggWnuyRIvc9+0SnpVkOIipiEhhkNyokiND5qkZ6mXQ1IlnknE0HyqvaTHUzW+Z+AHeeUdHtTnwhC/qPGZWQVH9a1Miiegk1n3oFODvAmgA0DgH6DDDSzupnBOVNNtK8F+fJ0PlxyYyoZhPE/0bTdOXGLhyFdNbUvK5r8/1TyU1b8GswIeQdGkpEJXam9LAYsR+Dx2VNf9uCc/RKDEOwEHBgJ7gojbxrtZwy88/BOb+iP3N9ENEnCb+X/ME0+n6Gg84DAnRnasdiwzmVB+ZxlXpVIqCF/M= X-Microsoft-Exchange-Diagnostics: 1; CY1PR07MB2617; 6:Ccdpn2L5vViHr3dfWTfg0kN+tdzEMtWOnOMK34l/X3yT+bAPaP+WKwwsAkzdGj+SWNzI/jQNwBEFKV/J4RpAfPRkzqylvF0C6jl9XurOqalA/LEdHlV874gPDDRzktAhuCkYNzHURpUEQRlmnesWK9miLpRQJ/nudYlYJwEa+obcn8b51/itPcAh3F0G85aQUIaF/5JrCt8rYOXfkc9Qh+V6wlTlmZ2qL1n+uQaivI6LFI6yckNCldiOlj8eDSUEw0N31t4Pgi0Ynyx7YrJwgJeAhzlNjU8u1wDpNBjiKv8Zmgr64wn3bP2ym8wcdtBwCF7kCk0MIQBdbSrTvjHEDHfW5t2GIdv1RnwWZOgXhjlcdAwDIB3nfAKxGeoRgPaql2CZqrSdobUX8exQpv1Is091wJaCFKN1AVrrDgfgaM/zXhuQdvDcrXodfhOhma/H1C+67KN5z/pIQ0CjAUypaw==; 5:G44QpR8FC6jPqeMRgdqM9OvO+OmDxAdTmI3ReVRiGy9jreThMfdSZ2IyGI5MAic6r0ABYX3lPkxLaUVUOaE1raKXKi5/1rNWVAfD2NZKiEX/6VRUfCgGm5ezjZJFXITfvyrAgCVdXVvocbYRFdJEsvj4KF694CXg6BpxKVUYusk=; 7:jyHHfjFSzG9E7uiw3va+20TEnpqxrDKcEXXsaeSvITmaTpiutHnDJAar29binrH4tZuqyxz1bBSLgLBoze5dLqaT0U9Dan3zfeA2CJnTmvih6YoVuMXIRVAieai4modfDJAVpgQl8ROeDCPm1E7QH+YuvJsz3+qY4sIsgw6DtnCnRReMru/uqJG9Y7bSRqEkXRC20QgV4jghqoSW7Mn0WiW7EhKMTgsdx/vZ9J4gckATOPNvy3hL+Lxqmp7dJ3dH SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-OriginatorOrg: janustech.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 29 Jul 2018 21:28:19.6505 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: fc6e645a-f31e-4637-48f8-08d5f59a35a4 X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 34eb020e-3cf3-43a1-afeb-f5cf1310628e X-MS-Exchange-Transport-CrossTenantHeadersStamped: CY1PR07MB2617 X-detected-operating-system: by eggs.gnu.org: Windows 7 or 8 [fuzzy] X-Received-From: 104.47.36.111 Subject: [Qemu-devel] [PATCH 1/6 for-3.0] Update .gitignore 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: Kevin Wolf , Leonid Bloch , qemu-block@nongnu.org, Max Reitz Errors-To: qemu-devel-bounces+patchwork-qemu-devel=patchwork.kernel.org@nongnu.org Sender: "Qemu-devel" X-Virus-Scanned: ClamAV using ClamSMTP Adds /roms/vgabios to .gitignore - this directory appears after the build, and was not ignored by Git so far. Signed-off-by: Leonid Bloch --- .gitignore | 1 + 1 file changed, 1 insertion(+) diff --git a/.gitignore b/.gitignore index 5668d02782..2b3b30ae9f 100644 --- a/.gitignore +++ b/.gitignore @@ -212,3 +212,4 @@ trace-dtrace-root.dtrace trace-ust-all.h trace-ust-all.c /target/arm/decode-sve.inc.c +/roms/vgabios From patchwork Sun Jul 29 21:27:40 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Leonid Bloch X-Patchwork-Id: 10548309 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 7B5BB14BC for ; Sun, 29 Jul 2018 21:30:16 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 6D9C029B2B for ; Sun, 29 Jul 2018 21:30:16 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 616E129B2E; Sun, 29 Jul 2018 21:30:16 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-7.8 required=2.0 tests=BAD_ENC_HEADER,BAYES_00, DKIM_SIGNED,MAILING_LIST_MULTI,RCVD_IN_DNSWL_HI,T_DKIM_INVALID autolearn=ham version=3.3.1 Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id DCB2F29B2B for ; Sun, 29 Jul 2018 21:30:15 +0000 (UTC) Received: from localhost ([::1]:49679 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fjtGZ-0003sC-2S for patchwork-qemu-devel@patchwork.kernel.org; Sun, 29 Jul 2018 17:30:15 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:33896) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fjtF2-00020r-9Y for qemu-devel@nongnu.org; Sun, 29 Jul 2018 17:28:41 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1fjtEz-0000Wj-CW for qemu-devel@nongnu.org; Sun, 29 Jul 2018 17:28:40 -0400 Received: from mail-sn1nam02on0111.outbound.protection.outlook.com ([104.47.36.111]:45370 helo=NAM02-SN1-obe.outbound.protection.outlook.com) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1fjtEz-0000W0-5l; Sun, 29 Jul 2018 17:28:37 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=janustech.onmicrosoft.com; s=selector1-janustech-com; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=l1XJ8oOcOtd42pXjU588QT5zDI6hHI/yjs/1HTS5vAA=; b=O7ruJEPUAIWZdz/Sq8cnDU3ftKHmQNrkppJR6/84T2ybN4ipUF2v9llYg5gMNs6PZuMuZ6vyGBOzhH9hjrlKkEnmDUDUj2qIyqcFSZ7VEKTJngaGDuAa9nVj1ZLCF++BHnrK6aYMXY2/4REA6ouc+pxyG/Ss0sHWhdozsY5EBBA= Authentication-Results: spf=none (sender IP is ) smtp.mailfrom=lbloch@janustech.com; Received: from Jupiter.local (141.226.29.227) by CY1PR07MB2617.namprd07.prod.outlook.com (2a01:111:e400:c637::15) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.995.19; Sun, 29 Jul 2018 21:28:22 +0000 From: Leonid Bloch To: qemu-devel@nongnu.org Date: Mon, 30 Jul 2018 00:27:40 +0300 Message-Id: <20180729212744.23709-3-lbloch@janustech.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20180729212744.23709-1-lbloch@janustech.com> References: <20180729212744.23709-1-lbloch@janustech.com> MIME-Version: 1.0 X-Originating-IP: [141.226.29.227] X-ClientProxiedBy: HE1PR06CA0138.eurprd06.prod.outlook.com (2603:10a6:7:16::25) To CY1PR07MB2617.namprd07.prod.outlook.com (2a01:111:e400:c637::15) X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 85754f54-e5a1-4735-8590-08d5f59a373f X-Microsoft-Antispam: BCL:0; PCL:0; RULEID:(7020095)(4652040)(7021125)(8989117)(5600074)(711020)(4534165)(7022125)(4603075)(4627221)(201702281549075)(8990107)(7048125)(7024125)(7027125)(7028125)(7023125)(2017052603328)(7153060)(7193020); SRVR:CY1PR07MB2617; X-Microsoft-Exchange-Diagnostics: 1; CY1PR07MB2617; 3:psWy+/88Moq2uDdy1b5U+s4LLWiwd9nsbMsm1/rJAIy1cWophFifa2WB6bD79Oq41xqFBkzBQL5pTH4wRFXY6THAYY+hIbxSqYJWiDb/uldapxzrwhxWJwchqYcPIgwhbnJIYkm+1vUqZfoXPDGcB08/QzFL8ZRNuqTBXKGJU+cj4gM1ZKzsXdZdpL50It2nCB7u4BEJysQxi8GBmG5uAMPkK1xOuzUX3QUhcrcDU9wivu5fh3YZlaJMNgPKqoqL; 25:Exk4nRkkaLD8GiZY3+fpK1HOpWSGiY17SnxrYqfMUL89QCZvbqAkmK441RL8vB2xe9a1tTYGBpt7Il7F0pbqZjvRmHQSNASBQd+a0e7sDO2dcPSkvZcJqLL/kGhHCvZWyLzNr86cOxdBvwh5awoN35DyvvDR2TCg7aVyH3cP4FsJRGk168Kgdo3FzMZTSjFY9elj/rtQrV+ElMDp1WbT6YeVReAGFGi9wRf8opOlP6u3M6vxO3uTHL76AH6UcJZTygAk/KMszq2iJOo/VR3qHhMC0GYAGnnuJ2nJMG/j5gXRFLu4PjBzK+SBuSog2KM2biRIKLbeeLhCZ27MCve/nA==; 31:voPDHy5a+PwmLpW2D7kVOahKBCt4OlazYMzrkyCQIxs2WKjlIBzO2/bazVBaV1UEmEGCYDdKYSJ+VsXwwEpQzKLoUJa+j9lgT6E9NSyxDPXWh4uhCn3Og6Cns1KaaI5SeOfd47HmlJx45RG61iS+AOKz2hCW3aa+ZCrp+5/ayr2atFaSXUcKAwszBmuu3IU2ZK2IybubB79TwMw1Nf6qOqNt4p6bxMRIn8iUsoLdzzI= X-MS-TrafficTypeDiagnostic: CY1PR07MB2617: X-Microsoft-Antispam-PRVS: X-Exchange-Antispam-Report-Test: UriScan:; X-MS-Exchange-SenderADCheck: 1 X-Exchange-Antispam-Report-CFA-Test: BCL:0; PCL:0; RULEID:(6040522)(2401047)(5005006)(8121501046)(93006095)(93001095)(3231311)(944501410)(52105095)(3002001)(10201501046)(149027)(150027)(6041310)(2016111802025)(20161123560045)(20161123564045)(20161123562045)(20161123558120)(6072148)(6043046)(201708071742011)(7699016); SRVR:CY1PR07MB2617; BCL:0; PCL:0; RULEID:; SRVR:CY1PR07MB2617; X-Microsoft-Exchange-Diagnostics: 1; CY1PR07MB2617; 4:T3zp8bR31JYPYFnO5wFT5oStanXB3kIN3iHa/Q+QySCrr9oZq23MiT3bwyw9Sz7J+drFeQ2h2o3n1J9+H5DMFYy6rsTE+jwoAXTXR9z5Yfwd8l+I97O+W3zifb+Fw/E5Ahfv8h5Ly5HOJc6utWjb80cYiens8oco4Xtaxp76cg6jcxhmhiP4t5otA5jEreeO52xO9Yx8EnMV6Cr13RfIx40/QhdT7dv++LMThfTBF95NOV6u1nah22v66bVJmDYXMccXxyuioJepD9/wnd1Q7A== X-Forefront-PRVS: 0748FF9A04 X-Forefront-Antispam-Report: SFV:NSPM; SFS:(10019020)(136003)(39830400003)(366004)(346002)(376002)(396003)(199004)(189003)(3846002)(6116002)(4326008)(53936002)(51416003)(316002)(107886003)(52116002)(14444005)(26005)(486006)(81156014)(81166006)(8936002)(956004)(8676002)(16526019)(7736002)(186003)(6486002)(105586002)(476003)(305945005)(2616005)(6512007)(25786009)(478600001)(16586007)(66066001)(68736007)(47776003)(11346002)(54906003)(2906002)(2351001)(36756003)(106356001)(1076002)(76176011)(50466002)(5660300001)(6666003)(6506007)(446003)(386003)(2361001)(48376002)(97736004)(50226002)(6916009)(86362001); DIR:OUT; SFP:1102; SCL:1; SRVR:CY1PR07MB2617; H:Jupiter.local; FPR:; SPF:None; LANG:en; PTR:InfoNoRecords; A:1; MX:1; Received-SPF: None (protection.outlook.com: janustech.com does not designate permitted sender hosts) X-Microsoft-Exchange-Diagnostics: =?us-ascii?Q?1; CY1PR07MB2617; 23:trZ4fC/RejUWxMimg/uHB6IJPglq4pZLOKaszKL8L?= VlKk6Ph0+lBBzXTF0iKydDhuha/osWQ5pVlJHdF4MDc4ikWzMKwvzLvh6Q6g9//iLAEubSK0y9gXNlhWkMKTFnKc6dD2Zq1TF0lx1XUf7uvKPZy1N9T2ccoLe04yFXZArAAU5yX7wYk0hWqhEJLRc+YJJdEHhheos1eJshXb+Ww1jyudsCU1HBReXvOKM5Y26XsHQUqp8RMB2msK11HehNjSpZtrKdpGBkeezFO7tU2lNZ7D45zvabL7pAqD47Vqb//L958CJfbtUfDGN6EnIqbEuSwi9NW0/liBDJoceR+52s7Cv84X8jATyP0pID5WbdEWIVtYmJaunSu9JjqrmoZa6bBYujZvfgKtTHOtSB3mKjcemXTs+jaCYsVsUZXtU/ImyyVWSkqPPtZ7p9o71T0PR3pTL8skF94lS7GxD1U1N3Dhfgar9FecIHwhl8y7mAlSyzjg5RHwLJvZ/yhAZzfm8xKCIF8jT6ebVHexEYWBIMnxMl4vCaBJ37laV+I9mPcN6Zc9q24eg1CjBzXRiEcH69XjlKFA2C6+fDUFtHAag5UDsFoIIpqdtyqzbkonfPCKRrIQjpoGdZGcYTqa9YbrHR6Bm6hNLBwzM+RKRdyWDVIjSBl0PWiRbb6AYu9feKGY2QDUbJlW4min/+kpDmNaNsjKYIgsSSvbKU9GoA13gymxeNNypFIkp5b0ziJz2Qo2nApJDAtCRlUbnvd5e58PWRISl38EkerEC1lGEjjOHzqQRQDSp3TBouzsXARHcDIoSZnDav1Ja48fuSkcQEwoloQfYrFyADazsl5XxC1W+VYGlsZoqpcoe7T42BgsggvniH6bpvVaCp2hamN3iwM26TN/wasCWhkvFuyh+LTiH9kDxa+9hrgJW1pz4T6ILNporQWChlYt5PNAqW+m+Pef+4lboPVGtcI2Fu9dzMILD/lUxxc9k0oPZvo0vRZyT7BICz6YHwZuMpr80nHHq6tZFHuFwyhYNO7Py9kw5W1vR3qe4E5Q8Q4FRsRycnlpwdNjA9AWYF02kIV4cafsNq/IeKhx31rjmiuEpI+iTAIEdt5LxCXc2Y/TA2VTZ57U/Y7IKkH4QXAMhYlnJBns4Nz7y2EBwRe5wojpc8KFb13Pbg3sFa86LmtI4BvxO4joV1OtQcayoY3qlhpUvRo1e/Gw2jkL/ZglWQjpKUh6CRCu3HcB1WUpuz53IUH/9D/w9DrNzZ7n6ltDDUGT2Vr8Y5Ge/OIZ5g3ZPxR6vfH/9Qz+Q== X-Microsoft-Antispam-Message-Info: HK3G41AEFE7fyr1WT50TkvOIktYvHbMzI2EHmQ6Qehaf1RHBgWj5YAKH6vcF0YAipMuyPpFg+bAyMMjOR6fvrMJF/51gpyf0HGqYVebgomgaoB/DGc11mEudwERBm02ZKWm7TmOgkhlvw/yhCpN7YkNOBo9HpyVgP9s670lXet4allUyQUDiwk0HzIbiVpH+r5DGNsv7j9nf6AhJDFKVx00S8onupgfeO3fEFfvxMF2Mr25OTvdMfTvbxW4HoZ+ey7dpCDBZH7xapKL6SY+OVm8vvOqYpwAjse60jjp4f/XDdNtfIxDEQjYE1MoCi8BLoBu7wFThx1vS9kYNiITTg2LIQ90LpzVZxOTUU4L20pw= X-Microsoft-Exchange-Diagnostics: 1; CY1PR07MB2617; 6:MmesrTMyJngBfc95Ff3JTW6nKDfu8C1TNUHnSkK3t97XZMXUnWiAkB+MM6mVLAYBSvb9QgP4qPxYVd3Wf45MrSwxNIm3yD5lRusBCmtZgia7SWmGESp5Da+CZ0dahYMLDTNoeJRBhFHr/p/L1vDuPP15v6JiWTJRUh5mHcDGC2zu7VxUEsEfap+y2YSqJAibdbyc4cXLHrCnm5yEf8d/o9X2h5aWoKQ/QJgzVorwJVMaCARQmuSzH3IV9CxCkD+/bZPzvnkE15HP9UFe6ichoicESnki0392q0c0SVQ96nUBH4JAN8VOxtFuhOfd83LyHGMrYLDozwwvxhMlhhEuDtQMysiRaKMHykJ9mMFP8Z1Ks1cXdqTrUdSX7mpq31hMfme4XFr7/rv2XuDzmMwQETBuf04g5E6xAD0cVH0SVaay25fKsKYkMdvYjj3+kjMsZu3d713FTDtSIGw13PXqaA==; 5:EcR8AYZohPcLnBMkbdvOF5onvmq/h8NpBMDzYZ4PdjPmA684ao1Z1dzpZgTqMLMkV+w/j5lyE4riycr3wLAr6T2kPU9y7/IYDBMFjaS47m8Q30fdrMqLOeEFXG8mYK1JeiC20Pn1QQzh1R7W0NORLNnmyDu0tvH1kvyofyFShF4=; 7:F4pbjNrSlg+lndDm3rUm72GzyfUcXNTiKDkwu4JcStPh2BSnOJk1KomikAri9dwjexacB6ld4RqA6WVSco2pMVZTag4sZGU39OkCYJeA5hqdBZxUPbe8b8CvPaqUDCPoD8t8oovUZJyJsx6NiJ0mbQ3jI8gw+L2oYzkj/67NcwXjObNE83DFgOzBFGgSION1lS9WVDQrXCiqfog/BcgPW1iQTyTODSuoK6BcQUYJFPLgRvZj0nLtqG2ZN7LKVlFO SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-OriginatorOrg: janustech.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 29 Jul 2018 21:28:22.3456 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 85754f54-e5a1-4735-8590-08d5f59a373f X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 34eb020e-3cf3-43a1-afeb-f5cf1310628e X-MS-Exchange-Transport-CrossTenantHeadersStamped: CY1PR07MB2617 X-detected-operating-system: by eggs.gnu.org: Windows 7 or 8 [fuzzy] X-Received-From: 104.47.36.111 Subject: [Qemu-devel] [PATCH 2/6 for-3.0] qcow2: A grammar fix in conflicting cache sizing error message 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: Kevin Wolf , Leonid Bloch , qemu-block@nongnu.org, Max Reitz Errors-To: qemu-devel-bounces+patchwork-qemu-devel=patchwork.kernel.org@nongnu.org Sender: "Qemu-devel" X-Virus-Scanned: ClamAV using ClamSMTP Signed-off-by: Leonid Bloch --- block/qcow2.c | 2 +- tests/qemu-iotests/103.out | 4 ++-- tests/qemu-iotests/137.out | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/block/qcow2.c b/block/qcow2.c index 6162ed8be2..ec9e6238a0 100644 --- a/block/qcow2.c +++ b/block/qcow2.c @@ -797,7 +797,7 @@ static void read_cache_sizes(BlockDriverState *bs, QemuOpts *opts, if (l2_cache_size_set && refcount_cache_size_set) { error_setg(errp, QCOW2_OPT_CACHE_SIZE ", " QCOW2_OPT_L2_CACHE_SIZE " and " QCOW2_OPT_REFCOUNT_CACHE_SIZE " may not be set " - "the same time"); + "at the same time"); return; } else if (*l2_cache_size > combined_cache_size) { error_setg(errp, QCOW2_OPT_L2_CACHE_SIZE " may not exceed " diff --git a/tests/qemu-iotests/103.out b/tests/qemu-iotests/103.out index bd45d3875a..bd9eec3250 100644 --- a/tests/qemu-iotests/103.out +++ b/tests/qemu-iotests/103.out @@ -5,10 +5,10 @@ wrote 65536/65536 bytes at offset 0 === Testing invalid option combinations === -can't open device TEST_DIR/t.IMGFMT: cache-size, l2-cache-size and refcount-cache-size may not be set the same time +can't open device TEST_DIR/t.IMGFMT: cache-size, l2-cache-size and refcount-cache-size may not be set at the same time can't open device TEST_DIR/t.IMGFMT: l2-cache-size may not exceed cache-size can't open device TEST_DIR/t.IMGFMT: refcount-cache-size may not exceed cache-size -can't open device TEST_DIR/t.IMGFMT: cache-size, l2-cache-size and refcount-cache-size may not be set the same time +can't open device TEST_DIR/t.IMGFMT: cache-size, l2-cache-size and refcount-cache-size may not be set at the same time can't open device TEST_DIR/t.IMGFMT: L2 cache entry size must be a power of two between 512 and the cluster size (65536) can't open device TEST_DIR/t.IMGFMT: L2 cache entry size must be a power of two between 512 and the cluster size (65536) can't open device TEST_DIR/t.IMGFMT: L2 cache entry size must be a power of two between 512 and the cluster size (65536) diff --git a/tests/qemu-iotests/137.out b/tests/qemu-iotests/137.out index 96724a6c33..6a2ffc71fd 100644 --- a/tests/qemu-iotests/137.out +++ b/tests/qemu-iotests/137.out @@ -16,7 +16,7 @@ read 33554432/33554432 bytes at offset 0 === Try setting some invalid values === Parameter 'lazy-refcounts' expects 'on' or 'off' -cache-size, l2-cache-size and refcount-cache-size may not be set the same time +cache-size, l2-cache-size and refcount-cache-size may not be set at the same time l2-cache-size may not exceed cache-size refcount-cache-size may not exceed cache-size L2 cache size too big From patchwork Sun Jul 29 21:27:41 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Leonid Bloch X-Patchwork-Id: 10548319 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 7834D14BC for ; Sun, 29 Jul 2018 21:35:13 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 67893288BC for ; Sun, 29 Jul 2018 21:35:13 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 59A8829A8E; Sun, 29 Jul 2018 21:35:13 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-7.8 required=2.0 tests=BAD_ENC_HEADER,BAYES_00, DKIM_SIGNED,MAILING_LIST_MULTI,RCVD_IN_DNSWL_HI,T_DKIM_INVALID autolearn=ham version=3.3.1 Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id C2EDF288BC for ; Sun, 29 Jul 2018 21:35:12 +0000 (UTC) Received: from localhost ([::1]:49708 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fjtLL-0007Fd-W9 for patchwork-qemu-devel@patchwork.kernel.org; Sun, 29 Jul 2018 17:35:12 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:33884) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fjtF2-00020T-8F for qemu-devel@nongnu.org; Sun, 29 Jul 2018 17:28:41 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1fjtEz-0000Wu-Ps for qemu-devel@nongnu.org; Sun, 29 Jul 2018 17:28:40 -0400 Received: from mail-sn1nam02on0111.outbound.protection.outlook.com ([104.47.36.111]:45370 helo=NAM02-SN1-obe.outbound.protection.outlook.com) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1fjtEz-0000W0-GA; Sun, 29 Jul 2018 17:28:37 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=janustech.onmicrosoft.com; s=selector1-janustech-com; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=ChfTlq654w81TY23v2NQeiJH3EPGEsKSxYwKbMv45PA=; b=FdkIrPwyXprOjdyQlNevb9uO0Tn75LH4kZVsbUrwGCQoHDKHvTrMnrkH6BUAq9hgQANrK6dKc4S62UH41Pr5LROFHyR1/+51YGw2XCxB6xIiZNOw2igxd2qcUB4XtqLhZOF10iOGAFseZfQvubcYI1okM/Yvdh9d/TgU4AfNHAA= Authentication-Results: spf=none (sender IP is ) smtp.mailfrom=lbloch@janustech.com; Received: from Jupiter.local (141.226.29.227) by CY1PR07MB2617.namprd07.prod.outlook.com (2a01:111:e400:c637::15) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.995.19; Sun, 29 Jul 2018 21:28:24 +0000 From: Leonid Bloch To: qemu-devel@nongnu.org Date: Mon, 30 Jul 2018 00:27:41 +0300 Message-Id: <20180729212744.23709-4-lbloch@janustech.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20180729212744.23709-1-lbloch@janustech.com> References: <20180729212744.23709-1-lbloch@janustech.com> MIME-Version: 1.0 X-Originating-IP: [141.226.29.227] X-ClientProxiedBy: HE1PR06CA0138.eurprd06.prod.outlook.com (2603:10a6:7:16::25) To CY1PR07MB2617.namprd07.prod.outlook.com (2a01:111:e400:c637::15) X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 902fb62a-e26e-4e65-1d1d-08d5f59a38ca X-Microsoft-Antispam: BCL:0; PCL:0; RULEID:(7020095)(4652040)(7021125)(8989117)(5600074)(711020)(4534165)(7022125)(4603075)(4627221)(201702281549075)(8990107)(7048125)(7024125)(7027125)(7028125)(7023125)(2017052603328)(7153060)(7193020); SRVR:CY1PR07MB2617; X-Microsoft-Exchange-Diagnostics: 1; CY1PR07MB2617; 3:o6cIBn0wRxRlli2qETKy4ZFu0nNGNfhuRriA3BoibILkjXodPZJPTZzZIhLE/C7wGHRm8CVjzdkaOTp/fGg1lMBt9zoH+wR1+/iyjNdrp05aLcb/OxVJ5yVM2TqTy/sOjQarjdqsFTlrbZuOnggNJO/D7vK2sPrGT8di0Bi4SF2lE+Iaed8JjEXgBBqdSQzrn2XkXCTxHVHdaBcWMdUvCXVvpXLA7sWALaAkLQ8hjtev78Y2OxLln/ZmAGAOiWhb; 25:Jekaa5Vh55Ju5uv7brguLCLF8Is4lQcquVMrXhAcjtgFLKMXhXZ/riqT/yHFw/3ZAeRnj7XXfDguzwNZQVh+GrmwO6GuhWXYlCuk31KNJiNThRn1fDohCFsogtU8uZbEvyShkFx0JaUc+CRB//S7siPpqmWnYoTQVxhia3m1iZRzm5V9/fC4jTLR0kaKRQbrcVmIlNnJ+KL/yhyYlx1dK/6gO6Y63m63ARz7Pq8fuT+JVG/qdTwGCGUk8MKPSb0VOqWQ6yGWFnH4//Qz7tUaZUOHXuN1m4Ijil8tNAfKNehL6JjJ/g0qMW+CiFUW8OrtEWIam6oNuOKj87tLxaR0zg==; 31:jZKQtxwSgoR0tMmrz2ZxvRJDBI5i3rQ8RNmuleD9V5+7ea9KhJvIpCgjAsxqn33OYODPZ+jJtFEl5mUR0I7mG23INkydDqKJY53zRLZA+Ctf1XS6ymG6jtr/hraCX+AV7us/4lDz2EZERm2RMzgMfstcD5rJkfOwLPhns/de6aW569OUOOPQOC46Jlwsk66+xZDuGwfr+4shJPh9On2uwHAQscAzerRb1EDoeaJsLuE= X-MS-TrafficTypeDiagnostic: CY1PR07MB2617: X-Microsoft-Antispam-PRVS: X-Exchange-Antispam-Report-Test: UriScan:; X-MS-Exchange-SenderADCheck: 1 X-Exchange-Antispam-Report-CFA-Test: BCL:0; PCL:0; RULEID:(6040522)(2401047)(5005006)(8121501046)(93006095)(93001095)(3231311)(944501410)(52105095)(3002001)(10201501046)(149027)(150027)(6041310)(2016111802025)(20161123560045)(20161123564045)(20161123562045)(20161123558120)(6072148)(6043046)(201708071742011)(7699016); SRVR:CY1PR07MB2617; BCL:0; PCL:0; RULEID:; SRVR:CY1PR07MB2617; X-Microsoft-Exchange-Diagnostics: 1; CY1PR07MB2617; 4:pQj+5TWsRXsiSwswWhZfFvNirf2k/hZJriuiR8R4+OJJ4NQJSCP4yMVxWZ+wRZ87Uu9dKT61jjMGOfZ4YHMYMueu9HxvYTeNaYqsclI5Rot5XToXhRiiFvCsSa+MyUqgvY5YdS3ahtlGo1iHv5AsVXt66OukFY1ZnoYAtdPs/jEPOllGm4ds0yRTwgRg5vi7XiZSOFeCe9qTqKqoOzw1dJ334qC0puNzK0mXKXueBCua66i6reg6IflhO11ju9x8D+BBs4AbdaCqgVGRKfr7EA== X-Forefront-PRVS: 0748FF9A04 X-Forefront-Antispam-Report: SFV:NSPM; SFS:(10019020)(136003)(39830400003)(366004)(346002)(376002)(396003)(199004)(189003)(3846002)(6116002)(4326008)(53936002)(51416003)(316002)(107886003)(52116002)(14444005)(26005)(486006)(81156014)(81166006)(8936002)(956004)(8676002)(16526019)(7736002)(186003)(6486002)(105586002)(476003)(305945005)(2616005)(6512007)(551984002)(25786009)(478600001)(16586007)(66066001)(68736007)(47776003)(11346002)(54906003)(2906002)(2351001)(36756003)(106356001)(1076002)(76176011)(50466002)(5660300001)(6666003)(6506007)(446003)(386003)(2361001)(48376002)(97736004)(50226002)(6916009)(575784001)(86362001); DIR:OUT; SFP:1102; SCL:1; SRVR:CY1PR07MB2617; H:Jupiter.local; FPR:; SPF:None; LANG:en; PTR:InfoNoRecords; A:1; MX:1; Received-SPF: None (protection.outlook.com: janustech.com does not designate permitted sender hosts) X-Microsoft-Exchange-Diagnostics: =?us-ascii?Q?1; CY1PR07MB2617; 23:gYZw4CSbJ59sI2dhTOxKxVA0seaZ0bOnnIT+MOmJd?= Ya7pmaTZs8OkX8SQf+KrmMa1sRBVCYzHGY9sCPm8XyQS+8gJmmfJk+shAvSJPs7311Uu5dmfLI2azSqrLmBE4qXTmpF7jnJBDvyvuuqQcRIUNPBAOI0rQj+yZxQxDBmIXMDA2Coi3/LeZXOpfMNU2nhwo9w7qYnMvi2G5s2a1VX84F0Vzl68/1zWuCWklFqUapCekZ8gyzDF8s7vD1IFzC5Q49Z1/sfleq/FNWIOaIoa6N2CoOh8QCsnciUoOOowWab92Eb6fhKfLkd5Mr2wdPpAYMtNdxoaa3TtJCvFyeyLj1gnP+WYNPF+3+25zC0mVDV5yH5ocCvW+Vw2Hgleb1j2Ccp+JdPRF5LmImL35mcJQQPzd5Z0SbOK1K0C2guz4MjnQBol6xQG5vmxRHwwx6uam5wq6d+I2RuKRejzxJ9hze8C+sUFyQoCHk5V6fwBT3CpDRRa1s8f3Mm6luVr1Jtqbl3yMk1HcqGXbjpggwvZRKss2fx4Ew2dTcTTcIykY4kBEITIMhT7V9oBYxOEqTs5+9vjQvzdfFud2T8pYewT/cgUVt62YNBKDiqmxqoMEa3WpaPCXTxJvz+URA4vjCWbVt/SyLlKM6ayTXkxxCZtaemV9SGvFe8qCQrQZ0sig5m0o16KC/m1VskA6NC+U+o3fvKFsgpc6WnaFpX/TzaO1IrE01fuY6c/fFZsp++Eeo4Qin6lc1jPq1uuKNwiNg3mIs4HMrrTbdsd8eVcHy8eYiwdo/gzzYlujdWrZgizPk6nUjm53STxOciKJvsNqdPzbJV1H5FloMorEllfmWmpzQ49+/LW/Uzi/RxMB1W8wLrNQGNd1ADgW5AdObIMuWNoNh1Jjav1/dFh13ibsj7PGHBwMMaNd8iFl6pOhKZE7KSLcoqoxhNPPDMeb/KycMmbJycL7Wh2XLvjT6LEfxlKYO4L8E1co5XZXAT97SAwLpNgIR8BAGrP/o8hBpJlY7axb1ewMwFieRcH13h1WbbSyK9aPOWs0fGRT/H1T1kmHgnFMLRpuH6h6CFdNIVac2sCTqhVSdTeonhYaAssaqN0Ryx3g0BqGiAik3jsJ1C/2IWyAIXxBJmNuq9qdmFyhOoWmvdblTjg/s+DF+y+uQBqvFATM8q8dCDcoaW6PolVFq2OMEl1/hGASovahCEW8AB7cU/G3Dqwq9CrqkXTAsFnJHU5dT04y6mDi5tgwLltA0bie/Ab5s5adeArBchseO9VWFjfPqKFcj5cjLn/F8+/McWBY3TUN3BRESwCjfWveJ59CR6AtIVjPf4DnvW7Wjb X-Microsoft-Antispam-Message-Info: sgPMFgQDOmRTr0sSfJmy2m6bYW7tQCpfgWcj7Q2+Be0qa5aemhcW5Qz8EbIu1MTaPwpBZ+aZO3Be4YQTamfaIrijHAbnssKq8WE0mGrT5nbvc6kavwKCOzl/Jy+xrLFTm6ufpn6/yLcSjHF0MKpNyQ+p0woY7Ccvxq90QR/N2AktFbA42E2HMioQxNFHkyEzds+JJnPRrDIGMleRNcGp5KCZICpzaQhq7RArmMe2Lu5QUTvIlkUG6N5X3UibDPsMUyC8OG16/g37G2jnlCJpZV+BizYhl6ItpS/OqjgUWilcPcWGDNX9487B6PUxMpHjgxBfz/WBFt/7JWSQOgn4J+AidFFBmusbdlNTTLD9Bh8= X-Microsoft-Exchange-Diagnostics: 1; CY1PR07MB2617; 6:H/dgz2EKr9hBNfeQeaItZKkbOybjtPC8CU+HbAnLvpN8aopJJ+bh3QhdKJp+TOLgvRMEbmJGMU/P4PcqftKXT6m1qf2ml3oF3cgmArRx2g9OZtEXFDv8Oj/Y8O/ouPrYEwgtnr5JFzxaH8Bw6oSD5WZRppm5Y3OHo8OziYkJ8L7nGY6F5pE1Gjh4uauSwbmE2/0KII5DQgvmHl11C049kC1K5zFRtFcszmMjypkeiJBU5yZ7uBJ4bQZhgnYe56tKVlYll8MoOt82toT9gJGMzSsxlq/SZPl/NfGr5Z/o+lM0wuzw4LzIaWwt30+6cvU94O714aftCoiixnL+HDDG0uieo63bFqaye6EdN0R7wMzvI1+NmwxsiBrx7HwTom6kXNe6plWX5eJKL/eDuVH16W69p0Qr/Plp6DdaOQ/vTqv8fqAfUW3FclQVYW8R+incNBKZeq1cugeuXMGV6lgoPg==; 5:U5244kYY9QRz+c+aWFb/n1HVqDSB7DxeMPx0xS+MOnLrR5XjxoutYXesodS7LMU17SaaP3UOKl1CrYIl9+/AqoaszUfaOrp6+ID6Wv9W2fNvr67QCDIyFqOu7n31dniQ9ULvU7ZW1G9l+ICCyugiXoSGvd3i61uN+CHD5hZ/ttI=; 7:beYba3SyFK0Mcu5oO+LTAp9yrUV5lIijsn7CmpaAG2ohBBXcvlLrLmzydnWmPEQTUUFBPqradgO/gNpe+ANpZMwN1cbJNf9eskuFHSvhUqfn8YFEE4p6g/JcN0DUa4/Bzemc9S1YCP7Tv9vFCD5wNlQgVvQP+ls0ahY2stamptSVX6k1SXISQ0K9Tl0S/HyZMPriS0twKgXVYMEg2jrJsQQWT+qsdFbeLA71f7CyvNPAl4aTvW4jCErVB64aefEn SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-OriginatorOrg: janustech.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 29 Jul 2018 21:28:24.9336 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 902fb62a-e26e-4e65-1d1d-08d5f59a38ca X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 34eb020e-3cf3-43a1-afeb-f5cf1310628e X-MS-Exchange-Transport-CrossTenantHeadersStamped: CY1PR07MB2617 X-detected-operating-system: by eggs.gnu.org: Windows 7 or 8 [fuzzy] X-Received-From: 104.47.36.111 Subject: [Qemu-devel] [PATCH 3/6 for-3.0] qcow2: Options' documentation fixes 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: Kevin Wolf , Leonid Bloch , qemu-block@nongnu.org, Max Reitz Errors-To: qemu-devel-bounces+patchwork-qemu-devel=patchwork.kernel.org@nongnu.org Sender: "Qemu-devel" X-Virus-Scanned: ClamAV using ClamSMTP Signed-off-by: Leonid Bloch --- docs/qcow2-cache.txt | 9 ++++++--- qapi/block-core.json | 6 +++--- qemu-options.hx | 15 +++++++++------ 3 files changed, 18 insertions(+), 12 deletions(-) diff --git a/docs/qcow2-cache.txt b/docs/qcow2-cache.txt index 8a09a5cc5f..fd9a6911cc 100644 --- a/docs/qcow2-cache.txt +++ b/docs/qcow2-cache.txt @@ -112,9 +112,9 @@ command-line, or the 'blockdev-add' QMP command. There are three options available, and all of them take bytes: -"l2-cache-size": maximum size of the L2 table cache -"refcount-cache-size": maximum size of the refcount block cache -"cache-size": maximum size of both caches combined +"l2-cache-size": maximal size of the L2 table cache +"refcount-cache-size": maximal size of the refcount block cache +"cache-size": maximal size of both caches combined There are a few things that need to be taken into account: @@ -130,6 +130,9 @@ There are a few things that need to be taken into account: memory as possible to the L2 cache before increasing the refcount cache size. + - At most two of "l2-cache-size", "refcount-cache-size", and "cache-size" + can be set simultaneously. + Unlike L2 tables, refcount blocks are not used during normal I/O but only during allocations and internal snapshots. In most cases they are accessed sequentially (even during random guest I/O) so increasing the diff --git a/qapi/block-core.json b/qapi/block-core.json index d40d5ecc3b..22f85687df 100644 --- a/qapi/block-core.json +++ b/qapi/block-core.json @@ -2808,10 +2808,10 @@ # @overlap-check: which overlap checks to perform for writes # to the image, defaults to 'cached' (since 2.2) # -# @cache-size: the maximum total size of the L2 table and +# @cache-size: the maximal total size of the L2 table and # refcount block caches in bytes (since 2.2) # -# @l2-cache-size: the maximum size of the L2 table cache in +# @l2-cache-size: the maximal size of the L2 table cache in # bytes (since 2.2) # # @l2-cache-entry-size: the size of each entry in the L2 cache in @@ -2819,7 +2819,7 @@ # and the cluster size. The default value is # the cluster size (since 2.12) # -# @refcount-cache-size: the maximum size of the refcount block cache +# @refcount-cache-size: the maximal size of the refcount block cache # in bytes (since 2.2) # # @cache-clean-interval: clean unused entries in the L2 and refcount diff --git a/qemu-options.hx b/qemu-options.hx index b1bf0f485f..18f3f87da5 100644 --- a/qemu-options.hx +++ b/qemu-options.hx @@ -751,16 +751,19 @@ Whether to enable the lazy refcounts feature (on/off; default is taken from the image file) @item cache-size -The maximum total size of the L2 table and refcount block caches in bytes -(default: 1048576 bytes or 8 clusters, whichever is larger) +The maximal total size of the L2 table and refcount block caches in bytes +(default: the sum of l2-cache-size and refcount-cache-size) @item l2-cache-size -The maximum size of the L2 table cache in bytes -(default: 4/5 of the total cache size) +The maximal size of the L2 table cache in bytes +(default: if cache-size is not defined - 1048576 bytes or 8 clusters, whichever +is larger; otherwise, as large as possible or needed within the cache-size, +while permitting the requested or the minimal refcount cache size) @item refcount-cache-size -The maximum size of the refcount block cache in bytes -(default: 1/5 of the total cache size) +The maximal size of the refcount block cache in bytes +(default: 4 times the cluster size; or if cache-size is specified, the part of +it which is not used for the L2 cache) @item cache-clean-interval Clean unused entries in the L2 and refcount caches. The interval is in seconds. From patchwork Sun Jul 29 21:27:42 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Leonid Bloch X-Patchwork-Id: 10548311 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id E74B9A753 for ; Sun, 29 Jul 2018 21:30:37 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id D8C7B29B2B for ; Sun, 29 Jul 2018 21:30:37 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id CD0F029B2E; Sun, 29 Jul 2018 21:30:37 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-7.8 required=2.0 tests=BAD_ENC_HEADER,BAYES_00, DKIM_SIGNED,MAILING_LIST_MULTI,RCVD_IN_DNSWL_HI,T_DKIM_INVALID autolearn=ham version=3.3.1 Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id 6D65429B2B for ; Sun, 29 Jul 2018 21:30:37 +0000 (UTC) Received: from localhost ([::1]:49680 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fjtGu-00048V-KQ for patchwork-qemu-devel@patchwork.kernel.org; Sun, 29 Jul 2018 17:30:36 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:33886) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fjtF2-00020W-8I for qemu-devel@nongnu.org; Sun, 29 Jul 2018 17:28:41 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1fjtF0-0000X4-3e for qemu-devel@nongnu.org; Sun, 29 Jul 2018 17:28:40 -0400 Received: from mail-sn1nam02on0111.outbound.protection.outlook.com ([104.47.36.111]:45370 helo=NAM02-SN1-obe.outbound.protection.outlook.com) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1fjtEz-0000W0-TR; Sun, 29 Jul 2018 17:28:38 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=janustech.onmicrosoft.com; s=selector1-janustech-com; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=G40jNYxi9+sGFAsCqKiWhRaLrAp7hxMA8gj9EZ3ZRw0=; b=Uj/mfrwRRYmHEOSsaZkTXq/v8nWfVHasbX7ntbX4ZkD/qBTsN9Ih9pikaUKFzNq6KtCisFiGA0xFwfy1sX1y/D9h4s8OCocqN19zVlsWRMZA5B1oJl5J4xUZBy1LkrhMK9W4ngHqT12MfUXcJMbcodxpRcALELj56dIJAR7NdO0= Authentication-Results: spf=none (sender IP is ) smtp.mailfrom=lbloch@janustech.com; Received: from Jupiter.local (141.226.29.227) by CY1PR07MB2617.namprd07.prod.outlook.com (2a01:111:e400:c637::15) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.995.19; Sun, 29 Jul 2018 21:28:27 +0000 From: Leonid Bloch To: qemu-devel@nongnu.org Date: Mon, 30 Jul 2018 00:27:42 +0300 Message-Id: <20180729212744.23709-5-lbloch@janustech.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20180729212744.23709-1-lbloch@janustech.com> References: <20180729212744.23709-1-lbloch@janustech.com> MIME-Version: 1.0 X-Originating-IP: [141.226.29.227] X-ClientProxiedBy: HE1PR06CA0138.eurprd06.prod.outlook.com (2603:10a6:7:16::25) To CY1PR07MB2617.namprd07.prod.outlook.com (2a01:111:e400:c637::15) X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: bd3bd270-cb32-4c98-33fd-08d5f59a3a5a X-Microsoft-Antispam: BCL:0; PCL:0; RULEID:(7020095)(4652040)(7021125)(8989117)(5600074)(711020)(4534165)(7022125)(4603075)(4627221)(201702281549075)(8990107)(7048125)(7024125)(7027125)(7028125)(7023125)(2017052603328)(7153060)(7193020); SRVR:CY1PR07MB2617; X-Microsoft-Exchange-Diagnostics: 1; CY1PR07MB2617; 3:Hl0Nz0IcTlVjuQn2tYNeFDx3GQ7ZrEKFl8G8kv8mehIVUprin+WPhrqjwS9gtO83MiN7LxKkNN1LEqljI1ZRyN8DjoxNhY0WmmyqnZfROfbIdoumuvngaYAJm4cxCuOm+Gig7C7Gz4PjeMyeasJWaBkV9508enMXmtLwNTbQyzqKjiMydQNQau2H6O0fQIVZmOyUAEpLL4/QmWS5ufDqs93gvkjHYKgActMi7SxHE7qgGUp11TzyOLRjLeFIuc79; 25:muQOsPS11qKn4kYZtxv861MjISYtUSxALI2IKopY7/n6GRXUC8aiXde+GbwqG49MFErOdrFs3NfRTtcpYcVuix6KMN59zEDPJVhNNGWtX0n69ww0cusjRUE6tDXrsWCQyoqRc2m89XO/2WIy+vWC4M38ZNyUBmXCwPxfM4oRyoKAGKKsEivMQAUHTbT5AyJTbKx2bvT9e1oEcJxQrAXgnFelaxIbf3EDUZ+4xc3d9Rc2zZDdh5xpc3wUcP9mtQ71UAhTbLAwzITPVf1rTqHbCDmVcwDjJpu5otIZUmkVJ+gNuYRSslmmJVNah4C4qtPa9Wr8DXrwqO7SiuqgemZwWg==; 31:JcEphXX8Mpp9XOHqJkgEEqpS/Ctw2EGY7O6yE5YAQMYP93nlS+6gzsQuPAazd+hK29ZR9L8vsilDjeZeaC2XDv7qpoaep1Y74vN6jCeoPJNkOeRPtai4B25cZ5tWIQCWdah2a98H4fyfmE9S8ZjKIeu9mte1AiaYeMWBTLz6tgzyJ/w6A91C1OD7Riz3UE5b+4qS9zu0xNZdmqklChLL26xCk1kIldyzea3ltwCisn8= X-MS-TrafficTypeDiagnostic: CY1PR07MB2617: X-Microsoft-Antispam-PRVS: X-Exchange-Antispam-Report-Test: UriScan:; X-MS-Exchange-SenderADCheck: 1 X-Exchange-Antispam-Report-CFA-Test: BCL:0; PCL:0; RULEID:(6040522)(2401047)(5005006)(8121501046)(93006095)(93001095)(3231311)(944501410)(52105095)(3002001)(10201501046)(149027)(150027)(6041310)(2016111802025)(20161123560045)(20161123564045)(20161123562045)(20161123558120)(6072148)(6043046)(201708071742011)(7699016); SRVR:CY1PR07MB2617; BCL:0; PCL:0; RULEID:; SRVR:CY1PR07MB2617; X-Microsoft-Exchange-Diagnostics: 1; CY1PR07MB2617; 4:eGQE6xbs1QV1n8kpWm5E+3WhkHXgAeUwBQ0+srr/AVVBE+wR84X/0/A2SiI+d4CoAKceetcV5z1Re7JSJsjv4znqb8zjeI8UnCPQiJzjtm6GPt2o6xM0REbHmdjfKiKHQbR6BmXjtv0ZBhazw9dl7kmVMkBdcw5enOzHQkzbWp0dRq9uN28LMweRkcYP3xjS+cnGsnMLU6m8ekrB/yYQkNZCk1COYufmhy3vsxRc8jMXPesxtCRnQ7XvhWCPE3pMPmTmRbr/3qYG64wZO05KAA== X-Forefront-PRVS: 0748FF9A04 X-Forefront-Antispam-Report: SFV:NSPM; SFS:(10019020)(136003)(39830400003)(366004)(346002)(376002)(396003)(199004)(189003)(3846002)(6116002)(4326008)(53936002)(51416003)(316002)(107886003)(52116002)(26005)(486006)(81156014)(81166006)(8936002)(956004)(8676002)(16526019)(7736002)(186003)(6486002)(105586002)(476003)(305945005)(2616005)(6512007)(25786009)(478600001)(16586007)(66066001)(68736007)(47776003)(11346002)(54906003)(2906002)(2351001)(36756003)(15650500001)(106356001)(1076002)(76176011)(50466002)(5660300001)(6666003)(6506007)(446003)(386003)(2361001)(48376002)(97736004)(50226002)(6916009)(86362001); DIR:OUT; SFP:1102; SCL:1; SRVR:CY1PR07MB2617; H:Jupiter.local; FPR:; SPF:None; LANG:en; PTR:InfoNoRecords; A:1; MX:1; Received-SPF: None (protection.outlook.com: janustech.com does not designate permitted sender hosts) X-Microsoft-Exchange-Diagnostics: =?us-ascii?Q?1; CY1PR07MB2617; 23:iVnVkb9XVeBtfKxF9vCWrDQs/eFuMxy7bdalDGkpc?= Dj2gfI4kmpbAZdSDxK31IGjpAPflxLHsHQdxiBxWqxshYFof+1KO3h0DBKDXU/66P27404lY18wptdIYkshW6J0xsr/V/2ZyxhUjgnusTxcgeSXOn4dN0NjLFoqq5iOCw8QFmi2V3mMoA6i3BJkzf/qOxrInvZm5UPIXPIz0ReT43YTRLaIcNq/EDYmELGB55h5yygzi3nsIHVqwdqfx0HtJJTUtNR4Cfl/bWKA/WVmAHwmfVbFYG+sCxZZY9w0mwUHe9qVK9DS96FeQaD8dBWoaDCQRUMEAmsU4Im8zehYg4B1i46LHT/nP3WLrEChbsPcBRt85Hx4kFsASLSjroDY2mV1W5++lGpS+9JKfMCIIq5bHPyfK3IV9TcN/IKxjEYTVhLiZq9ty1E+fL5gAiV3MTdzO19QdNXLva2CnBFxhaP/AV/jaeVjlQDLfDOx3iCzfzfqwipHxjjvouePrDAL3K2idCqoODZwAADGmYGlyqSCO5ejcMRcbCxybTtdh69Am4j/F+Srwlbq7xh36TOHuS4enX8UGjFW5sKcWvIdMxSvTS8K5NowUfmAtDBAu3/krvjUxuaqUspdpH/rlJCEeIFKwHTYKt4avLrUppXfckv1P2gPAmqp+ADo9YuHVT1yYElAwKLEHDjRaQv7OTEipPVTMNz28X7AW6QZ1kYRsPM8u+yzJtA9+w5GYWdpLvNOMR77BRDbENsP5gPijSxzYebttVYu3WcodzlmIu90mcSCLqD6wPJlyXaenZdj812r7VdMe1GGwIXCiT2flnjdR2qqXK8Cdf3oKPJrC+QgCHzd1+vNKkKNBZBCuYHW3O4C7Siav5F357L273jgJAaJ3YXt06bfWc3BE+hnT0JOYxoChKK/Umf+pEbhA21Xs0z1uB9NwjEQ/oOtkrL9fT7HHGJgSzwfcSuvTS3BZ+wWeDUgx9CmR0DGm/bS82NZT3i1W+/2WbZd50hQKRehGC69vOfeImPWBwZTccfEwq3rS6+W5dMRscaGQyOQf7AHv5snX4hbEXWUs/SuLFHgpomFrWcol8ocP2k8Z5wNoUa1iLndZzi3gZTQxP8Z6GA0vZxdc5U4X+hrqJXJrV5wsZdupuIFNGPQNjYb/1f2wQxMnKourtH4YcXGbs6ItK3axIfqb5K8PWSdcIN3GdRCjp6W8Nm1JthNtZ9wDQNX7AyTdLlx8D2EAzlOOr6LQKEuOQ9JJmpiFSsGNQ7sqtrezToOXod0fZGgebnrV70x5rHfoA== X-Microsoft-Antispam-Message-Info: IgQy1B38KVtbajxF83IqMzMDNE4trEd5IDReOWlHbyJos143I9dpN13KKQjX1CHWwr6qUcTx4B5G8CKe7BRSJL+yGzQYslUco3W4DAFKpFKk2+Mt9nwMOGzl70XeCLOW9g4wHGv6GA1axb0OQJlMAojGHF0+9akclE81Z4R4EImG//R7d01L//+a15YkKrRCkumbE7sDwqOoLql/ymANnxDDvVk2/liXacERspGIS6kbb4e+GSPUUufb30bt1vgpRPnWxtjIikBWZlCdh/OMibmHU9tJ5uGeIueXHkdByhuxsDArQQzrav+eGFk4fWD7haRRpkvq2sZmvyUP/VOQHtSBszIvCQveEnJV9Z5ggqc= X-Microsoft-Exchange-Diagnostics: 1; CY1PR07MB2617; 6:DczFIuSAdeUE5CwYxWZgLS4l2LsrDj8DzaiG4AOU7uVLPMefRULvVF5JNbkfgJ+zjwqPCIA2j1F4mmuR5GcifgCq4NkRaNv0qSNd5Hloeif20T6Yjk2TTVlI8x9GjIu23+qTJWujlhj6yttP+JjVmAbGU7UFcmFQz9bQOMAm9IBhYKr1mzZ0SG7yH4Gij71B7GrV8M5OodwcM4wjBWlxESLed0R3NqoEeDUzMBkc0hIUtJYMBaLtQ3U0tuEsxvSXLX+IFFJUPZRqJ524/kl08yyEBNnG6oCrwcGX80B3C3FzlJ1B+zRS5zorLA/PwrPttIVbA7ga/h6WuyS00lu2a7zhGusTarThXYQy/x7ufrr+eqgOm/6RbtPDzfw3BfI1jk44k6AtyuEOXFzrOqkUSqZJGlVc6v28skPXxtPeaOV9aFGNDg7sS0rgvT1jAxFBN8Iub1ReI/04RRRnqWrg8A==; 5:JZkKaIAMUsbaHhGd1NKnvmMG6MgC6HGVCaShTmFaCtf4l4ryVMqh7mlESvBWxBjs1kD3SUjAXSzpa9M/iY5iDKwyrmWr8bQzKiepX5jLD2qiYMhhTGmhGVN/8BKEo4LtgZ6BGWYHbLc44sxaJ3l5rOkDVhcvl8YeZRtUzo7P6U8=; 7:LeWu1zIMfAtrLf2YWqJVp7Uot58OcjwDTSzdOKHyD3l4yoqphIxtND12f75UL7Q2qNqEuUbxwHOpWPT1aMYuRd3zaIroEeskEnPRAuMWcu9aEYWxy6+UzCEUh6nMksBYwXD7KK2KojlfI7t0WXyXR9E2m4kHo33yQCI6NrjQd7dpV/pSsaHoFRXhrntWitei5TsAe2oRjr4vnCroazr5v0Fe9hfILpKFYdXyoMedMyabznKvkOpZKFl9DRNcZGjC SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-OriginatorOrg: janustech.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 29 Jul 2018 21:28:27.5536 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: bd3bd270-cb32-4c98-33fd-08d5f59a3a5a X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 34eb020e-3cf3-43a1-afeb-f5cf1310628e X-MS-Exchange-Transport-CrossTenantHeadersStamped: CY1PR07MB2617 X-detected-operating-system: by eggs.gnu.org: Windows 7 or 8 [fuzzy] X-Received-From: 104.47.36.111 Subject: [Qemu-devel] [PATCH 4/6] qcow2: Update total_sectors when resizing the image 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: Kevin Wolf , Leonid Bloch , qemu-block@nongnu.org, Max Reitz Errors-To: qemu-devel-bounces+patchwork-qemu-devel=patchwork.kernel.org@nongnu.org Sender: "Qemu-devel" X-Virus-Scanned: ClamAV using ClamSMTP Signed-off-by: Leonid Bloch --- block/qcow2.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/block/qcow2.c b/block/qcow2.c index ec9e6238a0..223d351e40 100644 --- a/block/qcow2.c +++ b/block/qcow2.c @@ -3646,6 +3646,8 @@ static int coroutine_fn qcow2_co_truncate(BlockDriverState *bs, int64_t offset, } } + bs->total_sectors = offset / 512; + /* write updated header.size */ offset = cpu_to_be64(offset); ret = bdrv_pwrite_sync(bs->file, offsetof(QCowHeader, size), From patchwork Sun Jul 29 21:27:43 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Leonid Bloch X-Patchwork-Id: 10548315 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 3228A14BC for ; Sun, 29 Jul 2018 21:33:27 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 24658288BC for ; Sun, 29 Jul 2018 21:33:27 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 18C7629A8E; Sun, 29 Jul 2018 21:33:27 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-7.8 required=2.0 tests=BAD_ENC_HEADER,BAYES_00, DKIM_SIGNED,MAILING_LIST_MULTI,RCVD_IN_DNSWL_HI,T_DKIM_INVALID autolearn=ham version=3.3.1 Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id 6A7DC288BC for ; Sun, 29 Jul 2018 21:33:26 +0000 (UTC) Received: from localhost ([::1]:49692 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fjtJd-000659-J0 for patchwork-qemu-devel@patchwork.kernel.org; Sun, 29 Jul 2018 17:33:25 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:33883) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fjtF2-00020J-7k for qemu-devel@nongnu.org; Sun, 29 Jul 2018 17:28:41 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1fjtF0-0000XD-D8 for qemu-devel@nongnu.org; Sun, 29 Jul 2018 17:28:40 -0400 Received: from mail-sn1nam02on0111.outbound.protection.outlook.com ([104.47.36.111]:45370 helo=NAM02-SN1-obe.outbound.protection.outlook.com) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1fjtF0-0000W0-7K; Sun, 29 Jul 2018 17:28:38 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=janustech.onmicrosoft.com; s=selector1-janustech-com; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=WRgFzJsxSh7tzuci/flKSI6BKbDynhTPfKlIQm3TPnk=; b=N27hqlXQUjvAQlDV6bLOKkRWVudgVAnqSZVW/fvTkgdco91mh3GkEJQ+4CwM3dDnlnIxxKUfRPRBtPLWI8d0ZCMJ7H3qVgYaU2QlON92x8Cmu8tTX+iGIrTrDTwpAQTIi3nMwegMCiSUcKTSzKHBUnC1iB2CCYQpY/qMz+1uU8k= Authentication-Results: spf=none (sender IP is ) smtp.mailfrom=lbloch@janustech.com; Received: from Jupiter.local (141.226.29.227) by CY1PR07MB2617.namprd07.prod.outlook.com (2a01:111:e400:c637::15) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.995.19; Sun, 29 Jul 2018 21:28:30 +0000 From: Leonid Bloch To: qemu-devel@nongnu.org Date: Mon, 30 Jul 2018 00:27:43 +0300 Message-Id: <20180729212744.23709-6-lbloch@janustech.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20180729212744.23709-1-lbloch@janustech.com> References: <20180729212744.23709-1-lbloch@janustech.com> MIME-Version: 1.0 X-Originating-IP: [141.226.29.227] X-ClientProxiedBy: HE1PR06CA0138.eurprd06.prod.outlook.com (2603:10a6:7:16::25) To CY1PR07MB2617.namprd07.prod.outlook.com (2a01:111:e400:c637::15) X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 5fd2a9ee-7514-4bde-8616-08d5f59a3bf4 X-Microsoft-Antispam: BCL:0; PCL:0; RULEID:(7020095)(4652040)(7021125)(8989117)(5600074)(711020)(4534165)(7022125)(4603075)(4627221)(201702281549075)(8990107)(7048125)(7024125)(7027125)(7028125)(7023125)(2017052603328)(7153060)(7193020); SRVR:CY1PR07MB2617; X-Microsoft-Exchange-Diagnostics: 1; CY1PR07MB2617; 3:8fjqfGZ+P4H5G85gNRvJQDqgGHDXy9Jsqbk8p+9f5QZFYPKRFqvDCfhUo0Epaj46RLRasniUB1IRrr1RsryTsO833wuzo/H6PrI7+Hkr75+rMgTGDayOwakFO7rra41Two5N5iNsk79XBCGTX+cGJxdRfZ13mQ7H1ih/LygJ5/ngef33O1f3pmhuKDtWy8bytvwebbmUqKJq4HnbWpliGXj5w7x6Tg1hUu6uYvmnMD5WSpsXJZX6+DrrM8JS1hbS; 25:qah0qqvNVV+STCbeEpvxM54NIZoUe7XmmKjgJ3m0OAidHBcirgCMJin6Q9WIJxxseofs8tMle/oPj9vBkZzj7gUlH2Y7pCpYRrGKAKVOXqJbCKyYJsk3oR3HPXNdwWCyeajCF285KjaTwNW7Uk/WP4dms4DQgiFzsoaaPwPwo+CpWTo9VBqCtaW9LQqSNoohfdPI5ohfws0GYhU+metKKqqnEqzqBuQvVQC73YvJnuHb3z6KbDiPS4CvB110i3zceq4EBE58gmxxVrExRHNWUOwE1v3fbo6ixO5uaF+UOV97JVnpOwp19cLoLCHo3Y3xppKNJL+bT9eanbyHOFo/Gw==; 31:Nx/E/zD7yPuCuJlscyqeOXOCD/XZkP5o4ZPZzKWnu9mppuAVVnaVS0NEvefSHKmW2XgEBI1rE5ZO5PMyGW6QuRe7glC+JSrkE11el3NXBBH8yW8l2JSryiNtI0/SgxhIYRpQFA6kPsUO+3qk8dtE2M8k+29NFLhgV6uylg+R4mpd+9KxuZCheFzdphQILniNs5oBy8JTKqMqhYG8g63w6uw9GIxK08oqXHnISRVmrZc= X-MS-TrafficTypeDiagnostic: CY1PR07MB2617: X-Microsoft-Antispam-PRVS: X-Exchange-Antispam-Report-Test: UriScan:; X-MS-Exchange-SenderADCheck: 1 X-Exchange-Antispam-Report-CFA-Test: BCL:0; PCL:0; RULEID:(6040522)(2401047)(5005006)(8121501046)(93006095)(93001095)(3231311)(944501410)(52105095)(3002001)(10201501046)(149027)(150027)(6041310)(2016111802025)(20161123560045)(20161123564045)(20161123562045)(20161123558120)(6072148)(6043046)(201708071742011)(7699016); SRVR:CY1PR07MB2617; BCL:0; PCL:0; RULEID:; SRVR:CY1PR07MB2617; X-Microsoft-Exchange-Diagnostics: 1; CY1PR07MB2617; 4:/oq0oRGWIpR96CK7ritQ1m/7eHZyQXXdbDod5rJtMySEG9yLwR3VTG2VlG/WG2kBNCjfCeSW+mji1Y2ZJbrjzsIrn5rqXorHpYhWNdGUjQAtAKdux3IWPTdY0F6aQ1doYLtjYuIjgZyGxBajEepV0YogVtqYGcv7rdBBJbX0RK22Nj4pS36vZkBmLpZSYel7JPC6lAJQ4rJrF0abpc/31Q/KDd/GuecWFGYJK0ga2wgu3gHDY6IwqzGXenAeViEXn8RWiET2UzZNMYEbUD34QQ== X-Forefront-PRVS: 0748FF9A04 X-Forefront-Antispam-Report: SFV:NSPM; SFS:(10019020)(136003)(39830400003)(366004)(346002)(376002)(396003)(199004)(189003)(3846002)(6116002)(4326008)(53936002)(51416003)(316002)(107886003)(52116002)(14444005)(26005)(486006)(81156014)(81166006)(8936002)(956004)(8676002)(16526019)(7736002)(186003)(6486002)(105586002)(476003)(305945005)(2616005)(6512007)(25786009)(478600001)(16586007)(66066001)(68736007)(47776003)(11346002)(54906003)(2906002)(2351001)(36756003)(106356001)(1076002)(76176011)(50466002)(5660300001)(6666003)(6506007)(446003)(386003)(2361001)(48376002)(97736004)(50226002)(6916009)(86362001); DIR:OUT; SFP:1102; SCL:1; SRVR:CY1PR07MB2617; H:Jupiter.local; FPR:; SPF:None; LANG:en; PTR:InfoNoRecords; A:1; MX:1; Received-SPF: None (protection.outlook.com: janustech.com does not designate permitted sender hosts) X-Microsoft-Exchange-Diagnostics: =?us-ascii?Q?1; CY1PR07MB2617; 23:0/7yi+5U2lHnwNWLrVVEGInaNzU5JodHqNR62mZZQ?= 3pgl8wx4DLeqDm9ry0GMzvphtRmGnBr9bRWMR/YrbOFpmR4IWAnJcX4fIwTFc9dtB2jFjtOEE23TdlydEBaW7ILRIv2/F9fp+e7p9AANLQtQIBesRHqKyBzoGMA7iiqyIRnMMxZjZxWcW0INs+A48eYPaDi2OgUCpnwlJd96IJyOtfbpZqp0o/FBLtKmss3QB8pOfyP+tGN4hFlGscJUGsm4erDizn35s7L96/SImEb0J9TPIhHl7tLIDrsi0Isb7njM9JExdSOeakLDML2oNb2KuHyv7aQqChRq42yjlkhjQwDsRlLSwuEoGT9OeSqt/Efq5knrjDyGdvYAZObL80DOma7Hi+r7iNHdHAE1GcXHqTHxIEIQ3yVDCM0n37vcIWvBh5zUYFGpeA5dt/SdEeTllOqoML9i36w/ot2QfevHSLfAKn1EaxCHmPHinKxSeTLWBfPUWCKl+8357acKhq1RtrupkOWV07sa3Cgz4+kEu2htfB3D7Iyp3XuPru6bHwmQu7pf9J5QaQdzT8o/E7YrxIT/LZg1yOgE+ZceJVEKjp9q7A2Snqb79UrS3HQcDiT8zVbuMj23K8rrrAq6QWxQsaeOZtLafqHx1xAQ84YsPx8svSg0Mpe292kisfA9FeUJ4H8Kj9L/b5XGOl9RDRfxT1alz2cdFYz6j6Ay42WGEahZLHiLCZWElWK2MhYPLPr30fcIK6ugruq1nAt8X10tTnJDgB1zQRpP0B1093auk+yKRcGWFWT0HMXj2gzLnL9Pl7/XyXAHY8vO9OlVigc1hbUN5fzi2fPHW/5iTfe3/fOEAlYvlkRx3dgnMYQ3cYMJViLk5RTAvVv1MZ0Q8PeD9B49ovBSCAy1S4n0PjPrA1QWplWDXP3jGQxmLpxt/XYzrUbIDZiHUxWgqor6WapYtaOa0+DhQEaJqQc4pJDEZAWWAWYWVinkjvLUMqWqByheoS/XkCBXylFnJWthaRt7s/Datmpx+r/51EtZM6TIoOcdommiqWqqy/PbSh5GUQ0lwV2Ckyj8E/kbArre1RcWj2eaWsX/+Z1QlmJHiPCn2SajTi+rSbMzBOYnRqAe4egip1sqqrHgPXMZ11MVrBOVClqe3+o7J72GexXwzerAgNhnI2F2ut4GJOrVFGWZOD9uj2wbLTqTzweeYi/5UMiJ/XHvN4rlg+bnp8829pSUwAyGtLRzCumb+LIrv43CqibuBZBRhZqnNYJhDxHg9KN/Jki/iZZsW810MKgt3T8xw== X-Microsoft-Antispam-Message-Info: A/fir5DV59tnkMJMq2PMKsh/DOp75/WUAAV35tx5dAUxVkGRTWS4s+ho7kJQU5qesiCijk59aRAfvB+6y510Uc6SetdO9kp52mA2J1XoPefQzdMggVF++naCCdgjcA2K0piUcX7lRCC804LQRDbd3l+FlcW2Cc6So99zLfg+x9XqMewEnTOm60+OmuULQ4ixaan5apZdIwAluvcNOjmovU4mZbBLB6BCz7DQfkf/ze9yJe7+Qnkp4PbHjFKXdrzcaKoE3lxXUWsA2+KWX7i4anj9WqQNq+4pq2q7VdfChPl26buAtQWcGl5X19xdebf5T+Zg1FAblsT7nik5w0Z3xDhjJtuvMh5nF7D+DKlrE6E= X-Microsoft-Exchange-Diagnostics: 1; CY1PR07MB2617; 6:FyAWSOpTEGRMWlkxwjNMnNtj8f0V29prC+khH8oPk4RBwQJxIQU/xmJgpV2w9563x+1s1pDw24DAJXzAnBDCc6/LMOIGSgjuIc+rvN4KgHgM0umwrWz5zQaX7SXIHCwn1FRGv9+bUAIwzD9DR/0BMUHVCOQ7xBUyy/8+b+aVPEHNooZm+acciBXnbQroapREdulVJh36OuUhsJeBZpY0no/8yhdzpTzLEeBJ1wCC0ndeYm2lYhAVELp2gPcB1WdnAnTdi7J+IB2kyYyCdH80UdcqaAl9hiP/j6pl6R83Mz3Xt3iiKz/MvmmKK55AlAqTJbVxcCAS1Ht6aCFOdZlkqwgRWJ1dOUa9oa0j1PgLhWoZRVHKvdjs4FfKtYta/T308Cmdg2RvCoJhUo+hk4ZMT6Urh3GBCCvS2LceP1kOObp/YPTxMwskYHbf95mQaIvY8rJh17txndxbNnI+asqgJg==; 5:0EYiAamaDoKJAbW0Rk5TDuR4bzmhyUzGdYJZJvafXmGISzIUtBOuTrL0jtxh9gfcELkQW6u74XboJlvLB6+IvzE/t17ZYEksDyfTsLYrRXW4QIUUhNKMjOxjBxYrs1GDhbQ9VZ7o/ZBwCLpRqHRqR+ofran2D3NXfFGvt9jNMZQ=; 7:qo1fqnnKFFleHTbBAcVkRGLGncy3QmG29Ksk4f/UiBUv9U1mEV4xowCy+0tkfh0dc8/mk1o4nENzZ1Us42Lrau+S6SYpQFadD2r+7haF6z5Z3VNp6QZuiMeRk2kfPGlaBJtjSbkAD494aackrNQDF7eh7kr6uvuNtmWlpHZJ5jmTTfKrszfeT3t4uzP4k0aYoBnP0e2OWQySOPiMlsbjWVVPob/bBmJ6S7D5qvDSYH0JAzZKTvOoDrwL0xI3bge8 SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-OriginatorOrg: janustech.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 29 Jul 2018 21:28:30.2437 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 5fd2a9ee-7514-4bde-8616-08d5f59a3bf4 X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 34eb020e-3cf3-43a1-afeb-f5cf1310628e X-MS-Exchange-Transport-CrossTenantHeadersStamped: CY1PR07MB2617 X-detected-operating-system: by eggs.gnu.org: Windows 7 or 8 [fuzzy] X-Received-From: 104.47.36.111 Subject: [Qemu-devel] [PATCH 5/6] qcow2: Make the default L2 cache sufficient to cover the entire image 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: Kevin Wolf , Leonid Bloch , qemu-block@nongnu.org, Max Reitz Errors-To: qemu-devel-bounces+patchwork-qemu-devel=patchwork.kernel.org@nongnu.org Sender: "Qemu-devel" X-Virus-Scanned: ClamAV using ClamSMTP Sufficient L2 cache can noticeably improve the performance when using large images with frequent I/O. The memory overhead is not significant, as the cache size is only 1 MB for each 8 GB of virtual image size (with the default cluster size of 64 KB). On systems with limited memory, one can limit the cache size by the l2-cache-size and cache-size options. Signed-off-by: Leonid Bloch --- block/qcow2.c | 10 ++++------ block/qcow2.h | 4 ---- docs/qcow2-cache.txt | 21 +++++++++++---------- qemu-options.hx | 6 +++--- 4 files changed, 18 insertions(+), 23 deletions(-) diff --git a/block/qcow2.c b/block/qcow2.c index 223d351e40..74f2cb10a4 100644 --- a/block/qcow2.c +++ b/block/qcow2.c @@ -793,6 +793,9 @@ static void read_cache_sizes(BlockDriverState *bs, QemuOpts *opts, *l2_cache_entry_size = qemu_opt_get_size( opts, QCOW2_OPT_L2_CACHE_ENTRY_SIZE, s->cluster_size); + uint64_t virtual_disk_size = bs->total_sectors * BDRV_SECTOR_SIZE; + uint64_t max_l2_cache = virtual_disk_size / (s->cluster_size / 8); + if (combined_cache_size_set) { if (l2_cache_size_set && refcount_cache_size_set) { error_setg(errp, QCOW2_OPT_CACHE_SIZE ", " QCOW2_OPT_L2_CACHE_SIZE @@ -814,9 +817,6 @@ static void read_cache_sizes(BlockDriverState *bs, QemuOpts *opts, } else if (refcount_cache_size_set) { *l2_cache_size = combined_cache_size - *refcount_cache_size; } else { - uint64_t virtual_disk_size = bs->total_sectors * BDRV_SECTOR_SIZE; - uint64_t max_l2_cache = virtual_disk_size / (s->cluster_size / 8); - /* Assign as much memory as possible to the L2 cache, and * use the remainder for the refcount cache */ if (combined_cache_size >= max_l2_cache + min_refcount_cache) { @@ -830,9 +830,7 @@ static void read_cache_sizes(BlockDriverState *bs, QemuOpts *opts, } } else { if (!l2_cache_size_set) { - *l2_cache_size = MAX(DEFAULT_L2_CACHE_BYTE_SIZE, - (uint64_t)DEFAULT_L2_CACHE_CLUSTERS - * s->cluster_size); + *l2_cache_size = max_l2_cache; } if (!refcount_cache_size_set) { *refcount_cache_size = min_refcount_cache; diff --git a/block/qcow2.h b/block/qcow2.h index 81b844e936..1b9005e13c 100644 --- a/block/qcow2.h +++ b/block/qcow2.h @@ -73,10 +73,6 @@ /* Must be at least 4 to cover all cases of refcount table growth */ #define MIN_REFCOUNT_CACHE_SIZE 4 /* clusters */ -/* Whichever is more */ -#define DEFAULT_L2_CACHE_CLUSTERS 8 /* clusters */ -#define DEFAULT_L2_CACHE_BYTE_SIZE 1048576 /* bytes */ - #define DEFAULT_CLUSTER_SIZE 65536 diff --git a/docs/qcow2-cache.txt b/docs/qcow2-cache.txt index fd9a6911cc..bcc03c8857 100644 --- a/docs/qcow2-cache.txt +++ b/docs/qcow2-cache.txt @@ -97,12 +97,14 @@ need: l2_cache_size = disk_size_GB * 131072 refcount_cache_size = disk_size_GB * 32768 -QEMU has a default L2 cache of 1MB (1048576 bytes) and a refcount -cache of 256KB (262144 bytes), so using the formulas we've just seen -we have +QEMU will use a default L2 cache sufficient to cover the entire virtual +size of an image, which with the default cluster size will result in 1MB +of cache for every 8GB of virtual image size: - 1048576 / 131072 = 8 GB of virtual disk covered by that cache - 262144 / 32768 = 8 GB + 65536 / 8 = 8192 = 8 GB / 1 MB + +A default refcount cache is 4 times the cluster size, which defaults to +256KB (262144 bytes). How to configure the cache sizes @@ -121,8 +123,8 @@ There are a few things that need to be taken into account: - Both caches must have a size that is a multiple of the cluster size (or the cache entry size: see "Using smaller cache sizes" below). - - The default L2 cache size is 8 clusters or 1MB (whichever is more), - and the minimum is 2 clusters (or 2 cache entries, see below). + - The default L2 cache size is enough to cover the entire virtual size of + an image, and the minimum is 2 clusters (or 2 cache entries, see below). - The default (and minimum) refcount cache size is 4 clusters. @@ -180,9 +182,8 @@ Some things to take into account: always uses the cluster size as the entry size. - If the L2 cache is big enough to hold all of the image's L2 tables - (as explained in the "Choosing the right cache sizes" section - earlier in this document) then none of this is necessary and you - can omit the "l2-cache-entry-size" parameter altogether. + (the default behavior) then none of this is necessary and you can + omit the "l2-cache-entry-size" parameter altogether. Reducing the memory usage diff --git a/qemu-options.hx b/qemu-options.hx index 18f3f87da5..c9e7764c13 100644 --- a/qemu-options.hx +++ b/qemu-options.hx @@ -756,9 +756,9 @@ The maximal total size of the L2 table and refcount block caches in bytes @item l2-cache-size The maximal size of the L2 table cache in bytes -(default: if cache-size is not defined - 1048576 bytes or 8 clusters, whichever -is larger; otherwise, as large as possible or needed within the cache-size, -while permitting the requested or the minimal refcount cache size) +(default: if cache-size is not defined - enough to cover the entire image; +otherwise, as large as possible or needed within the cache-size, while +permitting the requested or the minimal refcount cache size) @item refcount-cache-size The maximal size of the refcount block cache in bytes From patchwork Sun Jul 29 21:27:44 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Leonid Bloch X-Patchwork-Id: 10548313 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 44E5C14BC for ; Sun, 29 Jul 2018 21:32:36 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 2DE3729B2B for ; Sun, 29 Jul 2018 21:32:36 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 21F1F29B2E; Sun, 29 Jul 2018 21:32:36 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-7.8 required=2.0 tests=BAD_ENC_HEADER,BAYES_00, DKIM_SIGNED,MAILING_LIST_MULTI,RCVD_IN_DNSWL_HI,T_DKIM_INVALID autolearn=ham version=3.3.1 Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id A550129B2B for ; Sun, 29 Jul 2018 21:32:35 +0000 (UTC) Received: from localhost ([::1]:49689 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fjtIo-0005Vx-Qi for patchwork-qemu-devel@patchwork.kernel.org; Sun, 29 Jul 2018 17:32:34 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:33887) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fjtF2-00020X-8Q for qemu-devel@nongnu.org; Sun, 29 Jul 2018 17:28:41 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1fjtF0-0000XP-N7 for qemu-devel@nongnu.org; Sun, 29 Jul 2018 17:28:40 -0400 Received: from mail-sn1nam02on0111.outbound.protection.outlook.com ([104.47.36.111]:45370 helo=NAM02-SN1-obe.outbound.protection.outlook.com) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1fjtF0-0000W0-Hp; Sun, 29 Jul 2018 17:28:38 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=janustech.onmicrosoft.com; s=selector1-janustech-com; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=31wvFH62IhtI0PSL7UFNhkLOyXMcI1lmzAxQSKnoAFI=; b=IIKF+LfrNeDXIr4SyibQrC9GqbKtoMiGFIxLpwMrrICU8hLsWWqoI0kn5U8SFTcu+I10fUYQEAj5E4jQh/GQWOJVyXpe+lC1gVh2RkOL591soWqeekxO750Honal1yf2bU9cLMjUoxFEw95/aTbLYvJEmb1jM1IZVkcX9cMV/GM= Authentication-Results: spf=none (sender IP is ) smtp.mailfrom=lbloch@janustech.com; Received: from Jupiter.local (141.226.29.227) by CY1PR07MB2617.namprd07.prod.outlook.com (2a01:111:e400:c637::15) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.995.19; Sun, 29 Jul 2018 21:28:32 +0000 From: Leonid Bloch To: qemu-devel@nongnu.org Date: Mon, 30 Jul 2018 00:27:44 +0300 Message-Id: <20180729212744.23709-7-lbloch@janustech.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20180729212744.23709-1-lbloch@janustech.com> References: <20180729212744.23709-1-lbloch@janustech.com> MIME-Version: 1.0 X-Originating-IP: [141.226.29.227] X-ClientProxiedBy: HE1PR06CA0138.eurprd06.prod.outlook.com (2603:10a6:7:16::25) To CY1PR07MB2617.namprd07.prod.outlook.com (2a01:111:e400:c637::15) X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: f96cf20b-da58-4183-dfc7-08d5f59a3d8a X-Microsoft-Antispam: BCL:0; PCL:0; RULEID:(7020095)(4652040)(7021125)(8989117)(5600074)(711020)(4534165)(7022125)(4603075)(4627221)(201702281549075)(8990107)(7048125)(7024125)(7027125)(7028125)(7023125)(2017052603328)(7153060)(7193020); SRVR:CY1PR07MB2617; X-Microsoft-Exchange-Diagnostics: 1; CY1PR07MB2617; 3:MvD4+9QLvNOTMbqATFQKcNVfjIpis3CdzjT9yIW6AcWi/L9qOdM/JEdlj2UoGmX0K79IgtI5tyq7KwvwoKgXU6FzbbF6kF8UheKWvrevruDZgJ4tulmMNBd5G0WZp7Elet8GTjUn/UgPE1RDWDCCYlOVDQ/WBH2rxYRdW/JpxLMccTXgBXZl51+3wHStkTHNzI6K+7zcje5ZYcMok/U6rrYUZ3YzSyIAI7XQFI2EhAqwPTBclrmOyR5X6oxr0az3; 25:GDN3/xUp3MKi2N/tKIN9ywH0XIaHAlTibr+Gb1zrZ9d/RMGAVG7sSQWBnknEhIz6K376UmwH70Byx/wmJv1NNO7xEIvQY+76YTmAERDZRV66LARQoJgJbwJOYR+g2DEwoLy+TH8E2ThfUZS361jlrxIObzPAoedlaj3VWTgCOExsMgNHi5xnk6yR9ULzQ7gtx6O4ZwZPCw+3l5KQ1ss3dB5Oaip9Wm97UvjeAPs4LFocg3RIX90pv5HjbarGxa9hgBlli5usmCtpBPiYGA0nQRGV8x92MdbM4xDj6FavgKTCB6Sp0TQvkkJ/JDxuauuHRctHTw02avBTYtU8d4Nihg==; 31:/4IBSLunAjfD+d7729ay3jsAB0pWC+7j0ep19H/N+iBmqdoftPvFfb0RcRPbqYxLhhqdnSrFXJoE/LTNdyQup19A5Jox29mrh3ouKZ5VHVM4djTdHSlhl66C8SnaO00gANmG6m4UeQ2SKLS9J10hIwBEGncDKfFA29wbro9j5d5B5gzJMJjZiIRgz2dNA+VEH2Q96bTSN8MkGuhkAWbtfZ99Dw30M/TYWkB29AE0JCo= X-MS-TrafficTypeDiagnostic: CY1PR07MB2617: X-Microsoft-Antispam-PRVS: X-Exchange-Antispam-Report-Test: UriScan:; X-MS-Exchange-SenderADCheck: 1 X-Exchange-Antispam-Report-CFA-Test: BCL:0; PCL:0; RULEID:(6040522)(2401047)(5005006)(8121501046)(93006095)(93001095)(3231311)(944501410)(52105095)(3002001)(10201501046)(149027)(150027)(6041310)(2016111802025)(20161123560045)(20161123564045)(20161123562045)(20161123558120)(6072148)(6043046)(201708071742011)(7699016); SRVR:CY1PR07MB2617; BCL:0; PCL:0; RULEID:; SRVR:CY1PR07MB2617; X-Microsoft-Exchange-Diagnostics: 1; CY1PR07MB2617; 4:MZsgCaLpre5UPCzb8EACHTjYYGJbOKJcLgnL0wZys+WM9by6kRlBkhXoluOS3f21nT6CcrtDVxYQZNoMyHClRO1g/dYu1PIqu283UKwetj88OcpA11Wg2tr+3I7L4izcIUqT6UUpLd7em0EvuHAiFoS707hr7zObEeaj1HkA65ubX8jicZXRO8Hc+sEO7DMJvt5sjLDYodNlYWGiX9zrrLTLspnOaF0iaFOZQcdhA8+cdKD7NieoAmIE3QkhBN5CdKvpZdgPBfC3VHYX45pQoQ== X-Forefront-PRVS: 0748FF9A04 X-Forefront-Antispam-Report: SFV:NSPM; SFS:(10019020)(136003)(39830400003)(366004)(346002)(376002)(396003)(199004)(189003)(3846002)(6116002)(4326008)(53936002)(51416003)(316002)(107886003)(52116002)(14444005)(26005)(486006)(81156014)(81166006)(8936002)(956004)(8676002)(16526019)(7736002)(186003)(6486002)(105586002)(476003)(305945005)(2616005)(6512007)(25786009)(478600001)(16586007)(66066001)(68736007)(47776003)(11346002)(54906003)(2906002)(2351001)(36756003)(106356001)(1076002)(76176011)(50466002)(5660300001)(6666003)(6506007)(446003)(386003)(2361001)(48376002)(97736004)(50226002)(6916009)(86362001); DIR:OUT; SFP:1102; SCL:1; SRVR:CY1PR07MB2617; H:Jupiter.local; FPR:; SPF:None; LANG:en; PTR:InfoNoRecords; A:1; MX:1; Received-SPF: None (protection.outlook.com: janustech.com does not designate permitted sender hosts) X-Microsoft-Exchange-Diagnostics: =?us-ascii?Q?1; CY1PR07MB2617; 23:x0qW02/iCxYWi/41z/dMpX+FKiIUHguImUFVtYR90?= w6+VjIwZkchy7/3g6IVUdHpeXgm90uZNzbox9BR9PYtaVI0NFiOJbeumFMW7VJH2MUVLQo2wJKy+YmmTskXK8rG+9wPog7cFP5Kq+9HU4OACA59SF1AO2TJCGNEfvLkQFWjP23mAPNr1c549FEDmBwqpi/5slfvdPN6kaMp8Z+v6xsoZ+0Jqc8mbPHvqc1Nt+Q5g6pWa329FtWLRNobz/K49uXVVxT1RI4LfGcIoXbf05wq7856OLy00KoeD4ZAmBROlO19sJqmu6eBKqPQqo8BBGHPExJbqu7FLY0HJRz5bhG9CWBihbJWuP0YK8xicBTA/98CfsH3HUtG9Kee2/3GESpWS7zuAgaawakMvIYqnzbbXhZb+7HPqeZSijB6pTLT1KC6z8gOF9CY6YEyIJ4LUDaNa1f7k6/sgoxVu3H1rYjjK8JKRuz8Ltp2pCZE2bXLScorPcvvl+iJFXQzh6CjHKGELZUc1x9D9b7FwZyzI5wBaoeoGdtOjPZx/mWpAWd0FidhfPxCpMkl6C4E0PoYYNskmtrWaM1VnZ4I0NzQYOmlTShecRyb/TijkBK80HyJjJo+WpNFrMtwqUxB5SqKJLgT4H8xDPSd/nlzUZL41jWssCc2aO9ke2mF9Bh3yquyPEsqrCs/sg5MKSHpLUQ5BosQnPaYrG0Nyh4xmaviZc0mzVs/OWrhfbhp5zXEXoLL3eQ2efBGzSFv5z/y8WUrLiA/2kFtFSaaOJa/voIwGgg2DUJ+f0+6R/dtB92Wdpo/eQrqZeK+AwaAIdIJnTSxpM2rBieRQcpFeRGLU3Z7/mV6DEqWqjrQT4Z12FoV3gNzsMeNtxik7TwKku61QvuXfX1zVhJMB9kqI8q46LDkRlS81DJcuPuKmb05CIU+5q/O4K8Dx7UEekcBBuw/cjUmAr5wYePsft1h6Qf153R/zXIcfDrj6Rlemj9hkhff2mjLTsPF6mwtEr0eD/gRATeMmmebmsabzQX+D11qZlhY4HDzsS1C6Mumylncmz1SvX/3Z8OUrR/asRTMl1+B2qgr7rlrL26zzac4ww8bMHyxA1l5C4w3ultnZCMkMxkKkOajqy9pq6tRZQpK0ct7jDxMkOWPFq6tMYN5CgLdYzAY6QsEZlL5asYkhHZ2ZfHNCjzy8SfinFIEJICHt6kkC1p56m2jTrcpl8SKeh4YIudpnIL7iUEvMKEcHrLDZuHptyoovtoFtCHUz3TRvP+tpuVBPcHBifxytf1HG0jQT6Tfng== X-Microsoft-Antispam-Message-Info: uWOfZICr3tL2XAWBRHNpszkU13gO11IXIvOC7zn6gG8D+ejcb1+qEEeMgQ3A+i8HNh2kx5ZTjBtkJnfC+FqwEvxcEoddKFdjReWT2IdK+o+OasHiu/DdeD5b+8RNFjNkSWRONQnPItbndgOzqwx1n6kx5aZMg0gJCxZp7l0vwrksLExGXC4k4r4twMndn9GxoaMIx6rwmwtW95DR4CMVRvfFe5AVXPPtAz2b5EWFidsZU5L3ErDgKmx5VopA+5Rd83YN6B5vYpYKQxm9FoAGu9wEocrbziaWNPKxBG7Ssqz9YYCEIw+JhLUfBV9ebQ+ItdfqRTU1lRrFq8OsRgnABhq7c/UVakeLAGIPhafsaZI= X-Microsoft-Exchange-Diagnostics: 1; CY1PR07MB2617; 6:k1YUbKRE26sjI094z8qJulyLxd/Hl2/+g33fCgn6ozl4KQLeMX9jCAHiExR3NhBr93BiFw3MChOwo1+YTTjSQ94cLZ8rOj9+Zy2BbG8GCX7ETVjaN9OhndZVyp6jaM14pNG2JvWzQr25TOjOxgZBfR9iR6NZ7BSt2a5wRbd1JZcgy3GxpVibsuYU3k9b8eglUG6ntyuMDrvNmnOKY/aIIPaQFc2CT3o6QbbhQVSP8fwItA0KmG2kf2cElIzQ8Jr+CsT2+HraDJ8M68fAScMR+x6skDJl9/gL5IiKYhmHPYlBhZbDb/f9+qb19mZipnKtobccWXKOooMUD41g/Daj1fC/4Sevk494glncDYIpwAoIl/6SHobgcYYamDOXTdnUmUOTy2f6ziQ89+y1EfEa89OW54Te29UqPQteC9G/G46gBJ9Zb2fnNrewv+enwjzM0A/cbyoA7lajC+8Riq+sBg==; 5:nsIkUw1csOhBUd3hl9JXDBJOyQy1we+KFEl8EAHTU+hdHk1u+ZPAzQf7QWC5EO+nVlYytsTF6f0YJ++XQDb3Mh9L7dzsf1jNIaKIWMcq8IEjwOl9OrZtX/8LWeZcssILaPwjWsXw09kDUbaDXDtqU+CYPA5w/l0Ek/N9TW7hmiU=; 7:zGrh/RcWq6cDdElU9dO/Sn/X2jsON/HKn9jKe1CaZMZ6X5n/FsIF5dRfrg+oI9NHS9CBAWnUr+Te8Z2h6jBea7GD0ispDeP0RjV3F5u8UatTDblCVQllUygYMaklUxIBhOA25MzGOHKqoxDDS9QM9Bx5Mo3OHH7YR/XP7DO9geH/UJwOl3sFHmI9K8aJicAIKDBUXWIHX/lXEjfdHhRxXVCx6dWdMOiBiYuxN29dxDDWi5QYwjFJJdl7dfF3pV1a SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-OriginatorOrg: janustech.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 29 Jul 2018 21:28:32.9087 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: f96cf20b-da58-4183-dfc7-08d5f59a3d8a X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 34eb020e-3cf3-43a1-afeb-f5cf1310628e X-MS-Exchange-Transport-CrossTenantHeadersStamped: CY1PR07MB2617 X-detected-operating-system: by eggs.gnu.org: Windows 7 or 8 [fuzzy] X-Received-From: 104.47.36.111 Subject: [Qemu-devel] [PATCH 6/6] qcow2: Resize the cache upon image resizing 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: Kevin Wolf , Leonid Bloch , qemu-block@nongnu.org, Max Reitz Errors-To: qemu-devel-bounces+patchwork-qemu-devel=patchwork.kernel.org@nongnu.org Sender: "Qemu-devel" X-Virus-Scanned: ClamAV using ClamSMTP The caches are now recalculated upon image resizing. This is done because the new default behavior of assigning a sufficient L2 cache to cover the entire image implies that the cache will still be sufficient after image resizing. To put a limit on the cache, the options cache-size and l2-cache-size can be used. Signed-off-by: Leonid Bloch --- block/qcow2.c | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/block/qcow2.c b/block/qcow2.c index 74f2cb10a4..06fac1bb8c 100644 --- a/block/qcow2.c +++ b/block/qcow2.c @@ -3656,6 +3656,12 @@ static int coroutine_fn qcow2_co_truncate(BlockDriverState *bs, int64_t offset, } s->l1_vm_state_index = new_l1_size; + /* Update cache sizes */ + QDict *options = qdict_clone_shallow(bs->options); + ret = qcow2_update_options(bs, options, s->flags, errp); + if (ret < 0) { + goto fail; + } ret = 0; fail: qemu_co_mutex_unlock(&s->lock);