ia64/xen-unstable

view tools/ioemu/patches/qemu-bugfixes @ 10806:4c2a281cd1e7

[qemu] sync patches and add file missing from cset 10738:42aa63188a88

Signed-off-by: Christian Limpach <Christian.Limpach@xensource.com>
author chris@kneesaa.uk.xensource.com
date Wed Jul 26 14:38:00 2006 +0100 (2006-07-26)
parents b450f21472a0
children f3d6a5281617
line source
1 Index: ioemu/console.c
2 ===================================================================
3 --- ioemu.orig/console.c 2006-07-26 13:39:11.999009495 +0100
4 +++ ioemu/console.c 2006-07-26 14:15:19.413719225 +0100
5 @@ -449,7 +449,7 @@
6 c++;
7 }
8 }
9 - free(s->cells);
10 + qemu_free(s->cells);
11 s->cells = cells;
12 }
14 @@ -954,11 +954,21 @@
15 return !active_console->text_console;
16 }
18 +void set_color_table(DisplayState *ds)
19 +{
20 + int i, j;
21 + for(j = 0; j < 2; j++) {
22 + for(i = 0; i < 8; i++) {
23 + color_table[j][i] =
24 + col_expand(ds, vga_get_color(ds, color_table_rgb[j][i]));
25 + }
26 + }
27 +}
28 +
29 CharDriverState *text_console_init(DisplayState *ds)
30 {
31 CharDriverState *chr;
32 TextConsole *s;
33 - int i,j;
34 static int color_inited;
36 chr = qemu_mallocz(sizeof(CharDriverState));
37 @@ -976,12 +986,7 @@
39 if (!color_inited) {
40 color_inited = 1;
41 - for(j = 0; j < 2; j++) {
42 - for(i = 0; i < 8; i++) {
43 - color_table[j][i] = col_expand(s->ds,
44 - vga_get_color(s->ds, color_table_rgb[j][i]));
45 - }
46 - }
47 + set_color_table(ds);
48 }
49 s->y_displayed = 0;
50 s->y_base = 0;
51 Index: ioemu/usb-linux.c
52 ===================================================================
53 --- ioemu.orig/usb-linux.c 2006-07-26 13:39:11.999009495 +0100
54 +++ ioemu/usb-linux.c 2006-07-26 13:39:16.622514851 +0100
55 @@ -26,6 +26,7 @@
56 #if defined(__linux__)
57 #include <dirent.h>
58 #include <sys/ioctl.h>
59 +#define __user /* new versions of usbdevice_fs.h use this private attribute */
60 #include <linux/usbdevice_fs.h>
61 #include <linux/version.h>