Patchwork [RESEND2] exec: Implement qemu_ram_free_from_ptr()

login
register
mail settings
Submitter Alex Williamson
Date May 3, 2011, 6:48 p.m.
Message ID <20110503184404.28731.92590.stgit@s20.home>
Download mbox | patch
Permalink /patch/93883/
State New
Headers show

Comments

Alex Williamson - May 3, 2011, 6:48 p.m.
Required for regions mapped via qemu_ram_alloc_from_ptr().  VFIO
and ivshmem will make use of this to remove mappings when devices
are hot unplugged.

Signed-off-by: Alex Williamson <alex.williamson@redhat.com>
---

Trying to clean out my patch queuer;, I've proposed this twice, Cam
has proposed this once, it's an obvious missing interface.  Please
apply.

 cpu-common.h |    1 +
 exec.c       |   13 +++++++++++++
 2 files changed, 14 insertions(+), 0 deletions(-)
Aurelien Jarno - June 3, 2011, 9:05 p.m.
On Tue, May 03, 2011 at 12:48:09PM -0600, Alex Williamson wrote:
> Required for regions mapped via qemu_ram_alloc_from_ptr().  VFIO
> and ivshmem will make use of this to remove mappings when devices
> are hot unplugged.
> 
> Signed-off-by: Alex Williamson <alex.williamson@redhat.com>
> ---
> 
> Trying to clean out my patch queuer;, I've proposed this twice, Cam
> has proposed this once, it's an obvious missing interface.  Please
> apply.
> 
>  cpu-common.h |    1 +
>  exec.c       |   13 +++++++++++++
>  2 files changed, 14 insertions(+), 0 deletions(-)

Thanks, applied.

> diff --git a/cpu-common.h b/cpu-common.h
> index 96c02ae..db98b6b 100644
> --- a/cpu-common.h
> +++ b/cpu-common.h
> @@ -50,6 +50,7 @@ ram_addr_t qemu_ram_alloc_from_ptr(DeviceState *dev, const char *name,
>                          ram_addr_t size, void *host);
>  ram_addr_t qemu_ram_alloc(DeviceState *dev, const char *name, ram_addr_t size);
>  void qemu_ram_free(ram_addr_t addr);
> +void qemu_ram_free_from_ptr(ram_addr_t addr);
>  void qemu_ram_remap(ram_addr_t addr, ram_addr_t length);
>  /* This should only be used for ram local to a device.  */
>  void *qemu_get_ram_ptr(ram_addr_t addr);
> diff --git a/exec.c b/exec.c
> index a0678a4..1870ee7 100644
> --- a/exec.c
> +++ b/exec.c
> @@ -2954,6 +2954,19 @@ ram_addr_t qemu_ram_alloc(DeviceState *dev, const char *name, ram_addr_t size)
>      return qemu_ram_alloc_from_ptr(dev, name, size, NULL);
>  }
>  
> +void qemu_ram_free_from_ptr(ram_addr_t addr)
> +{
> +    RAMBlock *block;
> +
> +    QLIST_FOREACH(block, &ram_list.blocks, next) {
> +        if (addr == block->offset) {
> +            QLIST_REMOVE(block, next);
> +            qemu_free(block);
> +            return;
> +        }
> +    }
> +}
> +
>  void qemu_ram_free(ram_addr_t addr)
>  {
>      RAMBlock *block;
> 
> 
>

Patch

diff --git a/cpu-common.h b/cpu-common.h
index 96c02ae..db98b6b 100644
--- a/cpu-common.h
+++ b/cpu-common.h
@@ -50,6 +50,7 @@  ram_addr_t qemu_ram_alloc_from_ptr(DeviceState *dev, const char *name,
                         ram_addr_t size, void *host);
 ram_addr_t qemu_ram_alloc(DeviceState *dev, const char *name, ram_addr_t size);
 void qemu_ram_free(ram_addr_t addr);
+void qemu_ram_free_from_ptr(ram_addr_t addr);
 void qemu_ram_remap(ram_addr_t addr, ram_addr_t length);
 /* This should only be used for ram local to a device.  */
 void *qemu_get_ram_ptr(ram_addr_t addr);
diff --git a/exec.c b/exec.c
index a0678a4..1870ee7 100644
--- a/exec.c
+++ b/exec.c
@@ -2954,6 +2954,19 @@  ram_addr_t qemu_ram_alloc(DeviceState *dev, const char *name, ram_addr_t size)
     return qemu_ram_alloc_from_ptr(dev, name, size, NULL);
 }
 
+void qemu_ram_free_from_ptr(ram_addr_t addr)
+{
+    RAMBlock *block;
+
+    QLIST_FOREACH(block, &ram_list.blocks, next) {
+        if (addr == block->offset) {
+            QLIST_REMOVE(block, next);
+            qemu_free(block);
+            return;
+        }
+    }
+}
+
 void qemu_ram_free(ram_addr_t addr)
 {
     RAMBlock *block;