aboutsummaryrefslogtreecommitdiffstats
path: root/extras
diff options
context:
space:
mode:
authorJohn Weekes <lists.xen@nuclearfallout.net>2011-01-27 09:37:19 +0000
committerJohn Weekes <lists.xen@nuclearfallout.net>2011-01-27 09:37:19 +0000
commitb920b2c76176ef8850806fb578a4619f1a83e51f (patch)
tree1ab56cb909504ef142bf15f3e19e71ab77c30bc2 /extras
parente948bb957130471f5725dce424a6daa288a10e73 (diff)
downloadxen-b920b2c76176ef8850806fb578a4619f1a83e51f.tar.gz
xen-b920b2c76176ef8850806fb578a4619f1a83e51f.tar.bz2
xen-b920b2c76176ef8850806fb578a4619f1a83e51f.zip
minios: Fix 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 <lists.xen@nuclearfallout.net> Acked-by: Stefano Stabellini <stefano.stabellini@eu.citrix.com>
Diffstat (limited to 'extras')
-rw-r--r--extras/mini-os/lib/sys.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/extras/mini-os/lib/sys.c b/extras/mini-os/lib/sys.c
index 7a49886e2d..b7b3aff50a 100644
--- a/extras/mini-os/lib/sys.c
+++ b/extras/mini-os/lib/sys.c
@@ -178,10 +178,10 @@ int posix_openpt(int flags)
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 @@ int write(int fd, const void *buf, size_t nbytes)
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;
}