[Qemu-devel] [patch] unbreak linux-user builds

[Qemu-devel] [patch] unbreak linux-user builds

[Gerd Hoffmann]

[-- Attachment #1: Type: text/plain, Size: 40 bytes --]

$subject says all

please apply,
  Gerd

[-- Attachment #2: 0001-linux-user-add-qemu_realloc-implementation-to-unb.patch --]
[-- Type: text/plain, Size: 1045 bytes --]

>From b0dbc4afae21c0f8fb9c6ec509fd07515307fc6d Mon Sep 17 00:00:00 2001
From: Gerd Hoffmann <kraxel@redhat.com>
Date: Fri, 23 Jan 2009 12:49:00 +0100
Subject: [PATCH 1/3] linux-user: add qemu_realloc() implementation to unbreak the build.


Signed-off-by: Gerd Hoffmann <kraxel@redhat.com>
---
 linux-user/mmap.c |   13 +++++++++++++
 1 files changed, 13 insertions(+), 0 deletions(-)

diff --git a/linux-user/mmap.c b/linux-user/mmap.c
index 8e81cde..d0fc3e3 100644
--- a/linux-user/mmap.c
+++ b/linux-user/mmap.c
@@ -123,6 +123,19 @@ void qemu_free(void *ptr)
     munmap(p, *p);
 }
 
+void *qemu_realloc(void *ptr, size_t size)
+{
+    size_t old_size, copy;
+    void *new_ptr;
+
+    old_size = *(size_t *)((char *)ptr - 16);
+    copy = old_size < size ? old_size : size;
+    new_ptr = qemu_malloc(size);
+    memcpy(new_ptr, ptr, copy);
+    qemu_free(ptr);
+    return new_ptr;
+}
+
 /* NOTE: all the constants are the HOST ones, but addresses are target. */
 int target_mprotect(abi_ulong start, abi_ulong len, int prot)
 {
-- 
1.6.1

Re: [Qemu-devel] [patch] unbreak linux-user builds

[Anthony Liguori]

Gerd Hoffmann wrote:
> $subject says all
>
> please apply,
>   Gerd
>   
Applied.  Thanks.

Regards,

Anthony Liguori

Re: [Qemu-devel] [patch] unbreak linux-user builds

[malc]

On Fri, 23 Jan 2009, Anthony Liguori wrote:

> Gerd Hoffmann wrote:
>> $subject says all
>> 
>> please apply,
>>   Gerd
>> 
> Applied.  Thanks.
>

This breaks the contract that qemu_realloc in qemu-malloc.c makes (by
calling system realloc and lacking any documentation), namely that
calling qemu_realloc with NULL ptr is equivavlent to malloc...

-- 
mailto:av1474@comtv.ru