From nobody Tue Feb 10 06:05:09 2026 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.zohomail.com; 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 150816528074953.210100460487524; Mon, 16 Oct 2017 07:48:00 -0700 (PDT) Received: from localhost ([::1]:33319 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1e46gP-0000FZ-TH for importer@patchew.org; Mon, 16 Oct 2017 10:47:57 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:51019) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1e46c3-00054b-1F for qemu-devel@nongnu.org; Mon, 16 Oct 2017 10:43:32 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1e46c2-0005o5-8A for qemu-devel@nongnu.org; Mon, 16 Oct 2017 10:43:27 -0400 Received: from mx1.redhat.com ([209.132.183.28]:36450) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1e46c2-0005mO-1s for qemu-devel@nongnu.org; Mon, 16 Oct 2017 10:43:26 -0400 Received: from smtp.corp.redhat.com (int-mx06.intmail.prod.int.phx2.redhat.com [10.5.11.16]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 1252D7E431; Mon, 16 Oct 2017 14:43:25 +0000 (UTC) Received: from t460s.redhat.com (ovpn-116-221.ams2.redhat.com [10.36.116.221]) by smtp.corp.redhat.com (Postfix) with ESMTP id B4D585E1A1; Mon, 16 Oct 2017 14:43:23 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mx1.redhat.com 1252D7E431 Authentication-Results: ext-mx03.extmail.prod.ext.phx2.redhat.com; dmarc=none (p=none dis=none) header.from=redhat.com Authentication-Results: ext-mx03.extmail.prod.ext.phx2.redhat.com; spf=fail smtp.mailfrom=david@redhat.com From: David Hildenbrand To: qemu-devel@nongnu.org Date: Mon, 16 Oct 2017 16:43:01 +0200 Message-Id: <20171016144302.24284-7-david@redhat.com> In-Reply-To: <20171016144302.24284-1-david@redhat.com> References: <20171016144302.24284-1-david@redhat.com> X-Scanned-By: MIMEDefang 2.79 on 10.5.11.16 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.27]); Mon, 16 Oct 2017 14:43:25 +0000 (UTC) X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] [fuzzy] X-Received-From: 209.132.183.28 Subject: [Qemu-devel] [PATCH v1 6/7] kvm: simplify kvm_align_section() X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Paolo Bonzini , Thomas Huth , David Hildenbrand , Joe Clifford Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail: RSF_0 Z_629925259 SPT_0 Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Use ROUND_UP and simplify the code a bit. Signed-off-by: David Hildenbrand --- accel/kvm/kvm-all.c | 18 ++++++------------ 1 file changed, 6 insertions(+), 12 deletions(-) diff --git a/accel/kvm/kvm-all.c b/accel/kvm/kvm-all.c index 2835bb3801..f290f487a5 100644 --- a/accel/kvm/kvm-all.c +++ b/accel/kvm/kvm-all.c @@ -197,26 +197,20 @@ static hwaddr kvm_align_section(MemoryRegionSection *= section, hwaddr *start) { hwaddr size =3D int128_get64(section->size); - hwaddr delta; - - *start =3D section->offset_within_address_space; + hwaddr delta, aligned; =20 /* kvm works in page size chunks, but the function may be called with sub-page size and unaligned start address. Pad the start address to next and truncate size to previous page boundary. */ - delta =3D qemu_real_host_page_size - (*start & ~qemu_real_host_page_ma= sk); - delta &=3D ~qemu_real_host_page_mask; - *start +=3D delta; + aligned =3D ROUND_UP(section->offset_within_address_space, + qemu_real_host_page_size); + delta =3D aligned - section->offset_within_address_space; + *start =3D aligned; if (delta > size) { return 0; } - size -=3D delta; - size &=3D qemu_real_host_page_mask; - if (*start & ~qemu_real_host_page_mask) { - return 0; - } =20 - return size; + return (size - delta) & qemu_real_host_page_mask; } =20 int kvm_physical_memory_addr_from_host(KVMState *s, void *ram, --=20 2.13.5