qemu-devel
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

[Qemu-devel] [PULL] Memory API fixes - rom/device


From: Avi Kivity
Subject: [Qemu-devel] [PULL] Memory API fixes - rom/device
Date: Sun, 28 Aug 2011 18:52:17 +0300
User-agent: Mozilla/5.0 (X11; Linux x86_64; rv:6.0) Gecko/20110816 Thunderbird/6.0

Anthony, please pull from

  git://git.kernel.org/pub/scm/virt/kvm/qemu-kvm.git memory/core

to receive fixes for the rom/device API - initialize ->ops and a new ->opaque.

Avi Kivity (2):
      memory: fix memory_region_init_rom_device() not initializing ->ops
      memory: add opaque parameter to memory_region_init_rom_device()

 memory.c |    3 +++
 memory.h |    1 +
 2 files changed, 4 insertions(+), 0 deletions(-)

diff --git a/memory.c b/memory.c
index 8e9ac46..1491a39 100644
--- a/memory.c
+++ b/memory.c
@@ -962,11 +962,14 @@ void memory_region_init_alias(MemoryRegion *mr,

 void memory_region_init_rom_device(MemoryRegion *mr,
                                    const MemoryRegionOps *ops,
+                                   void *opaque,
                                    DeviceState *dev,
                                    const char *name,
                                    uint64_t size)
 {
     memory_region_init(mr, name, size);
+    mr->ops = ops;
+    mr->opaque = opaque;
     mr->terminates = true;
     mr->destructor = memory_region_destructor_rom_device;
     mr->ram_addr = qemu_ram_alloc(dev, name, size);
diff --git a/memory.h b/memory.h
index 0553cc7..06b83ae 100644
--- a/memory.h
+++ b/memory.h
@@ -235,6 +235,7 @@ void memory_region_init_alias(MemoryRegion *mr,
  */
 void memory_region_init_rom_device(MemoryRegion *mr,
                                    const MemoryRegionOps *ops,
+                                   void *opaque,
                                    DeviceState *dev, /* FIXME: layering 
violation */
                                    const char *name,
                                    uint64_t size);


--
error compiling committee.c: too many arguments to function




reply via email to

[Prev in Thread] Current Thread [Next in Thread]