# HG changeset patch
# User Keir Fraser <keir.fraser@xxxxxxxxxx>
# Date 1207147612 -3600
# Node ID d48551c66377a6e4006cd8ee360d466600f9c2ad
# Parent 6c83e17c6e896ca768dc36c2590ec593926d61a5
stubdom: warn about disabled features
Signed-off-by: Samuel Thibault <samuel.thibault@xxxxxxxxxxxxx>
---
tools/ioemu/vl.c | 3 ++-
tools/ioemu/xenstore.c | 12 +++++++-----
2 files changed, 9 insertions(+), 6 deletions(-)
diff -r 6c83e17c6e89 -r d48551c66377 tools/ioemu/vl.c
--- a/tools/ioemu/vl.c Wed Apr 02 15:32:13 2008 +0100
+++ b/tools/ioemu/vl.c Wed Apr 02 15:46:52 2008 +0100
@@ -1762,7 +1762,8 @@ static int store_dev_info(char *devName,
CharDriverState *cState, char *storeString)
{
#ifdef CONFIG_STUBDOM
- return 0;
+ fprintf(logfile, "can't store dev %s name for domid %d in %s from a stub
domain\n", devName, domid, storeString);
+ return ENOSYS;
#else
int xc_handle;
struct xs_handle *xs;
diff -r 6c83e17c6e89 -r d48551c66377 tools/ioemu/xenstore.c
--- a/tools/ioemu/xenstore.c Wed Apr 02 15:32:13 2008 +0100
+++ b/tools/ioemu/xenstore.c Wed Apr 02 15:46:52 2008 +0100
@@ -347,10 +347,6 @@ extern int vga_ram_size, bios_size;
void xenstore_process_logdirty_event(void)
{
-#ifdef CONFIG_STUBDOM
- /* XXX we just can't use shm. */
- return;
-#else
char *act;
static char *active_path = NULL;
static char *next_active_path = NULL;
@@ -392,6 +388,12 @@ void xenstore_process_logdirty_event(voi
/* Map the shared-memory segment */
fprintf(logfile, "%s: key=%16.16llx size=%lu\n", __FUNCTION__,
(unsigned long long)key, logdirty_bitmap_size);
+
+#ifdef CONFIG_STUBDOM
+ /* XXX we just can't use shm. */
+ fprintf(logfile, "Log dirty is not implemented in stub domains!\n");
+ return;
+#else
shmid = shmget(key, 2 * logdirty_bitmap_size, S_IRUSR|S_IWUSR);
if (shmid == -1) {
fprintf(logfile, "Log-dirty: shmget failed: segment %16.16llx "
@@ -417,6 +419,7 @@ void xenstore_process_logdirty_event(voi
seg = NULL;
return;
}
+#endif
/* Remember the paths for the next-active and active entries */
if (pasprintf(&active_path,
@@ -453,7 +456,6 @@ void xenstore_process_logdirty_event(voi
/* Ack that we've switched */
xs_write(xsh, XBT_NULL, active_path, act, len);
free(act);
-#endif
}
_______________________________________________
Xen-changelog mailing list
Xen-changelog@xxxxxxxxxxxxxxxxxxx
http://lists.xensource.com/xen-changelog
|
Home