Skip to contentSkip to conversation

Fix minios bug/build problem introduced in c/s 22799

PATCH New John Weekes 1 participant 1 message Jan 26, 2011

lore
Share & tools
lore

John Weekes

author
#0 lore raw

PATCH 1/1 Fix minios bug/build problem introduced in c/s 22799

With "debug=n", "make stubdom" currently fails in xen-unstable. This patch addresses this through minor fixups.

Signed-off-by John Weekes<[email protected]>
Acked-by Stefano Stabellini<[email protected]>
extras/mini-os/lib/sys.c Tue Jan 25 15:18:05 2011 -0500 renamed from extras/mini-os/lib/sys.c Fri Jan 21 18:06:23 2011 +0000 +3 -3
diff -r b59f04eb8978 extras/mini-os/lib/sys.c
@@ -178,10 +178,10 @@
     return(dev->fd);
 }
 
-int open_savefile(char *path, int save)
+int open_savefile(const char *path, int save)
 {
     struct consfront_dev *dev;
-    char *nodename[64];
+    char nodename[64];
 
     snprintf(nodename, sizeof(nodename), "device/console/%d", save ? SAVE_CONSOLE : RESTORE_CONSOLE);
 

@@ -286,7 +286,7 @@
                 while (nbytes>  0) {
                     ret = xencons_ring_send(files[fd].cons.dev, (char *)buf, nbytes);
                     nbytes -= ret;
-                    buf += ret;
+                    buf = (char *)buf + ret;
                 }
                 return tot - nbytes;
             }
extras/mini-os/lib/sys.c Tue Jan 25 15:18:05 2011 -0500 renamed from extras/mini-os/lib/sys.c Fri Jan 21 18:06:23 2011 +0000 +3 -3
diff -r b59f04eb8978 extras/mini-os/lib/sys.c
@@ -178,10 +178,10 @@
     return(dev->fd);
 }
 
-int open_savefile(char *path, int save)
+int open_savefile(const char *path, int save)
 {
     struct consfront_dev *dev;
-    char *nodename[64];
+    char nodename[64];
 
     snprintf(nodename, sizeof(nodename), "device/console/%d", save ? SAVE_CONSOLE : RESTORE_CONSOLE);
 

@@ -286,7 +286,7 @@
                 while (nbytes > 0) {
                     ret = xencons_ring_send(files[fd].cons.dev, (char *)buf, nbytes);
                     nbytes -= ret;
-                    buf += ret;
+                    buf = (char *)buf + ret;
                 }
                 return tot - nbytes;
             }

_______________________________________________
Xen-devel mailing list
[email protected]
http://lists.xensource.com/xen-devel