debuggers.hg

view tools/ioemu/patches/qemu-64bit @ 0:7d21f7218375

Exact replica of unstable on 051908 + README-this
author Mukesh Rathor
date Mon May 19 15:34:57 2008 -0700 (2008-05-19)
parents
children
line source
1 Index: ioemu/cpu-all.h
2 ===================================================================
3 --- ioemu.orig/cpu-all.h 2007-05-03 18:38:09.000000000 +0100
4 +++ ioemu/cpu-all.h 2007-05-03 19:00:05.000000000 +0100
5 @@ -830,7 +830,7 @@
7 /* memory API */
9 -extern int phys_ram_size;
10 +extern uint64_t phys_ram_size;
11 extern int phys_ram_fd;
12 extern uint8_t *phys_ram_base;
13 extern uint8_t *phys_ram_dirty;
14 Index: ioemu/hw/pc.c
15 ===================================================================
16 --- ioemu.orig/hw/pc.c 2007-05-03 18:44:07.000000000 +0100
17 +++ ioemu/hw/pc.c 2007-05-03 19:00:05.000000000 +0100
18 @@ -156,7 +156,7 @@
19 }
21 /* hd_table must contain 4 block drivers */
22 -static void cmos_init(int ram_size, int boot_device, BlockDriverState **hd_table)
23 +static void cmos_init(uint64_t ram_size, int boot_device, BlockDriverState **hd_table)
24 {
25 RTCState *s = rtc_state;
26 int val;
27 @@ -445,7 +445,7 @@
28 }
30 /* PC hardware initialisation */
31 -static void pc_init1(int ram_size, int vga_ram_size, int boot_device,
32 +static void pc_init1(uint64_t ram_size, int vga_ram_size, int boot_device,
33 DisplayState *ds, const char **fd_filename, int snapshot,
34 const char *kernel_filename, const char *kernel_cmdline,
35 const char *initrd_filename,
36 @@ -738,7 +738,7 @@
37 #endif
38 }
40 -static void pc_init_pci(int ram_size, int vga_ram_size, int boot_device,
41 +static void pc_init_pci(uint64_t ram_size, int vga_ram_size, int boot_device,
42 DisplayState *ds, const char **fd_filename,
43 int snapshot,
44 const char *kernel_filename,
45 @@ -751,7 +751,7 @@
46 initrd_filename, 1);
47 }
49 -static void pc_init_isa(int ram_size, int vga_ram_size, int boot_device,
50 +static void pc_init_isa(uint64_t ram_size, int vga_ram_size, int boot_device,
51 DisplayState *ds, const char **fd_filename,
52 int snapshot,
53 const char *kernel_filename,
54 Index: ioemu/vl.c
55 ===================================================================
56 --- ioemu.orig/vl.c 2007-05-03 18:57:23.000000000 +0100
57 +++ ioemu/vl.c 2007-05-03 19:00:05.000000000 +0100
58 @@ -132,7 +132,7 @@
59 const char* keyboard_layout = NULL;
60 int64_t ticks_per_sec;
61 int boot_device = 'c';
62 -int ram_size;
63 +uint64_t ram_size;
64 int pit_min_timer_count = 0;
65 int nb_nics;
66 NICInfo nd_table[MAX_NICS];
67 @@ -6818,7 +6818,7 @@
68 help();
69 break;
70 case QEMU_OPTION_m:
71 - ram_size = atoi(optarg) * 1024 * 1024;
72 + ram_size = atol(optarg) * 1024 * 1024;
73 if (ram_size <= 0)
74 help();
75 if (ram_size > PHYS_RAM_MAX_SIZE) {
76 Index: ioemu/vl.h
77 ===================================================================
78 --- ioemu.orig/vl.h 2007-05-03 18:57:23.000000000 +0100
79 +++ ioemu/vl.h 2007-05-03 19:00:05.000000000 +0100
80 @@ -151,7 +151,7 @@
81 extern int xc_handle;
82 extern int domid;
84 -extern int ram_size;
85 +extern uint64_t ram_size;
86 extern int bios_size;
87 extern int rtc_utc;
88 extern int cirrus_vga_enabled;
89 @@ -688,7 +688,7 @@
91 #ifndef QEMU_TOOL
93 -typedef void QEMUMachineInitFunc(int ram_size, int vga_ram_size,
94 +typedef void QEMUMachineInitFunc(uint64_t ram_size, int vga_ram_size,
95 int boot_device,
96 DisplayState *ds, const char **fd_filename, int snapshot,
97 const char *kernel_filename, const char *kernel_cmdline,
98 Index: ioemu/hw/vga.c
99 ===================================================================
100 --- ioemu.orig/hw/vga.c 2007-05-03 18:59:25.000000000 +0100
101 +++ ioemu/hw/vga.c 2007-05-03 19:00:05.000000000 +0100
102 @@ -1379,7 +1379,8 @@
103 static void vga_draw_graphic(VGAState *s, int full_update)
104 {
105 int y1, y, update, page_min, page_max, linesize, y_start, double_scan, mask;
106 - int width, height, shift_control, line_offset, page0, page1, bwidth;
107 + int width, height, shift_control, line_offset, bwidth;
108 + ram_addr_t page0, page1;
109 int disp_width, multi_scan, multi_run;
110 uint8_t *d;
111 uint32_t v, addr1, addr;