This commit is contained in:
committed by
Git OBS Bridge
parent
4790095364
commit
0bb51565d6
@@ -1,7 +1,7 @@
|
||||
Index: xen-3.3.1-testing/tools/python/xen/xend/server/HalDaemon.py
|
||||
Index: xen-3.4.0-testing/tools/python/xen/xend/server/HalDaemon.py
|
||||
===================================================================
|
||||
--- /dev/null
|
||||
+++ xen-3.3.1-testing/tools/python/xen/xend/server/HalDaemon.py
|
||||
+++ xen-3.4.0-testing/tools/python/xen/xend/server/HalDaemon.py
|
||||
@@ -0,0 +1,243 @@
|
||||
+#!/usr/bin/env python
|
||||
+# -*- mode: python; -*-
|
||||
@@ -246,10 +246,10 @@ Index: xen-3.3.1-testing/tools/python/xen/xend/server/HalDaemon.py
|
||||
+ print 'Falling off end'
|
||||
+
|
||||
+
|
||||
Index: xen-3.3.1-testing/tools/python/xen/xend/server/Hald.py
|
||||
Index: xen-3.4.0-testing/tools/python/xen/xend/server/Hald.py
|
||||
===================================================================
|
||||
--- /dev/null
|
||||
+++ xen-3.3.1-testing/tools/python/xen/xend/server/Hald.py
|
||||
+++ xen-3.4.0-testing/tools/python/xen/xend/server/Hald.py
|
||||
@@ -0,0 +1,125 @@
|
||||
+#============================================================================
|
||||
+# This library is free software; you can redistribute it and/or
|
||||
@@ -376,10 +376,10 @@ Index: xen-3.3.1-testing/tools/python/xen/xend/server/Hald.py
|
||||
+ watcher.run()
|
||||
+ time.sleep(10)
|
||||
+ watcher.shutdown()
|
||||
Index: xen-3.3.1-testing/tools/python/xen/xend/server/SrvServer.py
|
||||
Index: xen-3.4.0-testing/tools/python/xen/xend/server/SrvServer.py
|
||||
===================================================================
|
||||
--- xen-3.3.1-testing.orig/tools/python/xen/xend/server/SrvServer.py
|
||||
+++ xen-3.3.1-testing/tools/python/xen/xend/server/SrvServer.py
|
||||
--- xen-3.4.0-testing.orig/tools/python/xen/xend/server/SrvServer.py
|
||||
+++ xen-3.4.0-testing/tools/python/xen/xend/server/SrvServer.py
|
||||
@@ -56,6 +56,7 @@ from xen.web.SrvDir import SrvDir
|
||||
|
||||
from SrvRoot import SrvRoot
|
||||
@@ -397,12 +397,12 @@ Index: xen-3.3.1-testing/tools/python/xen/xend/server/SrvServer.py
|
||||
|
||||
def create():
|
||||
root = SrvDir()
|
||||
Index: xen-3.3.1-testing/tools/ioemu-remote/xenstore.c
|
||||
Index: xen-3.4.0-testing/tools/ioemu-remote/xenstore.c
|
||||
===================================================================
|
||||
--- xen-3.3.1-testing.orig/tools/ioemu-remote/xenstore.c
|
||||
+++ xen-3.3.1-testing/tools/ioemu-remote/xenstore.c
|
||||
@@ -333,6 +333,19 @@ void xenstore_parse_domain_config(int hv
|
||||
if (bdrv_open2(bs, params, 0 /* snapshot */, format) < 0)
|
||||
--- xen-3.4.0-testing.orig/tools/ioemu-remote/xenstore.c
|
||||
+++ xen-3.4.0-testing/tools/ioemu-remote/xenstore.c
|
||||
@@ -503,6 +503,19 @@ void xenstore_parse_domain_config(int hv
|
||||
if (bdrv_open2(bs, params, BDRV_O_CACHE_WB /* snapshot and write-back */, format) < 0)
|
||||
fprintf(stderr, "qemu: could not open vbd '%s' or hard disk image '%s' (drv '%s' format '%s')\n", buf, params, drv ? drv : "?", format ? format->format_name : "0");
|
||||
}
|
||||
+ /* if cdrom pyhsical put a watch on media-present */
|
||||
@@ -420,8 +420,8 @@ Index: xen-3.3.1-testing/tools/ioemu-remote/xenstore.c
|
||||
+ }
|
||||
|
||||
drives_table[nb_drives].bdrv = bs;
|
||||
nb_drives++;
|
||||
@@ -631,6 +644,50 @@ void xenstore_record_dm_state(char *stat
|
||||
drives_table[nb_drives].used = 1;
|
||||
@@ -920,6 +933,50 @@ void xenstore_record_dm_state(const char
|
||||
xenstore_record_dm("state", state);
|
||||
}
|
||||
|
||||
@@ -472,7 +472,7 @@ Index: xen-3.3.1-testing/tools/ioemu-remote/xenstore.c
|
||||
void xenstore_process_event(void *opaque)
|
||||
{
|
||||
char **vec, *offset, *bpath = NULL, *buf = NULL, *drv = NULL, *image = NULL;
|
||||
@@ -650,6 +707,11 @@ void xenstore_process_event(void *opaque
|
||||
@@ -939,6 +996,11 @@ void xenstore_process_event(void *opaque
|
||||
goto out;
|
||||
}
|
||||
|
||||
|
Reference in New Issue
Block a user