Samuel Thibault
2008-Apr-02 10:57 UTC
[Xen-devel] [PATCH] stubdom: warn about disabled features
stubdom: warn about disabled features
Signed-off-by: Samuel Thibault <samuel.thibault@eu.citrix.com>
diff -r 59d2638a7243 tools/ioemu/vl.c
--- a/tools/ioemu/vl.c Tue Apr 01 18:06:20 2008 +0100
+++ b/tools/ioemu/vl.c Wed Apr 02 11:54:16 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 59d2638a7243 tools/ioemu/xenstore.c
--- a/tools/ioemu/xenstore.c Tue Apr 01 18:06:20 2008 +0100
+++ b/tools/ioemu/xenstore.c Wed Apr 02 11:54:16 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-devel mailing list
Xen-devel@lists.xensource.com
http://lists.xensource.com/xen-devel