From: Kamil Rytarowski <n54@gmx.com>
To: qemu-trivial@nongnu.org
Cc: qemu-devel@nongnu.org, Kamil Rytarowski <n54@gmx.com>
Subject: [Qemu-devel] [PATCH] Rename round_page() to round_pageq()
Date: Mon, 11 Sep 2017 22:00:02 +0200 [thread overview]
Message-ID: <20170911200002.4511-1-n54@gmx.com> (raw)
This change fixes conflict with the DragonFly BSD headers.
Signed-off-by: Kamil Rytarowski <n54@gmx.com>
---
hw/ppc/mac_newworld.c | 8 ++++----
hw/ppc/mac_oldworld.c | 8 ++++----
2 files changed, 8 insertions(+), 8 deletions(-)
diff --git a/hw/ppc/mac_newworld.c b/hw/ppc/mac_newworld.c
index d466634997..b9d4bca74f 100644
--- a/hw/ppc/mac_newworld.c
+++ b/hw/ppc/mac_newworld.c
@@ -124,7 +124,7 @@ static uint64_t translate_kernel_address(void *opaque, uint64_t addr)
return (addr & 0x0fffffff) + KERNEL_LOAD_ADDR;
}
-static hwaddr round_page(hwaddr addr)
+static hwaddr round_pageq(hwaddr addr)
{
return (addr + TARGET_PAGE_SIZE - 1) & TARGET_PAGE_MASK;
}
@@ -256,7 +256,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 = round_pageq(kernel_base + kernel_size + KERNEL_GAP);
initrd_size = load_image_targphys(initrd_filename, initrd_base,
ram_size - initrd_base);
if (initrd_size < 0) {
@@ -264,11 +264,11 @@ static void ppc_core99_init(MachineState *machine)
initrd_filename);
exit(1);
}
- cmdline_base = round_page(initrd_base + initrd_size);
+ cmdline_base = round_pageq(initrd_base + initrd_size);
} else {
initrd_base = 0;
initrd_size = 0;
- cmdline_base = round_page(kernel_base + kernel_size + KERNEL_GAP);
+ cmdline_base = round_pageq(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 fcac399562..50fefb339b 100644
--- a/hw/ppc/mac_oldworld.c
+++ b/hw/ppc/mac_oldworld.c
@@ -66,7 +66,7 @@ static uint64_t translate_kernel_address(void *opaque, uint64_t addr)
return (addr & 0x0fffffff) + KERNEL_LOAD_ADDR;
}
-static hwaddr round_page(hwaddr addr)
+static hwaddr round_pageq(hwaddr addr)
{
return (addr + TARGET_PAGE_SIZE - 1) & TARGET_PAGE_MASK;
}
@@ -191,7 +191,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 = round_pageq(kernel_base + kernel_size + KERNEL_GAP);
initrd_size = load_image_targphys(initrd_filename, initrd_base,
ram_size - initrd_base);
if (initrd_size < 0) {
@@ -199,11 +199,11 @@ static void ppc_heathrow_init(MachineState *machine)
initrd_filename);
exit(1);
}
- cmdline_base = round_page(initrd_base + initrd_size);
+ cmdline_base = round_pageq(initrd_base + initrd_size);
} else {
initrd_base = 0;
initrd_size = 0;
- cmdline_base = round_page(kernel_base + kernel_size + KERNEL_GAP);
+ cmdline_base = round_pageq(kernel_base + kernel_size + KERNEL_GAP);
}
ppc_boot_device = 'm';
} else {
--
2.14.1
next reply other threads:[~2017-09-11 20:12 UTC|newest]
Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-09-11 20:00 Kamil Rytarowski [this message]
2017-09-11 20:16 ` [Qemu-devel] [PATCH] Rename round_page() to round_pageq() Peter Maydell
2017-09-11 20:24 ` Kamil Rytarowski
2017-09-11 20:16 ` [Qemu-devel] [PATCH v2] Replace round_page() with TARGET_PAGE_ALIGN() Kamil Rytarowski
2017-09-12 11:46 ` Thomas Huth
2017-09-14 7:41 ` [Qemu-devel] [Qemu-trivial] " Michael Tokarev
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20170911200002.4511-1-n54@gmx.com \
--to=n54@gmx.com \
--cc=qemu-devel@nongnu.org \
--cc=qemu-trivial@nongnu.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).