From: Avi Kivity <avi@redhat.com> To: Anthony Liguori <anthony@codemonkey.ws>, qemu-devel@nongnu.org Cc: kvm@vger.kernel.org Subject: [PATCH v2 14/24] stellaris_enet: convert to memory API Date: Mon, 15 Aug 2011 17:17:28 +0300 [thread overview] Message-ID: <1313417858-6454-15-git-send-email-avi@redhat.com> (raw) In-Reply-To: <1313417858-6454-1-git-send-email-avi@redhat.com> Signed-off-by: Avi Kivity <avi@redhat.com> --- hw/stellaris_enet.c | 29 ++++++++++++----------------- 1 files changed, 12 insertions(+), 17 deletions(-) diff --git a/hw/stellaris_enet.c b/hw/stellaris_enet.c index 1291931..9f1f37a 100644 --- a/hw/stellaris_enet.c +++ b/hw/stellaris_enet.c @@ -69,7 +69,7 @@ typedef struct { NICState *nic; NICConf conf; qemu_irq irq; - int mmio_index; + MemoryRegion mmio; } stellaris_enet_state; static void stellaris_enet_update(stellaris_enet_state *s) @@ -130,7 +130,8 @@ static int stellaris_enet_can_receive(VLANClientState *nc) return (s->np < 31); } -static uint32_t stellaris_enet_read(void *opaque, target_phys_addr_t offset) +static uint64_t stellaris_enet_read(void *opaque, target_phys_addr_t offset, + unsigned size) { stellaris_enet_state *s = (stellaris_enet_state *)opaque; uint32_t val; @@ -198,7 +199,7 @@ static uint32_t stellaris_enet_read(void *opaque, target_phys_addr_t offset) } static void stellaris_enet_write(void *opaque, target_phys_addr_t offset, - uint32_t value) + uint64_t value, unsigned size) { stellaris_enet_state *s = (stellaris_enet_state *)opaque; @@ -303,17 +304,12 @@ static void stellaris_enet_write(void *opaque, target_phys_addr_t offset, } } -static CPUReadMemoryFunc * const stellaris_enet_readfn[] = { - stellaris_enet_read, - stellaris_enet_read, - stellaris_enet_read +static const MemoryRegionOps stellaris_enet_ops = { + .read = stellaris_enet_read, + .write = stellaris_enet_write, + .endianness = DEVICE_NATIVE_ENDIAN, }; -static CPUWriteMemoryFunc * const stellaris_enet_writefn[] = { - stellaris_enet_write, - stellaris_enet_write, - stellaris_enet_write -}; static void stellaris_enet_reset(stellaris_enet_state *s) { s->mdv = 0x80; @@ -391,7 +387,7 @@ static void stellaris_enet_cleanup(VLANClientState *nc) unregister_savevm(&s->busdev.qdev, "stellaris_enet", s); - cpu_unregister_io_memory(s->mmio_index); + memory_region_destroy(&s->mmio); qemu_free(s); } @@ -408,10 +404,9 @@ static int stellaris_enet_init(SysBusDevice *dev) { stellaris_enet_state *s = FROM_SYSBUS(stellaris_enet_state, dev); - s->mmio_index = cpu_register_io_memory(stellaris_enet_readfn, - stellaris_enet_writefn, s, - DEVICE_NATIVE_ENDIAN); - sysbus_init_mmio(dev, 0x1000, s->mmio_index); + memory_region_init_io(&s->mmio, &stellaris_enet_ops, s, "stellaris_enet", + 0x1000); + sysbus_init_mmio_region(dev, &s->mmio); sysbus_init_irq(dev, &s->irq); qemu_macaddr_default_if_unset(&s->conf.macaddr); -- 1.7.5.3
WARNING: multiple messages have this Message-ID (diff)
From: Avi Kivity <avi@redhat.com> To: Anthony Liguori <anthony@codemonkey.ws>, qemu-devel@nongnu.org Cc: kvm@vger.kernel.org Subject: [Qemu-devel] [PATCH v2 14/24] stellaris_enet: convert to memory API Date: Mon, 15 Aug 2011 17:17:28 +0300 [thread overview] Message-ID: <1313417858-6454-15-git-send-email-avi@redhat.com> (raw) In-Reply-To: <1313417858-6454-1-git-send-email-avi@redhat.com> Signed-off-by: Avi Kivity <avi@redhat.com> --- hw/stellaris_enet.c | 29 ++++++++++++----------------- 1 files changed, 12 insertions(+), 17 deletions(-) diff --git a/hw/stellaris_enet.c b/hw/stellaris_enet.c index 1291931..9f1f37a 100644 --- a/hw/stellaris_enet.c +++ b/hw/stellaris_enet.c @@ -69,7 +69,7 @@ typedef struct { NICState *nic; NICConf conf; qemu_irq irq; - int mmio_index; + MemoryRegion mmio; } stellaris_enet_state; static void stellaris_enet_update(stellaris_enet_state *s) @@ -130,7 +130,8 @@ static int stellaris_enet_can_receive(VLANClientState *nc) return (s->np < 31); } -static uint32_t stellaris_enet_read(void *opaque, target_phys_addr_t offset) +static uint64_t stellaris_enet_read(void *opaque, target_phys_addr_t offset, + unsigned size) { stellaris_enet_state *s = (stellaris_enet_state *)opaque; uint32_t val; @@ -198,7 +199,7 @@ static uint32_t stellaris_enet_read(void *opaque, target_phys_addr_t offset) } static void stellaris_enet_write(void *opaque, target_phys_addr_t offset, - uint32_t value) + uint64_t value, unsigned size) { stellaris_enet_state *s = (stellaris_enet_state *)opaque; @@ -303,17 +304,12 @@ static void stellaris_enet_write(void *opaque, target_phys_addr_t offset, } } -static CPUReadMemoryFunc * const stellaris_enet_readfn[] = { - stellaris_enet_read, - stellaris_enet_read, - stellaris_enet_read +static const MemoryRegionOps stellaris_enet_ops = { + .read = stellaris_enet_read, + .write = stellaris_enet_write, + .endianness = DEVICE_NATIVE_ENDIAN, }; -static CPUWriteMemoryFunc * const stellaris_enet_writefn[] = { - stellaris_enet_write, - stellaris_enet_write, - stellaris_enet_write -}; static void stellaris_enet_reset(stellaris_enet_state *s) { s->mdv = 0x80; @@ -391,7 +387,7 @@ static void stellaris_enet_cleanup(VLANClientState *nc) unregister_savevm(&s->busdev.qdev, "stellaris_enet", s); - cpu_unregister_io_memory(s->mmio_index); + memory_region_destroy(&s->mmio); qemu_free(s); } @@ -408,10 +404,9 @@ static int stellaris_enet_init(SysBusDevice *dev) { stellaris_enet_state *s = FROM_SYSBUS(stellaris_enet_state, dev); - s->mmio_index = cpu_register_io_memory(stellaris_enet_readfn, - stellaris_enet_writefn, s, - DEVICE_NATIVE_ENDIAN); - sysbus_init_mmio(dev, 0x1000, s->mmio_index); + memory_region_init_io(&s->mmio, &stellaris_enet_ops, s, "stellaris_enet", + 0x1000); + sysbus_init_mmio_region(dev, &s->mmio); sysbus_init_irq(dev, &s->irq); qemu_macaddr_default_if_unset(&s->conf.macaddr); -- 1.7.5.3
next prev parent reply other threads:[~2011-08-15 14:17 UTC|newest] Thread overview: 53+ messages / expand[flat|nested] mbox.gz Atom feed top 2011-08-15 14:17 [PATCH v2 00/24] Memory API batch 4: more conversions Avi Kivity 2011-08-15 14:17 ` [Qemu-devel] " Avi Kivity 2011-08-15 14:17 ` [PATCH v2 01/24] apb_pci: convert to memory API Avi Kivity 2011-08-15 14:17 ` [Qemu-devel] " Avi Kivity 2011-08-15 14:17 ` [PATCH v2 02/24] apic: " Avi Kivity 2011-08-15 14:17 ` [Qemu-devel] " Avi Kivity 2011-08-15 14:17 ` [PATCH v2 03/24] arm_gic: " Avi Kivity 2011-08-15 14:17 ` [Qemu-devel] " Avi Kivity 2011-08-15 14:17 ` [PATCH v2 04/24] arm_sysctl: " Avi Kivity 2011-08-15 14:17 ` [Qemu-devel] " Avi Kivity 2011-08-15 14:17 ` [PATCH v2 05/24] arm_timer: " Avi Kivity 2011-08-15 14:17 ` [Qemu-devel] " Avi Kivity 2011-08-15 14:17 ` [PATCH v2 06/24] armv7m: " Avi Kivity 2011-08-15 14:17 ` [Qemu-devel] " Avi Kivity 2011-08-15 14:17 ` [PATCH v2 07/24] gt64xxx.c: " Avi Kivity 2011-08-15 14:17 ` [Qemu-devel] " Avi Kivity 2011-08-15 14:17 ` [PATCH v2 08/24] tusb6010: move declarations to new file tusb6010.h Avi Kivity 2011-08-15 14:17 ` [Qemu-devel] " Avi Kivity 2011-08-15 14:17 ` [PATCH v2 09/24] omap_gpmc/nseries/tusb6010: convert to memory API Avi Kivity 2011-08-15 14:17 ` [Qemu-devel] " Avi Kivity 2011-08-15 14:17 ` [PATCH v2 10/24] onenand: " Avi Kivity 2011-08-15 14:17 ` [Qemu-devel] " Avi Kivity 2011-08-15 14:17 ` [PATCH v2 11/24] pcie_host: " Avi Kivity 2011-08-15 14:17 ` [Qemu-devel] " Avi Kivity 2011-08-15 14:17 ` [PATCH v2 12/24] ppc405_uc: " Avi Kivity 2011-08-15 14:17 ` [Qemu-devel] " Avi Kivity 2011-08-15 14:17 ` [PATCH v2 13/24] ppc4xx_sdram: " Avi Kivity 2011-08-15 14:17 ` [Qemu-devel] " Avi Kivity 2011-08-15 14:17 ` Avi Kivity [this message] 2011-08-15 14:17 ` [Qemu-devel] [PATCH v2 14/24] stellaris_enet: " Avi Kivity 2011-08-15 14:17 ` [PATCH v2 15/24] sysbus: add a variant of sysbus_init_mmio_cb with an unmap callback Avi Kivity 2011-08-15 14:17 ` [Qemu-devel] " Avi Kivity 2011-08-15 14:17 ` [PATCH v2 16/24] sh_pci: convert to memory API Avi Kivity 2011-08-15 14:17 ` [Qemu-devel] " Avi Kivity 2011-08-15 14:17 ` [PATCH v2 17/24] arm11mpcore: use sysbus_init_mmio_cb2 Avi Kivity 2011-08-15 14:17 ` [Qemu-devel] " Avi Kivity 2011-08-15 14:17 ` [PATCH v2 18/24] versatile_pci: convert to memory API Avi Kivity 2011-08-15 14:17 ` [Qemu-devel] " Avi Kivity 2011-08-15 14:17 ` [PATCH v2 19/24] ppce500_pci: convert to sysbus_init_mmio_cb2() Avi Kivity 2011-08-15 14:17 ` [Qemu-devel] " Avi Kivity 2011-08-15 14:17 ` [PATCH v2 20/24] sysbus: remove sysbus_init_mmio_cb() Avi Kivity 2011-08-15 14:17 ` [Qemu-devel] " Avi Kivity 2011-08-15 14:17 ` [PATCH v2 21/24] isa: add isa_address_space() Avi Kivity 2011-08-15 14:17 ` [Qemu-devel] " Avi Kivity 2011-08-15 14:17 ` [PATCH v2 22/24] pci: add pci_address_space() Avi Kivity 2011-08-15 14:17 ` [Qemu-devel] " Avi Kivity 2011-08-15 14:17 ` [PATCH v2 23/24] vga: drop get_system_memory() from vga devices and derivatives Avi Kivity 2011-08-15 14:17 ` [Qemu-devel] " Avi Kivity 2011-08-15 14:17 ` [PATCH v2 24/24] 440fx: fix PAM, PCI holes Avi Kivity 2011-08-15 14:17 ` [Qemu-devel] " Avi Kivity 2011-08-22 7:38 ` [PATCH v2 00/24] Memory API batch 4: more conversions Avi Kivity 2011-08-22 7:38 ` [Qemu-devel] " Avi Kivity 2011-08-22 16:33 ` Anthony Liguori
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=1313417858-6454-15-git-send-email-avi@redhat.com \ --to=avi@redhat.com \ --cc=anthony@codemonkey.ws \ --cc=kvm@vger.kernel.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: linkBe sure your reply has a Subject: header at the top and a blank line before the message body.
This is an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.