Merge commit '84b89d782f03b99770759f1d9d6e4e95a2641c35' into upstream-merge

* commit '84b89d782f03b99770759f1d9d6e4e95a2641c35':
  Add qemu_ram_alloc_from_ptr function
  microblaze: Fix the target version of stat64 struct
  audio/sdl: return on error
  mips: Add support for VInt and VEIC irq modes
  audio/sdl: be more anal about errors
  audio: make audio_pt_init block all signals
  sparc32: use FW_CFG_CMDLINE_SIZE
  ide: Avoid canceling IDE DMA
  block: Change bdrv_eject() not to drop the image
  block: Fix bdrv_has_zero_init
  block migration: replace tabs by spaces.
  loadvm: improve tests before bdrv_snapshot_goto()
  block: Change bdrv_commit to handle multiple sectors at once
  fix last cpu timer initialization

Conflicts:
	cpu-common.h
	exec.c

Signed-off-by: Marcelo Tosatti <mtosatti@redhat.com>

1 files changed, 1 insertions, 1 deletions

diff --git a/exec.c b/exec.c
index b14bad93f..dbeab5a7c 100644
--- a/exec.c
+++ b/exec.c
@@ -2824,7 +2824,7 @@ static ram_addr_t last_ram_offset(void)
     return last;
 }
 
-ram_addr_t qemu_ram_map(DeviceState *dev, const char *name,
+ram_addr_t qemu_ram_alloc_from_ptr(DeviceState *dev, const char *name,
                         ram_addr_t size, void *host)
 {
     RAMBlock *new_block, *block;