[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-trivial] [PULL 02/31] Replace round_page() with TARGET_PAGE_ALIGN(
From: |
Michael Tokarev |
Subject: |
[Qemu-trivial] [PULL 02/31] Replace round_page() with TARGET_PAGE_ALIGN() |
Date: |
Mon, 25 Sep 2017 00:22:20 +0300 |
From: Kamil Rytarowski <address@hidden>
This change fixes conflict with the DragonFly BSD headers.
Signed-off-by: Kamil Rytarowski <address@hidden>
Reviewed-by: Thomas Huth <address@hidden>
Signed-off-by: Michael Tokarev <address@hidden>
---
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;
}
-static hwaddr round_page(hwaddr addr)
-{
- return (addr + TARGET_PAGE_SIZE - 1) & TARGET_PAGE_MASK;
-}
-
static void ppc_core99_reset(void *opaque)
{
PowerPCCPU *cpu = opaque;
@@ -252,7 +247,7 @@ static void ppc_core99_init(MachineState *machine)
}
/* load initrd */
if (initrd_filename) {
- initrd_base = round_page(kernel_base + kernel_size + KERNEL_GAP);
+ initrd_base = TARGET_PAGE_ALIGN(kernel_base + kernel_size +
KERNEL_GAP);
initrd_size = load_image_targphys(initrd_filename, initrd_base,
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 = round_page(initrd_base + initrd_size);
+ cmdline_base = TARGET_PAGE_ALIGN(initrd_base + initrd_size);
} else {
initrd_base = 0;
initrd_size = 0;
- cmdline_base = round_page(kernel_base + kernel_size + KERNEL_GAP);
+ cmdline_base = TARGET_PAGE_ALIGN(kernel_base + kernel_size +
KERNEL_GAP);
}
ppc_boot_device = '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,
uint64_t addr)
return (addr & 0x0fffffff) + KERNEL_LOAD_ADDR;
}
-static hwaddr round_page(hwaddr addr)
-{
- return (addr + TARGET_PAGE_SIZE - 1) & TARGET_PAGE_MASK;
-}
-
static void ppc_heathrow_reset(void *opaque)
{
PowerPCCPU *cpu = opaque;
@@ -187,7 +182,7 @@ static void ppc_heathrow_init(MachineState *machine)
}
/* load initrd */
if (initrd_filename) {
- initrd_base = round_page(kernel_base + kernel_size + KERNEL_GAP);
+ initrd_base = TARGET_PAGE_ALIGN(kernel_base + kernel_size +
KERNEL_GAP);
initrd_size = load_image_targphys(initrd_filename, initrd_base,
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 = round_page(initrd_base + initrd_size);
+ cmdline_base = TARGET_PAGE_ALIGN(initrd_base + initrd_size);
} else {
initrd_base = 0;
initrd_size = 0;
- cmdline_base = round_page(kernel_base + kernel_size + KERNEL_GAP);
+ cmdline_base = TARGET_PAGE_ALIGN(kernel_base + kernel_size +
KERNEL_GAP);
}
ppc_boot_device = 'm';
} else {
--
2.11.0
- [Qemu-trivial] [PULL 00/31] Trivial patches for 2017-09-25, Michael Tokarev, 2017/09/24
- [Qemu-trivial] [PULL 04/31] MAINTAINERS: add missing STM32 entry, Michael Tokarev, 2017/09/24
- [Qemu-trivial] [PULL 01/31] configure: Remove unused code (found by shellcheck), Michael Tokarev, 2017/09/24
- [Qemu-trivial] [PULL 07/31] MAINTAINERS: add missing Guest Agent entries, Michael Tokarev, 2017/09/24
- [Qemu-trivial] [PULL 06/31] MAINTAINERS: add missing VMWare entry, Michael Tokarev, 2017/09/24
- [Qemu-trivial] [PULL 02/31] Replace round_page() with TARGET_PAGE_ALIGN(),
Michael Tokarev <=
- [Qemu-trivial] [PULL 26/31] hw/display/virtio-gpu: Put the virtio-gpu-device into the display category, Michael Tokarev, 2017/09/24
- [Qemu-trivial] [PULL 10/31] MAINTAINERS: add missing SSI entries, Michael Tokarev, 2017/09/24
- [Qemu-trivial] [PULL 21/31] remove trailing whitespace from qemu-options.hx, Michael Tokarev, 2017/09/24
- [Qemu-trivial] [PULL 12/31] MAINTAINERS: add missing AIO entry, Michael Tokarev, 2017/09/24
- [Qemu-trivial] [PULL 17/31] filter-mirror: segfault when specifying non existent device, Michael Tokarev, 2017/09/24
- [Qemu-trivial] [PULL 16/31] MAINTAINERS: update docs/interop/ entries, Michael Tokarev, 2017/09/24
- [Qemu-trivial] [PULL 14/31] MAINTAINERS: add missing Cryptography entry, Michael Tokarev, 2017/09/24
- [Qemu-trivial] [PULL 11/31] MAINTAINERS: add missing entries for throttling infra, Michael Tokarev, 2017/09/24
- [Qemu-trivial] [PULL 28/31] dma/i82374: avoid double creation of i82374 device, Michael Tokarev, 2017/09/24
- [Qemu-trivial] [PULL 03/31] MAINTAINERS: add missing ARM entries, Michael Tokarev, 2017/09/24