From nobody Mon Feb 9 20:36:53 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 1506288424521172.7703480850804; Sun, 24 Sep 2017 14:27:04 -0700 (PDT) Received: from localhost ([::1]:39497 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1dwEQT-0002mS-By for importer@patchew.org; Sun, 24 Sep 2017 17:26:57 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:43231) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1dwEMd-0008PS-NQ for qemu-devel@nongnu.org; Sun, 24 Sep 2017 17:23:00 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1dwEMZ-00048n-Qq for qemu-devel@nongnu.org; Sun, 24 Sep 2017 17:22:59 -0400 Received: from isrv.corpit.ru ([86.62.121.231]:44389) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1dwEMZ-000475-G4; Sun, 24 Sep 2017 17:22:55 -0400 Received: from tsrv.corpit.ru (tsrv.tls.msk.ru [192.168.177.2]) by isrv.corpit.ru (Postfix) with ESMTP id CC3D541C95; Mon, 25 Sep 2017 00:22:53 +0300 (MSK) Received: from tls.msk.ru (mjt.vpn.tls.msk.ru [192.168.177.99]) by tsrv.corpit.ru (Postfix) with SMTP id 4008BB6D; Mon, 25 Sep 2017 00:22:53 +0300 (MSK) Received: (nullmailer pid 28243 invoked by uid 1000); Sun, 24 Sep 2017 21:22:52 -0000 From: Michael Tokarev To: qemu-devel@nongnu.org Date: Mon, 25 Sep 2017 00:22:20 +0300 Message-Id: <8d208c2cf20e631221031ba7f0091d0491d05c7d.1506288070.git.mjt@msgid.tls.msk.ru> X-Mailer: git-send-email 2.11.0 In-Reply-To: References: In-Reply-To: References: X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] [fuzzy] X-Received-From: 86.62.121.231 Subject: [Qemu-devel] [PULL 02/31] Replace round_page() with TARGET_PAGE_ALIGN() 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: qemu-trivial@nongnu.org, Kamil Rytarowski , Michael Tokarev 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" From: Kamil Rytarowski This change fixes conflict with the DragonFly BSD headers. Signed-off-by: Kamil Rytarowski Reviewed-by: Thomas Huth Signed-off-by: Michael Tokarev --- hw/ppc/mac_newworld.c | 11 +++-------- hw/ppc/mac_oldworld.c | 11 +++-------- 2 files changed, 6 insertions(+), 16 deletions(-) diff --git a/hw/ppc/mac_newworld.c b/hw/ppc/mac_newworld.c index 33b46cb50b..d013c412d6 100644 --- a/hw/ppc/mac_newworld.c +++ b/hw/ppc/mac_newworld.c @@ -124,11 +124,6 @@ static uint64_t translate_kernel_address(void *opaque,= uint64_t addr) return (addr & 0x0fffffff) + KERNEL_LOAD_ADDR; } =20 -static hwaddr round_page(hwaddr addr) -{ - return (addr + TARGET_PAGE_SIZE - 1) & TARGET_PAGE_MASK; -} - static void ppc_core99_reset(void *opaque) { PowerPCCPU *cpu =3D opaque; @@ -252,7 +247,7 @@ static void ppc_core99_init(MachineState *machine) } /* load initrd */ if (initrd_filename) { - initrd_base =3D round_page(kernel_base + kernel_size + KERNEL_= GAP); + initrd_base =3D TARGET_PAGE_ALIGN(kernel_base + kernel_size + = KERNEL_GAP); initrd_size =3D load_image_targphys(initrd_filename, initrd_ba= se, ram_size - initrd_base); if (initrd_size < 0) { @@ -260,11 +255,11 @@ static void ppc_core99_init(MachineState *machine) initrd_filename); exit(1); } - cmdline_base =3D round_page(initrd_base + initrd_size); + cmdline_base =3D TARGET_PAGE_ALIGN(initrd_base + initrd_size); } else { initrd_base =3D 0; initrd_size =3D 0; - cmdline_base =3D round_page(kernel_base + kernel_size + KERNEL= _GAP); + cmdline_base =3D TARGET_PAGE_ALIGN(kernel_base + kernel_size += KERNEL_GAP); } ppc_boot_device =3D 'm'; } else { diff --git a/hw/ppc/mac_oldworld.c b/hw/ppc/mac_oldworld.c index 193b9047d9..61838c3e6f 100644 --- a/hw/ppc/mac_oldworld.c +++ b/hw/ppc/mac_oldworld.c @@ -66,11 +66,6 @@ static uint64_t translate_kernel_address(void *opaque, u= int64_t addr) return (addr & 0x0fffffff) + KERNEL_LOAD_ADDR; } =20 -static hwaddr round_page(hwaddr addr) -{ - return (addr + TARGET_PAGE_SIZE - 1) & TARGET_PAGE_MASK; -} - static void ppc_heathrow_reset(void *opaque) { PowerPCCPU *cpu =3D opaque; @@ -187,7 +182,7 @@ static void ppc_heathrow_init(MachineState *machine) } /* load initrd */ if (initrd_filename) { - initrd_base =3D round_page(kernel_base + kernel_size + KERNEL_= GAP); + initrd_base =3D TARGET_PAGE_ALIGN(kernel_base + kernel_size + = KERNEL_GAP); initrd_size =3D load_image_targphys(initrd_filename, initrd_ba= se, ram_size - initrd_base); if (initrd_size < 0) { @@ -195,11 +190,11 @@ static void ppc_heathrow_init(MachineState *machine) initrd_filename); exit(1); } - cmdline_base =3D round_page(initrd_base + initrd_size); + cmdline_base =3D TARGET_PAGE_ALIGN(initrd_base + initrd_size); } else { initrd_base =3D 0; initrd_size =3D 0; - cmdline_base =3D round_page(kernel_base + kernel_size + KERNEL= _GAP); + cmdline_base =3D TARGET_PAGE_ALIGN(kernel_base + kernel_size += KERNEL_GAP); } ppc_boot_device =3D 'm'; } else { --=20 2.11.0