From nobody Sat May 4 00:50:14 2024 Delivered-To: importer@patchew.org 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; Authentication-Results: mx.zoho.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 1490390545108721.3416009622201; Fri, 24 Mar 2017 14:22:25 -0700 (PDT) Received: from localhost ([::1]:34987 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1crWf7-0001zI-SX for importer@patchew.org; Fri, 24 Mar 2017 17:22:21 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:33267) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1crWeM-0001Yx-DN for qemu-devel@nongnu.org; Fri, 24 Mar 2017 17:21:35 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1crWeJ-0001P9-9b for qemu-devel@nongnu.org; Fri, 24 Mar 2017 17:21:34 -0400 Received: from mail-co1nam03on0099.outbound.protection.outlook.com ([104.47.40.99]:55707 helo=NAM03-CO1-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 1crWeI-0001NC-QW for qemu-devel@nongnu.org; Fri, 24 Mar 2017 17:21:31 -0400 Received: from vroomfondel.redmond.corp.microsoft.com (2001:4898:80e8:a::5cd) by CY1PR21MB0054.namprd21.prod.outlook.com (10.161.168.24) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA256_P256) id 15.1.1005.0; Fri, 24 Mar 2017 21:21:27 +0000 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=selector1; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version; bh=tTFEilU8xs7comH7RXZvKmxfgEvfFvn66yMIzZCmJLk=; b=KjVzKT2d1w6w3XNTSzCOfEjFdcCqkyZQ0ivzUlgsg7wehynEvl3Op7i0RdXId0+a3uryZucF5wAvTrxLYHO7C9rb9H+md/hglryfWBnEVWaOZKksJn0ba2obN6mGrcyECuMkP2NpP9x8fnuWThealkx6ElX9CnbeBsx46jxwDlc= Authentication-Results: nongnu.org; dkim=none (message not signed) header.d=none; nongnu.org; dmarc=none action=none header.from=microsoft.com; From: Andrew Baumann To: Date: Fri, 24 Mar 2017 14:21:15 -0700 Message-ID: <20170324212115.6772-1-Andrew.Baumann@microsoft.com> X-Mailer: git-send-email 2.8.3 MIME-Version: 1.0 X-Originating-IP: [2001:4898:80e8:a::5cd] X-ClientProxiedBy: MWHPR08CA0054.namprd08.prod.outlook.com (10.173.236.28) To CY1PR21MB0054.namprd21.prod.outlook.com (10.161.168.24) X-MS-Office365-Filtering-Correlation-Id: 19f3faee-9ea6-401a-cc9f-08d472fbbb88 X-MS-Office365-Filtering-HT: Tenant X-Microsoft-Antispam: UriScan:; BCL:0; PCL:0; RULEID:(22001)(48565401081)(201703131423014)(201703031133020); SRVR:CY1PR21MB0054; X-Microsoft-Exchange-Diagnostics: 1; CY1PR21MB0054; 3:VbtotYuYE/nQqe+STt120wKTvxJxgw+LDPZlncM6eDApBwvUYnVIvMbA1lm3C0Id2bDu17TUPlcqjlSTS7c8OSbzvRxqq6MOmUKveG86qyRclR4LVyHNken2X6E/EeH2jOmCp14dXAOHx8w3lYhRKeWqh6xeTLIMVHx3kdE20K+ELie7EQb/wRGEIQx64/rH+o9GNYX+nE6WQqVXD9i/kt4IIRIZIaUtIOaU8LZThxo6heSc08saD05xWhPFf4CFNuV1jAZGvGGKrgrOJe09frnkbqBxcu8nklVHgJwzbCXEHNdeKzXnJ5+BHwvsBoCIWzueOD/9slE3M6EqVBujETnmC59vN6Mh6fCkg3JPCkg=; 25:ry+49lErpxAKzLyga8N88bawCrcv0elmn2uQiX9kP7x0m7ACbgbd+4+csohd/338GS4VvcxYojxSOfjqd0NAHSdeLnsUMyMbxcjSeck04H3bLQwFnB+nLKUyRmPizXZ+lgT1Rsf47O+BYkRM4bZSCrYSqNug4CIFn+sFfaieHPFGjHAVCepE57Znt6Kwr85j+xycCM0RH6wHHGblKwK2bU9D40lGIibsygWoLXOe0D0LaK+GCKJ/ZbQ2top8g4NgyY42jtdnvJ1Y0Oj2mATB26tM3t73hortYIm6buokxZW7Xl+kgacWJjyNYmmQbLQdSEdmb5NNAttQZGvrHh7MKNAy+tNYM3vud19Kc/AzKK9SEWflbNteo9tMDltEycoDsBhnVtFNLL0g2i8KznjwQL+6/O9QRT7UWpEAd9qLsoY/1b4/eXDRFDyqvdUlYNuvQzth214GR6xKCvNPuQ8m4w== X-Microsoft-Exchange-Diagnostics: 1; CY1PR21MB0054; 31:5MZotRh5WeK8MFCxQjEoCOpxLWSce+mQFjesj3CPxQM6PCs0SNdkrsNG6++5gkMvqH+24nEiZq+FTJINfdE9RklxiWfAll+idOKHbO3Wu368voTsD0RQJHX7PLLldgydv+Y4f5QAcr7PxY0XsCISb6nWE/rn4Ruz9GA0egWy5ztzOopj7R54JZ2hjGn5/eJHKRvzA29RIk8MyBIkkYk/TbB4TcAVsyPxu5zeExTV7MjUyl2W3+HcGFBjwJvkUphE9G9bWzPeBYCAcKOqKl839w==; 20:VRXx/YmmGnQR7qHpzzDJF3awh04pi825uJzv9dUw/9NYZmWNEgnN3gORXyYkELFEJAz/5QZTWLWYhGeMmcgUto+9PvH1D4SOxIAEDcRcfNnAe1tU9oukPk6TJqpJh8ToWzMj8O3TouH2yrVr5N4HuRL2gEfvfX1VIcefbqPhjcbvd+BLgZU5nzKC+w2h6yzBFb2Z5d4VVTh5Tvl8/Pj8D8llA9/pLkbPFoHVO8d9aftMDTg9pS4X9wfnFTbjU1UEnQDFDggiyuSETCyuuPCLIt+7jZ4xWbhC5CwY+/142HvHK47jM2aBtPn3Iv1DJhBkjDIBHIBlQC4+/4MjVhIFM6JD6hBJyyyG8Kssplv+t0VheoXI/oVPY/TG8vrav981LktgdUy6LJhWZxBR2sUc1sVLQwvA0T15ODwn0eRWPOZIP7+X3GLqIRMex6twruOndLKVBgHnHkwe4sWteYpG6Eyzr+0avdJ+CYfXBM1cwQ0DMCZJB98mJbrpFuv104hF X-Microsoft-Antispam-PRVS: X-Exchange-Antispam-Report-Test: UriScan:; X-Exchange-Antispam-Report-CFA-Test: BCL:0; PCL:0; RULEID:(6040391)(601004)(2401047)(8121501046)(5005006)(10201501046)(3002001)(93006021)(93001021)(6055026)(6041248)(20161123558025)(20161123560025)(20161123562025)(20161123555025)(20161123564025)(201703131423016)(201702281528016)(201703061421016)(201703061406016)(6072148); SRVR:CY1PR21MB0054; BCL:0; PCL:0; RULEID:; SRVR:CY1PR21MB0054; X-Microsoft-Exchange-Diagnostics: 1; CY1PR21MB0054; 4:O1WbxVbUDbUwbWBY6YNunFQJcCVv1P8YfvEReTHeAdRMrvfUjBslV4HqP5NIB6WEvk3KfXZV/vJb1b8ydJUe46x2NxLfwDaWpStLMV6O2ycRTuq9MQuW8xubfKlIKnDEg49fdOA2XjY2TISkoG0tDMxNGf5ZCZl76CbZ5VoSLutXqTzIT0uzXEKAUTIm76eGbvwE12suYlz3jwKmXiGfpfPHpoK5vcRT1O/1GWMk1fq/RIVMjJH8Jx14dd/Jp/jfDKgmkCdGwk8sp4s4tzzPcG1qbGglJc68FinGIr/xKEVYZVe6yNI68F0c6ZqJJ7sLuOFe6g/n4Jc8H7hCovKvHA/uavf8WwhqLdA1jo4vcuCXqLDD0HyGS/4MBD8Dli8LT68HGXoJaX5IBvuZnq3uWr7gAQ4oG0NIQqNocVhSTrqrcoVwa6iufsBrg3USb2neV0M/PvbjGO4s6jToNdB0Prui1atuVvIyDu4YgxbDYLxCHMLSo00rXKnKr2teGT2J44ouEHQhOjVbt9XSuCv+WjHiKDlD17iX0DgIqWf/tidkaP2ziH2Y5RuQfUTFvowUMTEQy7J1f45N/ze722rRIzemOsogqPFJ6SlL2UTTP51TnyyCqUUaRFJSvQV8660hRiXIalI6KfRiof977cxtjBs2OAjFOxzh/tvJcqAolLuESCmvE6vp20Dewivwgr3ehYfvuT1ptRE7nkINuHvDJywhF47k5EQMDbFZJaiGBz/LK/5U5Cd4sMFX7FhvZs2gYljWb6HAcmtMrgvnwIFv+pBCY9Qa77dbNxkLvTlgZcdMiL+T8nn4ZVFpIBNbAhH/ X-Forefront-PRVS: 0256C18696 X-Forefront-Antispam-Report: SFV:NSPM; SFS:(10019020)(4630300001)(6009001)(39860400002)(39400400002)(39850400002)(39840400002)(39450400003)(39410400002)(25786009)(5005710100001)(10090500001)(10290500002)(305945005)(110136004)(1076002)(36756003)(6666003)(5660300001)(50986999)(189998001)(6116002)(7736002)(81166006)(6486002)(8676002)(4326008)(50466002)(48376002)(107886003)(86362001)(5003940100001)(2906002)(6916009)(86612001)(54906002)(50226002)(2351001)(38730400002)(47776003)(42186005)(53936002); DIR:OUT; SFP:1102; SCL:1; SRVR:CY1PR21MB0054; H:vroomfondel.redmond.corp.microsoft.com; FPR:; SPF:None; MLV:sfv; LANG:en; X-Microsoft-Exchange-Diagnostics: =?us-ascii?Q?1; CY1PR21MB0054; 23:0ARDQfQroeEVYniDTke8LGtMFHmwi2Q5OUNGzXGHQ?= =?us-ascii?Q?hT3IuJ4NKLq+DuebTTMwjRzcFrysTVnMNf/gwpvpzHvENPYXnNdYgylNoRlE?= =?us-ascii?Q?cB/2LqYIPiw6TlsHcTNWrWtIOwz0ExYYdPD39x2q6dhqCDWfuweEUGS41jbK?= =?us-ascii?Q?ukIrzglpBTLc2T06AezfsJVGbtOoUbRSZRdQgVm2NGyfMY1i864OexvdOSg0?= =?us-ascii?Q?ACb5QzN55A5lCz+OkIuDhhzPv2iKnAYOFMwMUrFlQMamvQXsyD0QzIsQmA1h?= =?us-ascii?Q?U+YuVRh/iTRmRVBbQaYbILr6ZCXVOlLPrffUlArLNe6TD3kI9tVTN2smJZ/l?= =?us-ascii?Q?N0UDXkBUNBHhfVQHLJi1JbtB36SQ6T3GBUmMYVYxSGkX7mi+7eqT0r1Rji32?= =?us-ascii?Q?xt6HKbXX1syGhnxClOvS/VgAvIg9ztvvuqdEMOC9LPXN0hH2QAzi0qF1dNGZ?= =?us-ascii?Q?FcK74yyVvXAeHjFO436zxs7oZUnQ0et+gM5eB682xJMxehJxE0IRE9NHN/TW?= =?us-ascii?Q?7nuXAY3BdidouE75A7/rg2eyYi+IekxKhyp5W1nepMhhIIz05Py0rwOuww9o?= =?us-ascii?Q?dwWb9Pbh0aAqe81WIwy6EUHUQj9qcoqd+FGe/bmwRhUuC+2Ee7qfLZ9+vE5v?= =?us-ascii?Q?8Tu0u71LY7ZyORXUNIY2G/D7A+eLcGOvRUPm4MrdmFbMwOvjbBrWlvclj76+?= =?us-ascii?Q?yEdPNJOx84A4SQNDKAFYLzIIY3EhIJ1UvsSkDdav2BDoLjMdKVC//KEMG54o?= =?us-ascii?Q?+By29kk9fBmflHQ2hxIrYw0Xgd/yujIFZqTpDy1nweZXFsSUPkIT9f7WAO1O?= =?us-ascii?Q?n1nqaCSEeEJdJaYH2gZasG87zKhtffTfulpEMAH4lSK4pqgMSwW7IO9ajo7k?= =?us-ascii?Q?tdYz+XzprpC6eQK10JAux2f9+8dMJ/qy6P3KT2ckJG/w/alHp2y5GLhMav86?= =?us-ascii?Q?ZD+PrSkZbXnmlodU9qQvtWl3LrpW62UBgNBQPccdpFD36a8SbUUCoUeCSz3P?= =?us-ascii?Q?D9KFjjBdCrCaHSh9GKPXP0cgb+YtvE2Qen2/daBOSz9cCIC+XVGSrpP4xH7H?= =?us-ascii?Q?HG3Xm+Y1A+kWOv8c0sEfZtyRNxC?= X-Microsoft-Exchange-Diagnostics: 1; CY1PR21MB0054; 6:traIdB+HQc2k/0hPk2fIas8I8wl+vdRusyRMT+xJVKfywrm1WnfKm+i0g4Jyyh9JAulCAe63yzawqPVJjkdmNunf5sM1/lql9pQDIsk2t41U0F47oyan7bP/9bcb+8+cHbXDkfnaO12ajC7K6LUd5DCtb+ARx76GiX8FlufJFnzW1E+KoPYT0qTXzL4D0kWVNeYf2B9lIH5reFOjU9cDI0i508iEP+n5KZ4XsPQbc0Y+dDeNlB2Q7yPVCvvHgGTgT47oMd4Vv8xQGTJ46DL3fa6NJiHhAWItkVd0lQIKqkJ+6DPHhnx42TtzS06SasYJJznoCYdTTdrjeqYiTx2uKM+Cwua+A6Mh6hQE0psb24frL0roCc8pV91MRtl+GYUnp8UjHf8qOzth2bbKLpMrJUCNoPaDXWJwHhh/5wtc/wQ=; 5:tDvEadUYgHtnv4z8dWHI4zFzAAQ2tuCmF/QuON07PnuDeCCofSKPq3zZ26vIULj3EhmkwPIio5KzoatYEHW5j6Uc0mlPPlKP4CleH1IuVoJJs97+HguHzoitmWJEpG8eYmdcCymjnr1TylZHntwDuQ==; 24:KGP+iTXMi34+Kn/QllVg8K7shB/JahNE+ppA68daED/W4oit3vXw5AvpFO5inHnODKHnNP2qRjQJJUB6IecdtaNh4qcFmvsNvrUHZtG8J/U= SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-Microsoft-Exchange-Diagnostics: 1; CY1PR21MB0054; 7:4URMLmbTHcUEdqiQWnNbubr+RTV+7XU+0zpPiSvUeElme6vhvsExI3up9T7PgdnHOrwFaDhBjNgKjKdbPzxMEb/th7s+NsWkRrWg7gU5DuJ+CkR5JV8mP68nZ5XtGuGwK4dbZGWq9dd8LncHh0FxUlE+8X9e5GuufD/G/OFtftZmiHacjArfh0oIc/NdR9rJHc+Zv9oker6sw4M5Y+Se4NANJZBinPx6I2XzB866MmQrlMY/diH2rXOdSSZTjrRekjKPz0N0WILVkojJTTdbzNfnLmxkD/F1w0Y+eAbRn//sPgQu/cPBGHKPjPXL5gMFLwBEi79fEXSQd1cHrtY90A== X-OriginatorOrg: microsoft.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 24 Mar 2017 21:21:27.2463 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-Transport-CrossTenantHeadersStamped: CY1PR21MB0054 X-detected-operating-system: by eggs.gnu.org: Windows 7 or 8 [fuzzy] X-Received-From: 104.47.40.99 Subject: [Qemu-devel] [PATCH v2] virtio: fix vring_align() on 64-bit win32 platforms 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: Stefan Weil , Andrew Baumann , "Michael S . Tsirkin" 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" long is 32-bits on win32, which caused the top half of the address to be truncated; this patch changes it to use the QEMU_ALIGN_UP macro which does not suffer the same problem Signed-off-by: Andrew Baumann Reviewed-by: Eric Blake --- include/hw/virtio/virtio.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/include/hw/virtio/virtio.h b/include/hw/virtio/virtio.h index 15efcf2..7b6edba 100644 --- a/include/hw/virtio/virtio.h +++ b/include/hw/virtio/virtio.h @@ -34,7 +34,7 @@ struct VirtQueue; static inline hwaddr vring_align(hwaddr addr, unsigned long align) { - return (addr + align - 1) & ~(align - 1); + return QEMU_ALIGN_UP(addr, align); } =20 typedef struct VirtQueue VirtQueue; --=20 2.8.3