From nobody Mon Feb 9 23:01:12 2026 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org Return-Path: Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) by mx.zohomail.com with SMTPS id 1515606198971874.0241463712076; Wed, 10 Jan 2018 09:43:18 -0800 (PST) Received: from localhost ([::1]:56232 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1eZKPG-0003d3-8H for importer@patchew.org; Wed, 10 Jan 2018 12:43:18 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:50541) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1eZKJ4-0007uG-9T for qemu-devel@nongnu.org; Wed, 10 Jan 2018 12:36:55 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1eZKJ2-0000qX-SD for qemu-devel@nongnu.org; Wed, 10 Jan 2018 12:36:54 -0500 Received: from mail-ve1eur01on0105.outbound.protection.outlook.com ([104.47.1.105]:55808 helo=EUR01-VE1-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 1eZKJ2-0000ku-HT; Wed, 10 Jan 2018 12:36:52 -0500 Received: from localhost.sw.ru (195.214.232.6) by AM5PR0801MB2066.eurprd08.prod.outlook.com (2603:10a6:203:4c::16) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384_P256) id 15.20.386.5; Wed, 10 Jan 2018 17:36:49 +0000 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=hxsD1D/ed73Rmd7eQTMLGWEA/ja4tBVnZpaRAenyfEnqZnDkmFxJdyTN7pO/1U7/VpmA8blk5fhqYdBos0BGi1oi+V/RsF55eQQFH8AbO4QI3qxQ7QhWHYNN6fz2zHGhhRv7kJ5J/er/pdfgLJ62athdo+czhfypU9DKwz7K1V0= Authentication-Results: spf=none (sender IP is ) smtp.mailfrom=klim.kireev@virtuozzo.com; From: Klim Kireev To: qemu-devel@nongnu.org Date: Wed, 10 Jan 2018 20:36:34 +0300 Message-Id: <20180110173635.28255-5-klim.kireev@virtuozzo.com> X-Mailer: git-send-email 2.14.3 In-Reply-To: <20180110173635.28255-1-klim.kireev@virtuozzo.com> References: <20180110173635.28255-1-klim.kireev@virtuozzo.com> MIME-Version: 1.0 X-Originating-IP: [195.214.232.6] X-ClientProxiedBy: DB3PR0202CA0004.eurprd02.prod.outlook.com (2603:10a6:8:1::17) To AM5PR0801MB2066.eurprd08.prod.outlook.com (2603:10a6:203:4c::16) X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 1da1049a-0312-4c18-740c-08d55850badd X-Microsoft-Antispam: UriScan:; BCL:0; PCL:0; RULEID:(4534020)(4602075)(7168020)(4627115)(201703031133081)(201702281549075)(5600026)(4604075)(2017052603307)(7153060)(7193020); SRVR:AM5PR0801MB2066; X-Microsoft-Exchange-Diagnostics: 1; AM5PR0801MB2066; 3:wVEM3+o9kUHaJrWvQerB0tRcT+M9s6gkc4dqh0vmnhuA/FLEtd0IVUEGmMJ27siq15XgVGyDvwrlnQPnQ6Tk+lY8DP4SiuavdNMURzXlblYnJWXIcyf90DIeQdBjdmLQ0y9ywH62GBa+zPHi1x6MNt3w4SgtwTGgefWNLgoWzeA4JGTwn34lzRFop+7wM/quJthrR6ASO76CRV3Ygomjv4+yD+hJlMtH019vqQGd5AeMsWXF5Mkqd3QCUXCGVThD; 25:dlhSJeCfYHtbTJBHTRz9j+OvLwv5/nu6HxUTq2DAoeFwYBG9NEH/JadsbpaPnvaMuYCqOjxSh9aTpsb+mDCxCoQU7vQVKVWBEB24qcp1yL7x+KYfep9DzIZcksD5fGjDo6AJtxjkQfrnO+EFY+nSlLJejWG9jzOfKHOeoaGPWJEtW6n7yG1WupYzgTSFsPGMJ/O2fEBwvMaOKJdQlM4updWZrWcMoIRVROlndaov9PzGvAY8nvI7gBmJyIUMGT5nanpa67E5VcqbZYx+hGOTJU0WPzdShFqMguMiV6JQF1JiNxXxXYMIbYP29VFFq9tX8WlXMII/QjM/t9E4+Bq74A==; 31:pUaB7d1rSbBUwroYDuamqhkymubVKjuvwzgotySDymw4P4aYMA//vFs5MQ1IDrz40yqqHRa6JX66FLKjipdb5aMjEt8yoBR9UJL5RyuHgC0mRE3Vjw3HcClGiiqXhLDRJNsHLlo7iF6YhS26amBC5wQw0pC6rlE7xpjdlHmC2KANNPYY7nzSfk3kGpKBju1BhV8IaCk0RRF7H05crjbRLXTH31hFpd2JdSAm8fe72L4= X-MS-TrafficTypeDiagnostic: AM5PR0801MB2066: X-Microsoft-Exchange-Diagnostics: 1; AM5PR0801MB2066; 20:piSXIjsdVuF+/52OEe6CqtplNd/A5rVnZb7EiZz0jbYbyrEz8r/l+gsTrHd0Eyzaiba9pQnbHKx8xSNCXDkkl/E+sHsHNuHTOKfwzy/fRYLXuh97BdP3rCxaNO+6PfN6tLX0QX/2k3ARQz2hZHVoK72sekd9pLV8NuaaawAReu2GVDDf0FXO7dnVeMeERQhW6IJK1TN4tp8IQiefMNL5ZPHrzCvIA4pWkwnqmLWcvAed5OHOIR8Yc5jBVkn+cumVu/mB0Q80nfRUJGhVjjVpMu0Z4MNU9M2iRiNsSTdywUYkX91wdbQXhdU61eU6ECH5Dgi9jnfqy6wThyXg+YkYOs9M82/be6/f0NAfHKFhSy9uAdloG8MjJdhOrwm29KVuRTNqNZPsB/52kcsM9ByYxFgbV5w9hmYn+C8duQtSYig=; 4:kOTKeSOU24Hp9oSvchgimoKKRbaOFF0vouMYcB6ri2t0tdZMTsfTpJsGWAi2aOyDVUXTc/CkrWYR7QBcxRasnKpMw/asSNffynDTeG06ULuVypAbdPAJmi0G+tWhKk4qJdm7ucsuOOcBMLqqHSBtx0ltntjf+yJ696OL604UkNh0i9UVU31nFfTbJIkqd/mWWTMLdNIEcpgocSpmjlboFgVwVDk53l085RdVYViKxYePZTMsFHqyr2X+e9XRYupazkHQbTY/WbX7df1BDQ8wa37lQ3ZV+6SEknaCGPHeUR8cy6ducZ+2EQF4QdUK/C/T X-Microsoft-Antispam-PRVS: X-Exchange-Antispam-Report-Test: UriScan:(788757137089); X-Exchange-Antispam-Report-CFA-Test: BCL:0; PCL:0; RULEID:(6040470)(2401047)(8121501046)(5005006)(3231023)(944501075)(3002001)(93006095)(93001095)(10201501046)(6041268)(20161123560045)(201703131423095)(201702281528075)(20161123555045)(201703061421075)(201703061406153)(20161123564045)(20161123558120)(20161123562045)(6072148)(201708071742011); SRVR:AM5PR0801MB2066; BCL:0; PCL:0; RULEID:(100000803101)(100110400095); SRVR:AM5PR0801MB2066; X-Forefront-PRVS: 0548586081 X-Forefront-Antispam-Report: SFV:NSPM; SFS:(10019020)(6069001)(366004)(39850400004)(396003)(39380400002)(376002)(346002)(189003)(199004)(6506007)(1076002)(66066001)(6512007)(6666003)(6916009)(386003)(50226002)(47776003)(3846002)(2950100002)(51416003)(6116002)(55236004)(52116002)(76176011)(478600001)(53416004)(6486002)(76506005)(16526018)(86362001)(50466002)(5660300001)(81166006)(36756003)(25786009)(48376002)(16586007)(106356001)(305945005)(53936002)(105586002)(81156014)(2361001)(2351001)(69596002)(316002)(2906002)(8936002)(7736002)(575784001)(97736004)(68736007)(4326008)(8676002); DIR:OUT; SFP:1102; SCL:1; SRVR:AM5PR0801MB2066; H:localhost.sw.ru; FPR:; SPF:None; PTR:InfoNoRecords; MX:1; A:1; LANG:en; Received-SPF: pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) client-ip=208.118.235.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: None (protection.outlook.com: virtuozzo.com does not designate permitted sender hosts) X-Microsoft-Exchange-Diagnostics: =?us-ascii?Q?1; AM5PR0801MB2066; 23:puAV63CgICMv+wp6Pm5TZabNLPca++TUARwKLcl?= =?us-ascii?Q?EWAb2KN5jP83UhHuqj5ouIBs6/ZdWOYJI6WyOHMR9vtavUcq2hqru775UCw+?= =?us-ascii?Q?LhoHthg//qAXur1vkUpIuHUIegCEVwgI3O9zt/Kr9eD810Xgf6C2HQ1fV6GY?= =?us-ascii?Q?RiVzD4hi1wvM0F+EBsmhBcUWZo0K2FrmPR1GJHrjUutQvCR81ixDmHE/ZR9i?= =?us-ascii?Q?JrYZJNQeOAQaJu+Q1Zv1eDChlnHEIpOm0o2pVe1aKt54HW0UigXUCDrmYqcA?= =?us-ascii?Q?A0FyyQQtHuSyYQWut4UcsPFCoe/GRzpuWUmeE6hF02Mdrvll89hDUcsNSXYf?= =?us-ascii?Q?j6yFvcTirXe7w1r59e4XUX/dvM9qM2oOUkWMRwKsmuVgjBUPwdaxIGDvOY6M?= =?us-ascii?Q?99dq6bbWXpK5RUkKyNWR+tQKgFOaCt8Veuq2pmz4guYrL5eqbfrGKHODBnZ3?= =?us-ascii?Q?h3vNhj/HHeqDkePixIGuMM75Gfajb7V2D5vkmfN0o6g7vKpze77JG7HbhXVh?= =?us-ascii?Q?ufvzf3ntvzVsrE3+3lJVchrRMYKCy2ueCdzT0Qmf4m3FoVgsr3cRNDEJJGxw?= =?us-ascii?Q?NZfNk5SnTpqyMy4MpFLQfDVLK3oZWvxD8HTqwVD/cSH9HOV/gl238gZckYYD?= =?us-ascii?Q?KU+btkUzPi7bEbKlxnQwTUO/gQyBD22UaMmCGek6NzD5+kMutFfJfe4crJ7s?= =?us-ascii?Q?SOvUaId726X9/YSztm1OkWQ91Qyx6UW7jozO8nFr0ZiLErr/ZNORkp4GGttV?= =?us-ascii?Q?iO+UG+tB3cFkSfgXHUz+VuQj8R0Zn8fq2G6sCLuPMzIGzD4CjjbeBpkWC2yJ?= =?us-ascii?Q?7cUyvYkFF+X70tSIrUTznTOt9JTbH7iAN8Ig/pnLsyQwb5/J70xEs/lN1H44?= =?us-ascii?Q?HnKS9Ga3ivSYfDZ1QoiRUbrsy9Y/qtNzCaEJlFGJ3HyXWv28fkKJ4VQ0H6Mu?= =?us-ascii?Q?ELI2Me/IDyLhYxsZL8rZLp0EdaMATbAvLIdsskzlzYuR3lFqaljzalnjYOqE?= =?us-ascii?Q?kQDVupyewu0lfVNsSXcMYfSLtt5AqUiFxM9Rxo4lG5xe57An9XaZ9QzxEZPS?= =?us-ascii?Q?zeDgMC5ARFWvEfG/qycLq20PkJIpzVdFuD+1P2YTuaxCNwlqTSfs7D7jnjkd?= =?us-ascii?Q?7HsH4aoTB87LNo6vOY7UkMwhHzt7pEsYhTLs6E1EQN+6TlqeWzmDgY+HsoxY?= =?us-ascii?Q?F7GhANJIoOnetdZCRr1mU1Ei/+ukUGTqeg3b256xvVJMrstu8MQvyDPrrBI9?= =?us-ascii?Q?iGdXeh7+vVttfOdhaZVU=3D?= X-Microsoft-Exchange-Diagnostics: 1; AM5PR0801MB2066; 6:zx6Em8OWDHITGPUjKt7iXi9Q4McJIb0T2f9xrHT3IoeXHvmtjI/pkBG+cTCsgkLGGUvH1uFMbtWqHZDSUUTsxhhNko4neIOrw9fwzNtff15xRgRAlHmlCKhDhTguCnAOAmMtvmszqq/56QxDxIMY0zhsceuxG+FDvBmT9g2S36SDdDAH6S36Xp6w/Sunso3vE1VaZP6kmJOCCTQIt+qX97gQzy+cmpYFfIclXWvPTgBwHH4fCrlWIAunhwrArmjfF/j2cRyeimpjv9WImPhJzM2wQNcwQ81mXthFP7czIRQ4E6jXoM2XbnanY3YCQwAPxyY5Tz5/8ysHoj3les09HVRl+apAZPWGMjZ6ENuLscY=; 5:Y2nk9cUJt9X9AN/E5fe/qaixiyXgwpRg2HxbYxoO/5f4rgu2wXZkODHHCxiMGWGKmE50q32ELucvWHrzv8edFCt6sB60kaKKlRlfWjXX2+x8unqxLeTtv0KnXYiXfbn9kvNAap0jeVOOf576xMxJkvstgeY495fh8sKf0ItCnLQ=; 24:9yFWR7/7KS0NmCCRxWXnmnp0WrgJcomZj9ivphjORcZAK3GQEr6z0gkjS5am2fIJd1Ay1Tj+DbEIRddx1fVzJ83/Pj0LcHDHSieSBWloP1c=; 7:/tVmXwrooZqkB1ZTFOuUBVydEMAUu5pZ2+BTea5zDQ+M+aPu8qIdBHAcHsaD4eu2K6l4FhLLOr75VMgpiJPTuanrq9mbI+Ym9vXFgnekOlP94gxRRXzYefPEROZdvWoOn6s9RPVy1F9hrqHorgrTQW4sxesKaNEB6hctuPm9+xnm7NytfIdKLA1aUltdEmViGkcLrDkoBALotouS1rxxEz27gGQ+DmyTYQpiSOJd8LhYKjDaJwyj4jPchBxSAF79 SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-Microsoft-Exchange-Diagnostics: 1; AM5PR0801MB2066; 20:G6fTDgJfuQhqL/fKhqcM2f1bccHZMD9NArSTTd8Q0joeGwNwFNopZgp8xpipguKMgjjdbGEL9FBcp6or0lU/XwT1BBscw9+wbk7eP40XEGqswpcctpIUwsDjKSqSx4sYvQnZZEGG2dVbB5wnqprtFXiMbU098qQ26nwoYcQSfDY= X-OriginatorOrg: virtuozzo.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 10 Jan 2018 17:36:49.1777 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 1da1049a-0312-4c18-740c-08d55850badd X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 0bc7f26d-0264-416e-a6fc-8352af79c58f X-MS-Exchange-Transport-CrossTenantHeadersStamped: AM5PR0801MB2066 X-detected-operating-system: by eggs.gnu.org: Windows 7 or 8 [fuzzy] X-Received-From: 104.47.1.105 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, qemu-block@nongnu.org, stefanha@redhat.com, mreitz@redhat.com Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) X-ZohoMail: RDKM_2 RSF_0 Z_629925259 SPT_0 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" 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, QemuO= pts *opts, Error **errp) memcpy(header.magic, HEADER_MAGIC2, sizeof(header.magic)); header.version =3D cpu_to_le32(HEADER_VERSION); /* don't care much about geometry, it is not used on image level */ - header.heads =3D cpu_to_le32(16); - header.cylinders =3D cpu_to_le32(total_size / BDRV_SECTOR_SIZE / 16 / = 32); + header.heads =3D cpu_to_le32(HEADS_NUMBER); + header.cylinders =3D cpu_to_le32(total_size / BDRV_SECTOR_SIZE + / HEADS_NUMBER / SEC_IN_CYL); header.tracks =3D cpu_to_le32(cl_size >> BDRV_SECTOR_BITS); header.bat_entries =3D cpu_to_le32(bat_entries); header.nb_sectors =3D 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" =20 +#define HEADS_NUMBER 16 +#define SEC_IN_CYL 32 #define DEFAULT_CLUSTER_SIZE 1048576 /* 1 MiB */ =20 /* always little-endian */ --=20 2.14.3