ia64/xen-unstable

changeset 10968:1cbf49c018cb

[qemu patches] Update patches for changeset 10939:5980fb28b050.

Signed-off-by: Christian Limpach <Christian.Limpach@xensource.com>
author chris@kneesaa.uk.xensource.com
date Fri Aug 04 10:57:13 2006 +0100 (2006-08-04)
parents 5980fb28b050
children 253498168658
files tools/ioemu/patches/xen-mm
line diff
     1.1 --- a/tools/ioemu/patches/xen-mm	Fri Aug 04 10:56:53 2006 +0100
     1.2 +++ b/tools/ioemu/patches/xen-mm	Fri Aug 04 10:57:13 2006 +0100
     1.3 @@ -1,7 +1,7 @@
     1.4  Index: ioemu/hw/pc.c
     1.5  ===================================================================
     1.6 ---- ioemu.orig/hw/pc.c	2006-07-27 11:16:57.678475515 +0100
     1.7 -+++ ioemu/hw/pc.c	2006-07-27 11:16:58.447390396 +0100
     1.8 +--- ioemu.orig/hw/pc.c	2006-08-04 10:53:02.019794255 +0100
     1.9 ++++ ioemu/hw/pc.c	2006-08-04 10:54:56.876531492 +0100
    1.10  @@ -639,7 +639,9 @@
    1.11       }
    1.12   
    1.13 @@ -25,8 +25,8 @@ Index: ioemu/hw/pc.c
    1.14       isa_bios_size = bios_size;
    1.15  Index: ioemu/vl.c
    1.16  ===================================================================
    1.17 ---- ioemu.orig/vl.c	2006-07-27 11:16:58.296407110 +0100
    1.18 -+++ ioemu/vl.c	2006-07-27 11:16:58.450390064 +0100
    1.19 +--- ioemu.orig/vl.c	2006-08-04 10:53:02.472741926 +0100
    1.20 ++++ ioemu/vl.c	2006-08-04 10:55:48.361590787 +0100
    1.21  @@ -159,6 +159,8 @@
    1.22   #define MAX_CPUS 1
    1.23   #endif
    1.24 @@ -60,7 +60,7 @@ Index: ioemu/vl.c
    1.25                   break;
    1.26               case QEMU_OPTION_l:
    1.27                   {
    1.28 -@@ -5560,6 +5567,39 @@
    1.29 +@@ -5560,6 +5567,41 @@
    1.30       /* init the memory */
    1.31       phys_ram_size = ram_size + vga_ram_size + bios_size;
    1.32   
    1.33 @@ -95,12 +95,14 @@ Index: ioemu/vl.c
    1.34  +    fprintf(logfile, "shared page at pfn:%lx, mfn: %"PRIx64"\n", nr_pages - 1,
    1.35  +            (uint64_t)(page_array[nr_pages - 1]));
    1.36  +
    1.37 ++    free(page_array);
    1.38 ++
    1.39  +#else  /* !CONFIG_DM */
    1.40  +
    1.41   #ifdef CONFIG_SOFTMMU
    1.42       phys_ram_base = qemu_vmalloc(phys_ram_size);
    1.43       if (!phys_ram_base) {
    1.44 -@@ -5600,6 +5640,8 @@
    1.45 +@@ -5600,6 +5642,8 @@
    1.46       }
    1.47   #endif
    1.48