From: Zachary Amsden <zamsden@redhat.com>
To: qemu-devel@nongnu.org
Cc: zamsden@redhat.com
Subject: [Qemu-devel] [PATCH 08/14] Make VGA vram offset passed into vga_mm_init absolute. Since this is a function of the platform, it makes sense to have it be explicitly known in the platform layer rather than hardcoded inside the vga code.
Date: Thu, 30 Jul 2009 00:15:06 -1000 [thread overview]
Message-ID: <1248948912-7877-9-git-send-email-zamsden@redhat.com> (raw)
In-Reply-To: <1248948912-7877-8-git-send-email-zamsden@redhat.com>
Signed-off-by: Zachary Amsden <zamsden@redhat.com>
---
hw/mips_jazz.c | 2 +-
hw/vga.c | 4 ++--
2 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/hw/mips_jazz.c b/hw/mips_jazz.c
index 2b4e1e0..0470a3f 100644
--- a/hw/mips_jazz.c
+++ b/hw/mips_jazz.c
@@ -200,7 +200,7 @@ void mips_jazz_init (ram_addr_t ram_size,
g364fb_mm_init(0x40000000, 0x60000000, 0, rc4030[3]);
break;
case JAZZ_PICA61:
- isa_vga_mm_init(0x40000000, 0x60000000, 0);
+ isa_vga_mm_init(0x400a0000, 0x60000000, 0);
break;
default:
break;
diff --git a/hw/vga.c b/hw/vga.c
index 9b50959..52fb1c4 100644
--- a/hw/vga.c
+++ b/hw/vga.c
@@ -2433,8 +2433,8 @@ static void vga_mm_init(VGAState *s, target_phys_addr_t vram_base,
vga_io_memory = cpu_register_io_memory(vga_mem_read, vga_mem_write, s);
cpu_register_physical_memory(ctrl_base, 0x100000, s_ioport_ctrl);
- cpu_register_physical_memory(vram_base + 0x000a0000, 0x20000, vga_io_memory);
- qemu_register_coalesced_mmio(vram_base + 0x000a0000, 0x20000);
+ cpu_register_physical_memory(vram_base, 0x20000, vga_io_memory);
+ qemu_register_coalesced_mmio(vram_base, 0x20000);
}
int isa_vga_init(void)
--
1.6.2.5
next prev parent reply other threads:[~2009-07-30 10:19 UTC|newest]
Thread overview: 21+ messages / expand[flat|nested] mbox.gz Atom feed top
2009-07-30 10:14 [Qemu-devel] Various VGA / VNC fixes and cleanups to prep for multiheaded graphics Zachary Amsden
2009-07-30 10:14 ` [Qemu-devel] [PATCH 01/14] Add a configure switch to enable / disable all user targets. I felt compelled to do it for symmetry, mostly it is useful to disable user targets when you don't want to build them Zachary Amsden
2009-07-30 10:15 ` [Qemu-devel] [PATCH 02/14] Don't segfault when changing VNC password on an SDL display Zachary Amsden
2009-07-30 10:15 ` [Qemu-devel] [PATCH 03/14] When using stdio monitor and VNC display, one can set or clear a VNC password; this should set or turn off VNC authentication as well Zachary Amsden
2009-07-30 10:15 ` [Qemu-devel] [PATCH 04/14] Clean up VGA type selection; far too many variables being used to track one state leads to confusion if new variables are added Zachary Amsden
2009-07-30 10:15 ` [Qemu-devel] [PATCH 05/14] Change cpu_phys mem callback to use [offset, size) bounds instead of [start, end) Zachary Amsden
2009-07-30 10:15 ` [Qemu-devel] [PATCH 06/14] Split VGA ioport init into a helper function Zachary Amsden
2009-07-30 10:15 ` [Qemu-devel] [PATCH 07/14] Code motion; make mm VGA init function more like standard vga init function. Add missing vga_reset hook to vga_mm_init Zachary Amsden
2009-07-30 10:15 ` Zachary Amsden [this message]
2009-07-30 10:15 ` [Qemu-devel] [PATCH 09/14] Further transformation: use common vga_init() which allows either I/O port or memory mapped based control Zachary Amsden
2009-07-30 10:15 ` [Qemu-devel] [PATCH 10/14] Stash VGA physical address and use it in KVM callbacks. Stash VGA physical pointer in cirrus vga as well Zachary Amsden
2009-07-30 10:15 ` [Qemu-devel] [PATCH 11/14] Add some defined constants for VGA offsets Zachary Amsden
2009-07-30 10:15 ` [Qemu-devel] [PATCH 12/14] Add a PCI BAR for the VGA ROM which is mapped into cirrus_vga. This makes the cirrus device complete under some X servers which require the V_BIOS mapping Zachary Amsden
2009-07-30 10:15 ` [Qemu-devel] [PATCH 13/14] Allow cirrus VGA to be initialized multiple times; only the first init takes the ISA memory region and hardware I/O ports Zachary Amsden
2009-07-30 10:15 ` [Qemu-devel] [PATCH 14/14] Atrocious and horrendous patch to demonstrate multiple SDL displays. The multiple SDL displays can be seen on one console, using ctrl-alt-1/2 to switch between them Zachary Amsden
2009-07-30 11:03 ` [Qemu-devel] Re: [PATCH 07/14] Code motion; make mm VGA init function more like standard vga init function. Add missing vga_reset hook to vga_mm_init Jan Kiszka
2009-07-30 11:03 ` [Qemu-devel] Re: [PATCH 05/14] Change cpu_phys mem callback to use [offset, size) bounds instead of [start, end) Jan Kiszka
2009-08-10 19:42 ` [Qemu-devel] " Anthony Liguori
2009-07-30 10:34 ` [Qemu-devel] Various VGA / VNC fixes and cleanups to prep for multiheaded graphics Daniel P. Berrange
2009-07-30 10:35 ` Zachary Amsden
2009-07-30 11:33 ` Paul Brook
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=1248948912-7877-9-git-send-email-zamsden@redhat.com \
--to=zamsden@redhat.com \
--cc=qemu-devel@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).