OBS User unknown
2008-03-14 23:07:14 +00:00
committed by Git OBS Bridge
parent 0ef5182655
commit 9c16971e0e
65 changed files with 3459 additions and 1613 deletions

View File

@@ -1,11 +1,11 @@
bug #239173
bug #242953
Index: xen-3.2-testing/tools/python/xen/xend/XendDomainInfo.py
Index: xen-3.2.1-testing/tools/python/xen/xend/XendDomainInfo.py
===================================================================
--- xen-3.2-testing.orig/tools/python/xen/xend/XendDomainInfo.py
+++ xen-3.2-testing/tools/python/xen/xend/XendDomainInfo.py
@@ -2102,7 +2102,7 @@ class XendDomainInfo:
--- xen-3.2.1-testing.orig/tools/python/xen/xend/XendDomainInfo.py
+++ xen-3.2.1-testing/tools/python/xen/xend/XendDomainInfo.py
@@ -2143,7 +2143,7 @@ class XendDomainInfo:
(fn, BOOTLOADER_LOOPBACK_DEVICE))
vbd = {
@@ -14,10 +14,10 @@ Index: xen-3.2-testing/tools/python/xen/xend/XendDomainInfo.py
'device': BOOTLOADER_LOOPBACK_DEVICE,
}
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
+++ xen-3.2-testing/tools/ioemu/xenstore.c
--- xen-3.2.1-testing.orig/tools/ioemu/xenstore.c
+++ xen-3.2.1-testing/tools/ioemu/xenstore.c
@@ -88,9 +88,9 @@ void xenstore_parse_domain_config(int do
{
char **e = NULL;
@@ -28,9 +28,9 @@ Index: xen-3.2-testing/tools/ioemu/xenstore.c
- int i, is_scsi, is_hdN = 0;
+ int i, is_scsi, is_tap, is_hdN = 0;
unsigned int len, num, hd_index;
BlockDriverState *bs;
for(i = 0; i < MAX_DISKS + MAX_SCSI_DISKS; i++)
@@ -117,6 +117,14 @@ void xenstore_parse_domain_config(int do
@@ -118,6 +118,14 @@ void xenstore_parse_domain_config(int do
bpath = xs_read(xsh, XBT_NULL, buf, &len);
if (bpath == NULL)
continue;
@@ -45,7 +45,7 @@ Index: xen-3.2-testing/tools/ioemu/xenstore.c
/* read the name of the device */
if (pasprintf(&buf, "%s/dev", bpath) == -1)
continue;
@@ -251,6 +259,7 @@ void xenstore_parse_domain_config(int do
@@ -252,6 +260,7 @@ void xenstore_parse_domain_config(int do
free(type);
free(params);
free(dev);