This commit is contained in:
committed by
Git OBS Bridge
parent
0ef5182655
commit
9c16971e0e
@@ -1,7 +1,7 @@
|
||||
Index: xen-3.2-testing/tools/python/xen/xend/server/HalDaemon.py
|
||||
Index: xen-3.2.1-testing/tools/python/xen/xend/server/HalDaemon.py
|
||||
===================================================================
|
||||
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
|
||||
+++ xen-3.2-testing/tools/python/xen/xend/server/HalDaemon.py 2008-02-29 08:11:00.000000000 -0700
|
||||
--- /dev/null
|
||||
+++ xen-3.2.1-testing/tools/python/xen/xend/server/HalDaemon.py
|
||||
@@ -0,0 +1,238 @@
|
||||
+#!/usr/bin/env python
|
||||
+# -*- mode: python; -*-
|
||||
@@ -241,10 +241,10 @@ Index: xen-3.2-testing/tools/python/xen/xend/server/HalDaemon.py
|
||||
+ print 'Falling off end'
|
||||
+
|
||||
+
|
||||
Index: xen-3.2-testing/tools/python/xen/xend/server/Hald.py
|
||||
Index: xen-3.2.1-testing/tools/python/xen/xend/server/Hald.py
|
||||
===================================================================
|
||||
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
|
||||
+++ xen-3.2-testing/tools/python/xen/xend/server/Hald.py 2008-02-29 08:11:00.000000000 -0700
|
||||
--- /dev/null
|
||||
+++ xen-3.2.1-testing/tools/python/xen/xend/server/Hald.py
|
||||
@@ -0,0 +1,125 @@
|
||||
+#============================================================================
|
||||
+# This library is free software; you can redistribute it and/or
|
||||
@@ -371,11 +371,11 @@ Index: xen-3.2-testing/tools/python/xen/xend/server/Hald.py
|
||||
+ watcher.run()
|
||||
+ time.sleep(10)
|
||||
+ watcher.shutdown()
|
||||
Index: xen-3.2-testing/tools/python/xen/xend/server/SrvServer.py
|
||||
Index: xen-3.2.1-testing/tools/python/xen/xend/server/SrvServer.py
|
||||
===================================================================
|
||||
--- xen-3.2-testing.orig/tools/python/xen/xend/server/SrvServer.py 2008-01-16 13:19:05.000000000 -0700
|
||||
+++ xen-3.2-testing/tools/python/xen/xend/server/SrvServer.py 2008-02-29 08:11:00.000000000 -0700
|
||||
@@ -56,6 +56,7 @@
|
||||
--- xen-3.2.1-testing.orig/tools/python/xen/xend/server/SrvServer.py
|
||||
+++ xen-3.2.1-testing/tools/python/xen/xend/server/SrvServer.py
|
||||
@@ -56,6 +56,7 @@ from xen.web.SrvDir import SrvDir
|
||||
|
||||
from SrvRoot import SrvRoot
|
||||
from XMLRPCServer import XMLRPCServer
|
||||
@@ -383,7 +383,7 @@ Index: xen-3.2-testing/tools/python/xen/xend/server/SrvServer.py
|
||||
|
||||
xoptions = XendOptions.instance()
|
||||
|
||||
@@ -245,6 +246,8 @@
|
||||
@@ -245,6 +246,8 @@ def _loadConfig(servers, root, reload):
|
||||
if xoptions.get_xend_unix_xmlrpc_server():
|
||||
servers.add(XMLRPCServer(XendAPI.AUTH_PAM, False))
|
||||
|
||||
@@ -392,12 +392,12 @@ Index: xen-3.2-testing/tools/python/xen/xend/server/SrvServer.py
|
||||
|
||||
def create():
|
||||
root = SrvDir()
|
||||
Index: xen-3.2-testing/tools/ioemu/xenstore.c
|
||||
Index: xen-3.2.1-testing/tools/ioemu/xenstore.c
|
||||
===================================================================
|
||||
--- xen-3.2-testing.orig/tools/ioemu/xenstore.c 2008-02-29 08:10:59.000000000 -0700
|
||||
+++ xen-3.2-testing/tools/ioemu/xenstore.c 2008-02-29 08:11:38.000000000 -0700
|
||||
@@ -216,6 +216,13 @@
|
||||
bdrv_set_type_hint(bs_table[hd_index], BDRV_TYPE_CDROM);
|
||||
--- xen-3.2.1-testing.orig/tools/ioemu/xenstore.c
|
||||
+++ xen-3.2.1-testing/tools/ioemu/xenstore.c
|
||||
@@ -217,6 +217,13 @@ void xenstore_parse_domain_config(int do
|
||||
bdrv_set_type_hint(bs, BDRV_TYPE_CDROM);
|
||||
if (pasprintf(&buf, "%s/params", bpath) != -1)
|
||||
xs_watch(xsh, buf, dev);
|
||||
+ /* if pyhsical put a watch on media-present after creating it */
|
||||
@@ -408,9 +408,9 @@ Index: xen-3.2-testing/tools/ioemu/xenstore.c
|
||||
+ }
|
||||
+ }
|
||||
}
|
||||
|
||||
/* open device now if media present */
|
||||
if (params[0]) {
|
||||
@@ -417,6 +424,50 @@
|
||||
@@ -418,6 +425,50 @@ void xenstore_record_dm_state(char *stat
|
||||
free(path);
|
||||
}
|
||||
|
||||
@@ -461,7 +461,7 @@ Index: xen-3.2-testing/tools/ioemu/xenstore.c
|
||||
void xenstore_process_event(void *opaque)
|
||||
{
|
||||
char **vec, *offset, *bpath = NULL, *buf = NULL, *drv = NULL, *image = NULL;
|
||||
@@ -436,6 +487,11 @@
|
||||
@@ -437,6 +488,11 @@ void xenstore_process_event(void *opaque
|
||||
goto out;
|
||||
}
|
||||
|
||||
@@ -473,11 +473,11 @@ Index: xen-3.2-testing/tools/ioemu/xenstore.c
|
||||
if (strncmp(vec[XS_WATCH_TOKEN], "hd", 2) ||
|
||||
strlen(vec[XS_WATCH_TOKEN]) != 3)
|
||||
goto out;
|
||||
Index: xen-3.2-testing/tools/ioemu/hw/ide.c
|
||||
Index: xen-3.2.1-testing/tools/ioemu/hw/ide.c
|
||||
===================================================================
|
||||
--- xen-3.2-testing.orig/tools/ioemu/hw/ide.c 2008-02-29 08:11:33.000000000 -0700
|
||||
+++ xen-3.2-testing/tools/ioemu/hw/ide.c 2008-02-29 08:16:50.000000000 -0700
|
||||
@@ -350,6 +350,7 @@
|
||||
--- xen-3.2.1-testing.orig/tools/ioemu/hw/ide.c
|
||||
+++ xen-3.2.1-testing/tools/ioemu/hw/ide.c
|
||||
@@ -350,6 +350,7 @@ typedef struct IDEState {
|
||||
uint8_t io_buffer[MAX_MULT_SECTORS*512 + 4];
|
||||
QEMUTimer *sector_write_timer; /* only used for win2k instal hack */
|
||||
uint32_t irq_count; /* counts IRQs when using win2k install hack */
|
||||
@@ -485,7 +485,7 @@ Index: xen-3.2-testing/tools/ioemu/hw/ide.c
|
||||
} IDEState;
|
||||
|
||||
#define BM_STATUS_DMAING 0x01
|
||||
@@ -1403,8 +1404,15 @@
|
||||
@@ -1405,8 +1406,15 @@ static void ide_atapi_cmd(IDEState *s)
|
||||
switch(s->io_buffer[0]) {
|
||||
case GPCMD_TEST_UNIT_READY:
|
||||
if (bdrv_is_inserted(s->bs)) {
|
||||
|
Reference in New Issue
Block a user