From patchwork Fri Jan 12 09:01:21 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Klim Kireev X-Patchwork-Id: 859673 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (mailfrom) smtp.mailfrom=nongnu.org (client-ip=2001:4830:134:3::11; helo=lists.gnu.org; envelope-from=qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org; receiver=) Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (1024-bit key; unprotected) header.d=virtuozzo.com header.i=@virtuozzo.com header.b="WjsNB5+v"; dkim-atps=neutral Received: from lists.gnu.org (lists.gnu.org [IPv6:2001:4830:134:3::11]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 3zHxlG32k8z9s75 for ; Fri, 12 Jan 2018 20:09:30 +1100 (AEDT) Received: from localhost ([::1]:55223 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1eZvL6-0000ZZ-EL for incoming@patchwork.ozlabs.org; Fri, 12 Jan 2018 04:09:28 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:43201) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1eZvDd-0003Ds-TM for qemu-devel@nongnu.org; Fri, 12 Jan 2018 04:01:51 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1eZvDa-0000JB-2P for qemu-devel@nongnu.org; Fri, 12 Jan 2018 04:01:45 -0500 Received: from mail-eopbgr60112.outbound.protection.outlook.com ([40.107.6.112]:3712 helo=EUR01-DB5-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 1eZvDZ-0000F6-TL; Fri, 12 Jan 2018 04:01:42 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=virtuozzo.com; s=selector1; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version; bh=t+Z5veptw3K8+UOURs2N24oZIJ7pUWO00FvzIBI09vc=; b=WjsNB5+vyEuQbfyKOKl+dQlbW7zdGLooXACxU7bnn+wKOPFAqfexoRHb4wY1211KOYlh3a2Nlzi0SlKS5kKgXmyaz9IMO2K20bQPtJhrsL+lkmSDXgk0SXa1TUcUuAvVmv3WqtpYvgVeU50DVxJo15b3RJUJ/p7BIO6Dg9u3SHk= Received: from localhost.sw.ru (195.214.232.6) by DB6PR0801MB2070.eurprd08.prod.outlook.com (2603:10a6:4:77::11) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384_P256) id 15.20.386.5; Fri, 12 Jan 2018 09:01:39 +0000 From: Klim Kireev To: qemu-devel@nongnu.org Date: Fri, 12 Jan 2018 12:01:21 +0300 Message-Id: <20180112090122.1702-5-klim.kireev@virtuozzo.com> X-Mailer: git-send-email 2.14.3 In-Reply-To: <20180112090122.1702-1-klim.kireev@virtuozzo.com> References: <20180112090122.1702-1-klim.kireev@virtuozzo.com> MIME-Version: 1.0 X-Originating-IP: [195.214.232.6] X-ClientProxiedBy: HE1PR05CA0269.eurprd05.prod.outlook.com (2603:10a6:3:fc::21) To DB6PR0801MB2070.eurprd08.prod.outlook.com (2603:10a6:4:77::11) X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 33378e28-7d75-47af-39d3-08d5599b1820 X-Microsoft-Antispam: UriScan:; BCL:0; PCL:0; RULEID:(7020079)(4652020)(5600026)(4604075)(2017052603307)(7153060)(7193020); SRVR:DB6PR0801MB2070; X-Microsoft-Exchange-Diagnostics: 1; DB6PR0801MB2070; 3:awAtwWGak1EG8WTKsfZSeUic4ixN3epynwnri3aYU9ixXT789Ji+Mc7MlIDuR5I6ZCvOSTZQH+AfMIoa16m0xC5ZYnDT7OmaYo2eNMRpjOSEN9hZ8nCrf47JJ3TnYcn6IET3eualyT2BABa+OlrgPziGJIM8/YbujIUvVQiERzuoFRLP2XqG/M9oQm99CYj8kEVjIM9yhqGv3Wd3N+s2CKHlaX21sQJwxG2lPPODPNNBknwK8Q4gnIhcxtNYlwPT; 25:rCQHiqLM4yuOTQSUcssGtXd6eIJBAgeiyLZOpspUmeod1vz1yXxUbkpESDtrOOjxDDGbJZXmVqu5PB/V3/4TyjZcKp1NCxxHdf5SXVVZ2trypjC2HIL8TpCaXHjK6f224sN/1pfU13BbrzAkvrFfebJx+AfctRS+urc1o5VZxq8JAZOdCIPczih+BcZfkTzAOi+coWT/d/HjtPhoGuAfJi+m7OCs07OPIi+CILJ0j0sVEqrIyVAKKd4dvkHNPBhRg79SSlhonlQMk+mNfF0QRP+GlWh+fWYFHWEhzDffv0lPZ3G0BI/C9CrUbbm6gSmid79sQI3dT/XZ1K24IIT7Vg==; 31:24F2YWbk/o4phzQGPxaSO7ZWQckhzUu7C6OOUpIOvQduT1AilGReaJovs43EGZrI+apXz56Cr/1Ug+18FciLebLTPwlN/CaoJOAewsqoNgzhzBh2dvn9Q14pxoQ0uGxXNOEzbuDMe2BLX4RXMN+hyjQW9cg/ppcaM8LTZpIQrH2MNazn1RRLCpt/A6Tv9OCbd0a6luhOYO0IelMDy5HQ/zJU44L7+lIRxMdvUv3V7+8= X-MS-TrafficTypeDiagnostic: DB6PR0801MB2070: Authentication-Results: spf=none (sender IP is ) smtp.mailfrom=klim.kireev@virtuozzo.com; X-Microsoft-Exchange-Diagnostics: 1; DB6PR0801MB2070; 20:l9OBzVZB2qmY5UjgOEMFMjkEJAGiraK4MYGz2sQmH/96zxJM7rZgq+lAGh9z+9iMJ8CDxYwiY1MXefihfmTeQyu8siTr+kpH+DmYk7aM3ACf0fK7k7+tfm5Jmp4WC4IA1xWVBgksBuHVW/lov5bxS2NYz12s4EmqTxVilVOGqusd0BYvgveBujt5CKjSsHQW38S7sQBe2LEe6LiYloZ47LjPK7PX7iMlVBJEQU9MRnjFioAB1aqmTQU3J90x3o9kIHT6Z2uJDvO6JS8ahnd/NSxjQcev3y901MuiAXbJNujAd0grnQm+cQLCeiyQlB0nupe08LF6Hd4EEmYbelTjISrwOL2KWNNmhR7tfVDf3T+fsPOxDDgBguwBp5cVTZx7NU+B3Zj+jOQPIhv1uSMjj4Q0INZwDjiQL/6DWJA8gLs=; 4:UtAwNWdLGOQoZGuEm1NCffOJkGHPpUfXZBoSD1gjEx7/l/quwWy8jscz61kH+Ijtxm137NZx1+Jw2v7mcZl4sXKxHN8Um8QpxZp6zmgmqTZ/aSWx46uYAW6r/0yGhE3glJkMYSKbPkPQr8Ti+XOvOOtI9FyKyt48X0fL6pMLmwRAWALv+t2nFi+ewm5nOziNP9mwfHycjHgHG+XC/uGz1xN7RfBZoi8XseuLsU9i9bz+PeixGo1wsXasft9jqW3fkvP1ZMtItNl6VrCYfkT442sV/weZ1dPdiUErl8IofsGMohDZwt+yMucNHYGNdx3P X-Microsoft-Antispam-PRVS: X-Exchange-Antispam-Report-Test: UriScan:(788757137089); X-Exchange-Antispam-Report-CFA-Test: BCL:0; PCL:0; RULEID:(6040470)(2401047)(5005006)(8121501046)(93006095)(93001095)(3002001)(3231023)(944501141)(10201501046)(6041268)(20161123558120)(201703131423095)(201702281528075)(20161123555045)(201703061421075)(201703061406153)(20161123560045)(20161123562045)(20161123564045)(6072148)(201708071742011); SRVR:DB6PR0801MB2070; BCL:0; PCL:0; RULEID:(100000803101)(100110400095); SRVR:DB6PR0801MB2070; X-Forefront-PRVS: 0550778858 X-Forefront-Antispam-Report: SFV:NSPM; SFS:(10019020)(6069001)(366004)(376002)(396003)(39850400004)(39380400002)(346002)(199004)(189003)(1076002)(386003)(69596002)(2351001)(66066001)(7736002)(6486002)(305945005)(2361001)(76176011)(51416003)(25786009)(36756003)(2906002)(52116002)(6506007)(47776003)(4326008)(6666003)(2950100002)(97736004)(5660300001)(6916009)(16586007)(50466002)(8936002)(81166006)(16526018)(81156014)(8676002)(48376002)(50226002)(316002)(76506005)(106356001)(6512007)(575784001)(86362001)(53416004)(6116002)(53936002)(3846002)(68736007)(478600001)(105586002); DIR:OUT; SFP:1102; SCL:1; SRVR:DB6PR0801MB2070; H:localhost.sw.ru; FPR:; SPF:None; PTR:InfoNoRecords; A:1; MX:1; LANG:en; Received-SPF: None (protection.outlook.com: virtuozzo.com does not designate permitted sender hosts) X-Microsoft-Exchange-Diagnostics: =?us-ascii?Q?1; DB6PR0801MB2070; 23:fbuaCUtjmWnfoPsJ3vUCNB9mWcbQ3rViacaKplu?= MpxhLc026xbbQEULYDFex9Gy2REdEwueO4XwCapPsqPYLHSKcmXpR5Okc97L93x0B2LDe2ptvMDPl+MrQ1J9YDOpr1a3tYehGJUf+6SU8BMF9eFNYY02I2z62CQIByclbTUZ+vge08MeDTrneAyXRLERCBMNsZevc+aG+sfR2K/EgDzju+J8T6oXqI82e3lQSFH2OfAF/XMMqJQuvETn7GbUaZCi4kGmKA4folKTwvY0pZdKifGIhec4Wa7F89wL4uszumRn+mIuKprLqUC2GzdtlskBHKbtTR6NKR+zkJ4ZDDpNCVEkaTNnirhLT1RcqMI88U+RZWu4EXli5SYPZWAEOVw3nwOv3IPiQNluHrhZds1lra16YHqpDwxodiiEbKjD4ArYPdNbAhn022f2f/7QCHJmlNJUHiQ+l7zrMgPrf+O1ncD2ZEAD3OyJohlT4dBFYeKI9/pL4SBLXG8zEulWhH4TsXYcYeSmYQ6GGHCvriFYfPQeXsW4bhFY0ENkhbOct9OXRx9flPMGF5MmheKQ2Rks0n36FSKIKJgKC9hYi4XhLMODYysZKDDZ5LAG8iFZTaKcWAwml94Kuy2yVLqLXFecI9mV74pa4SA2qQyeiy6ZTXE+xrbwijYaHWLfz9n69oynvlpkBSsJ8ejC5a/aY1AchLTLSrsKL7H7kaZ241XHlGrZvPgS1WWQYTaiS6aSxDgaYNPY3FJ+I/EQ7zLpRtDUMGefczlHcsGHNYf2HMNOhc+9n0VmQPxtAQXo/pcv7QGwne0uCfCE15txzHfXX9eQwxIYJ1k03LW+ov6p7sFjNRpOZ33zIqgrIYy/rXLDdSxF2X00odhWDTZUpJ2Rlg1+Ty19cTpV/MULRUxFESuLlYtIEabSXZk7N3TSuOUBxVCBx8bHuEkLa+EOrxTqlzuen6ZbLyPXniYBFiilHN+j1UhNhEsz7n6sDVEYjAZ1mViNzuyxWTv4xK8gz2YB7LPm/0XJ7PxjeogCQXWzO6R0eOimCCY4YzBy0urlDgsapfvNrNYRouBTrlkU66ervrNMaF3fL1ySnsF+xUzbEjgXL3n4lH/Y9vMFpYt+cDdQB7ek9uyL93OY5yKt00PDt0cnBoMDvoDY3gTabGneEL7u2LKXq6GMUO4uyypHQK5fmDB9k5NW8IzMlt/EavtcKbpeiDmkoheFrGKGvREAzYw== X-Microsoft-Exchange-Diagnostics: 1; DB6PR0801MB2070; 6:zUzJ3XfXu2v7RYty7E7dLp9qnV685ruZ4lXOoXM+1+IuikAc06eRkLRHAatD57Ol6jyB51D44L27LmFpU91yK+aW+/j38cO1gHFiuTRHrAcoLZ6Xt9cMk7dDgd1t5Dj9VB8QS13FluKiwgJnhcikeFIbJEzYbsBJj6npjFLteID4jEKH1VRi6lTZfjOvW70ipQeX/F4CjQPR7vJX5EzyxnTCBwt7kvc21v0cgFt0qZLL6IqQE5PsE2ms3wC2/U851AwbqBaup17PzGC86S4tm5tVqKNZ0prjDtG0f11ZwaKXdoasbQ1199MAvOKTUGrLxExSaMFnYzsM3guUwy3uOpfeq960QByzXgS911nzG9E=; 5:N4mI+7+tN2QRcvapmVMlIFdMSQWcQ/SUVpOYmsbKugM7e1egxNZoxGMOb0osTQ7kdErysoPdT0dGTPuxgA++zwvXEECIA6eoGt+4gfYyAbatvCRnWdyubaQJk7uM7xgs/GIjKoEpyteGASmKfCChd81M3v1bYINInSRRni/q9dw=; 24:9aV6w4OowmZei+8fEl53l2yTRrbPsO5P94NfEgWZojyuAYATQw75ksurZILdXqSejwj2ld7y1CFqFw1Q8wRL6AC4XDNX1Yfpem/wzkf+n8g=; 7:koBbVDpvvG6mcEbZGoER4325JZueMRycRstp50PkSWPn6cT5245I6N4hGoAvmE/EM7z1ZkgoAJl7+WiEyW/Y7X1726XRZDBSYaXJGRZkyhIHjGGetDmm7BO++UGUoWy3qaS+mFvaSETHRt58uG8Mo/9pR7BLv7UsrrSx0mw+J+NTTNMUK1VdeDOualRA/9P/hyyddT6q6ZsIT+zZPINuSL7S99/95cEeWNwjKyiK2hyFvNlcjKLCnfWEKPPbpF29 SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-Microsoft-Exchange-Diagnostics: 1; DB6PR0801MB2070; 20:qBJ9698EaLM9zTz/vNqQENMshS/uoFkj15KYeiV/Mjp7IkbM4+zJV4sbJun+7Lmmojd2FuOzlrMs7+7SaUd1pKyxmYCEAZ8pbQ1ussBBV0FvzTJ95zSXCLueFO+jmOtP9Qrwu5rgPO67UgD8H6MJp4N7NHZko9qp2So0mSBcm6Y= X-OriginatorOrg: virtuozzo.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 12 Jan 2018 09:01:39.6267 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 33378e28-7d75-47af-39d3-08d5599b1820 X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 0bc7f26d-0264-416e-a6fc-8352af79c58f X-MS-Exchange-Transport-CrossTenantHeadersStamped: DB6PR0801MB2070 X-detected-operating-system: by eggs.gnu.org: Windows 7 or 8 [fuzzy] X-Received-From: 40.107.6.112 Subject: [Qemu-devel] [PATCH 4/5] block/parallels: replace some magic numbers 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: kwolf@redhat.com, den@openvz.org, stefanha@redhat.com, qemu-block@nongnu.org, mreitz@redhat.com Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: "Qemu-devel" Signed-off-by: Klim Kireev Reviewed-by: Vladimir Sementsov-Ogievskiy Signed-off-by: Denis V. Lunev CC: Stefan Hajnoczi --- block/parallels.c | 5 +++-- block/parallels.h | 2 ++ 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/block/parallels.c b/block/parallels.c index f9a3b999ea..7a8e8b05a9 100644 --- a/block/parallels.c +++ b/block/parallels.c @@ -476,8 +476,9 @@ static int parallels_create(const char *filename, QemuOpts *opts, Error **errp) memcpy(header.magic, HEADER_MAGIC2, sizeof(header.magic)); header.version = cpu_to_le32(HEADER_VERSION); /* don't care much about geometry, it is not used on image level */ - header.heads = cpu_to_le32(16); - header.cylinders = cpu_to_le32(total_size / BDRV_SECTOR_SIZE / 16 / 32); + header.heads = cpu_to_le32(HEADS_NUMBER); + header.cylinders = cpu_to_le32(total_size / BDRV_SECTOR_SIZE + / HEADS_NUMBER / SEC_IN_CYL); header.tracks = cpu_to_le32(cl_size >> BDRV_SECTOR_BITS); header.bat_entries = cpu_to_le32(bat_entries); header.nb_sectors = cpu_to_le64(DIV_ROUND_UP(total_size, BDRV_SECTOR_SIZE)); diff --git a/block/parallels.h b/block/parallels.h index 71183c0c8e..4b044079ef 100644 --- a/block/parallels.h +++ b/block/parallels.h @@ -34,6 +34,8 @@ #include "qemu/coroutine.h" #include "qemu/typedefs.h" +#define HEADS_NUMBER 16 +#define SEC_IN_CYL 32 #define DEFAULT_CLUSTER_SIZE 1048576 /* 1 MiB */ /* always little-endian */