From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([208.118.235.92]:38715) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1S4wf7-0001Gd-N1 for qemu-devel@nongnu.org; Tue, 06 Mar 2012 10:50:59 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1S4wek-0005Vc-5J for qemu-devel@nongnu.org; Tue, 06 Mar 2012 10:50:53 -0500 Received: from mx1.redhat.com ([209.132.183.28]:31239) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1S4wej-0005VF-TT for qemu-devel@nongnu.org; Tue, 06 Mar 2012 10:50:30 -0500 From: Avi Kivity Date: Tue, 6 Mar 2012 17:50:10 +0200 Message-Id: <1331049010-24312-1-git-send-email-avi@redhat.com> Subject: [Qemu-devel] [PATCH] kvmvapic: align start address as well as size List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org, Anthony Liguori Cc: Jan Kiszka The kvmvapic code remaps a section of ROM as RAM to allow the guest to maintain state there. It is careful to align the section size to a page boundary, to avoid creating subpages, but neglects to do the same for the start address. These leads to an assert later on when the memory core tries to create a page which is half RAM and half ROM. Fix by aligning the start address to a page boundary. This can be triggered by running qemu-system-x86_64 -enable-kvm -vga none. Signed-off-by: Avi Kivity --- hw/kvmvapic.c | 4 +++- 1 files changed, 3 insertions(+), 1 deletions(-) diff --git a/hw/kvmvapic.c b/hw/kvmvapic.c index 36ccfbc..e8bfeec 100644 --- a/hw/kvmvapic.c +++ b/hw/kvmvapic.c @@ -578,8 +578,10 @@ static void vapic_map_rom_writable(VAPICROMState *s) rom_size = ram[rom_paddr + 2] * ROM_BLOCK_SIZE; s->rom_size = rom_size; - /* We need to round up to avoid creating subpages + /* We need to round to avoid creating subpages * from which we cannot run code. */ + rom_size += rom_paddr & ~TARGET_PAGE_MASK; + rom_paddr &= TARGET_PAGE_MASK; rom_size = TARGET_PAGE_ALIGN(rom_size); memory_region_init_alias(&s->rom, "kvmvapic-rom", section.mr, rom_paddr, -- 1.7.9