From: "Benoît Canet" <benoit.canet@gmail.com>
To: qemu-devel@nongnu.org
Cc: peter.maydell@linaro.org, "Benoît Canet" <benoit.canet@gmail.com>,
avi@redhat.com
Subject: [Qemu-devel] [PATCH 05/10] pxa2xx_pcmcia.c: merge calls to get_system_memory()
Date: Wed, 26 Oct 2011 16:56:31 +0200 [thread overview]
Message-ID: <1319640996-26537-6-git-send-email-benoit.canet@gmail.com> (raw)
In-Reply-To: <1319640996-26537-1-git-send-email-benoit.canet@gmail.com>
Signed-off-by: Benoit Canet <benoit.canet@gmail.com>
---
hw/pxa2xx_pcmcia.c | 7 ++++---
1 files changed, 4 insertions(+), 3 deletions(-)
diff --git a/hw/pxa2xx_pcmcia.c b/hw/pxa2xx_pcmcia.c
index f428bd1..8538cca 100644
--- a/hw/pxa2xx_pcmcia.c
+++ b/hw/pxa2xx_pcmcia.c
@@ -120,6 +120,7 @@ static void pxa2xx_pcmcia_set_irq(void *opaque, int line, int level)
PXA2xxPCMCIAState *pxa2xx_pcmcia_init(target_phys_addr_t base)
{
PXA2xxPCMCIAState *s;
+ MemoryRegion *system_memory = get_system_memory();
s = (PXA2xxPCMCIAState *)
g_malloc0(sizeof(PXA2xxPCMCIAState));
@@ -127,7 +128,7 @@ PXA2xxPCMCIAState *pxa2xx_pcmcia_init(target_phys_addr_t base)
/* Socket I/O Memory Space */
memory_region_init_io(&s->iomem, &pxa2xx_pcmcia_io_ops, s,
"pcmcia_io", 0x04000000);
- memory_region_add_subregion(get_system_memory(), base | 0x00000000,
+ memory_region_add_subregion(system_memory, base | 0x00000000,
&s->iomem);
/* Then next 64 MB is reserved */
@@ -135,13 +136,13 @@ PXA2xxPCMCIAState *pxa2xx_pcmcia_init(target_phys_addr_t base)
/* Socket Attribute Memory Space */
memory_region_init_io(&s->attr_iomem, &pxa2xx_pcmcia_attr_ops, s,
"pcmcia_attribute", 0x04000000);
- memory_region_add_subregion(get_system_memory(), base | 0x08000000,
+ memory_region_add_subregion(system_memory, base | 0x08000000,
&s->attr_iomem);
/* Socket Common Memory Space */
memory_region_init_io(&s->common_iomem, &pxa2xx_pcmcia_common_ops, s,
"pcmcia_common", 0x04000000);
- memory_region_add_subregion(get_system_memory(), base | 0x0c000000,
+ memory_region_add_subregion(system_memory, base | 0x0c000000,
&s->common_iomem);
if (base == 0x30000000)
--
1.7.4.1
next prev parent reply other threads:[~2011-10-26 14:57 UTC|newest]
Thread overview: 12+ messages / expand[flat|nested] mbox.gz Atom feed top
2011-10-26 14:56 [Qemu-devel] [PATCH 00/10] pxa2xx: memory API conversions Benoît Canet
2011-10-26 14:56 ` [Qemu-devel] [PATCH 01/10] pxa2xx_gpio: convert to memory API Benoît Canet
2011-10-26 14:56 ` [Qemu-devel] [PATCH 02/10] pxa2xx_pcmcia.c: convert common memory space " Benoît Canet
2011-10-26 14:56 ` [Qemu-devel] [PATCH 03/10] pxa2xx_pcmcia.c: convert attribute " Benoît Canet
2011-10-26 14:56 ` [Qemu-devel] [PATCH 04/10] pxa2xx_pcmcia.c: convert io " Benoît Canet
2011-10-26 14:56 ` Benoît Canet [this message]
2011-10-26 14:56 ` [Qemu-devel] [PATCH 06/10] pxa2xx_keypad: convert " Benoît Canet
2011-10-26 14:56 ` [Qemu-devel] [PATCH 07/10] pxa2xx_timer: " Benoît Canet
2011-10-26 14:56 ` [Qemu-devel] [PATCH 08/10] pxa2xx_pic: " Benoît Canet
2011-10-26 14:56 ` [Qemu-devel] [PATCH 09/10] pxa2xx_mmci: " Benoît Canet
2011-10-26 14:56 ` [Qemu-devel] [PATCH 10/10] pxa2xx_lcd: " Benoît Canet
2011-10-30 11:59 ` [Qemu-devel] [PATCH 00/10] pxa2xx: memory API conversions Avi Kivity
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=1319640996-26537-6-git-send-email-benoit.canet@gmail.com \
--to=benoit.canet@gmail.com \
--cc=avi@redhat.com \
--cc=peter.maydell@linaro.org \
--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).