From a7b022e083a1ef03a72b8c5bd253a3c66cc4214a Mon Sep 17 00:00:00 2001 From: Alexander Graf Date: Sun, 26 Jul 2009 06:31:15 +0000 Subject: [PATCH] PPC: Round VGA BIOS size to page boundary When giving KVM a slot of a size not on page boundary, it chokes. So let's just round up the VGA BIOS size so nobody complains anymore and we don't need to implement sub-page slots. Required for booting a PPC guest in KVM. Signed-off-by: Alexander Graf --- hw/ppc_newworld.c | 4 ++++ hw/ppc_oldworld.c | 4 ++++ 2 files changed, 8 insertions(+) diff --git a/hw/ppc_newworld.c b/hw/ppc_newworld.c index 4e5043cd6d..1c512a2417 100644 --- a/hw/ppc_newworld.c +++ b/hw/ppc_newworld.c @@ -179,6 +179,10 @@ static void ppc_core99_init (ram_addr_t ram_size, vga_bios_ptr[3] = 'V'; cpu_to_be32w((uint32_t *)(vga_bios_ptr + 4), vga_bios_size); vga_bios_size += 8; + + /* Round to page boundary */ + vga_bios_size = (vga_bios_size + TARGET_PAGE_SIZE - 1) & + TARGET_PAGE_MASK; } if (linux_boot) { diff --git a/hw/ppc_oldworld.c b/hw/ppc_oldworld.c index b26e407c83..56b2876684 100644 --- a/hw/ppc_oldworld.c +++ b/hw/ppc_oldworld.c @@ -212,6 +212,10 @@ static void ppc_heathrow_init (ram_addr_t ram_size, vga_bios_ptr[3] = 'V'; cpu_to_be32w((uint32_t *)(vga_bios_ptr + 4), vga_bios_size); vga_bios_size += 8; + + /* Round to page boundary */ + vga_bios_size = (vga_bios_size + TARGET_PAGE_SIZE - 1) & + TARGET_PAGE_MASK; } if (linux_boot) {