This commit is contained in:
committed by
Git OBS Bridge
parent
8ae8ea2a74
commit
f5d6338f4d
24
blktap.patch
24
blktap.patch
@@ -1,11 +1,11 @@
|
||||
bug #239173
|
||||
bug #242953
|
||||
|
||||
Index: xen-3.2.1-testing/tools/python/xen/xend/XendDomainInfo.py
|
||||
Index: xen-3.3.0-testing/tools/python/xen/xend/XendDomainInfo.py
|
||||
===================================================================
|
||||
--- xen-3.2.1-testing.orig/tools/python/xen/xend/XendDomainInfo.py
|
||||
+++ xen-3.2.1-testing/tools/python/xen/xend/XendDomainInfo.py
|
||||
@@ -2150,7 +2150,7 @@ class XendDomainInfo:
|
||||
--- xen-3.3.0-testing.orig/tools/python/xen/xend/XendDomainInfo.py
|
||||
+++ xen-3.3.0-testing/tools/python/xen/xend/XendDomainInfo.py
|
||||
@@ -2586,7 +2586,7 @@ class XendDomainInfo:
|
||||
(fn, BOOTLOADER_LOOPBACK_DEVICE))
|
||||
|
||||
vbd = {
|
||||
@@ -14,11 +14,11 @@ Index: xen-3.2.1-testing/tools/python/xen/xend/XendDomainInfo.py
|
||||
'device': BOOTLOADER_LOOPBACK_DEVICE,
|
||||
}
|
||||
|
||||
Index: xen-3.2.1-testing/tools/ioemu/xenstore.c
|
||||
Index: xen-3.3.0-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
|
||||
--- xen-3.3.0-testing.orig/tools/ioemu/xenstore.c
|
||||
+++ xen-3.3.0-testing/tools/ioemu/xenstore.c
|
||||
@@ -85,9 +85,9 @@ void xenstore_parse_domain_config(int hv
|
||||
{
|
||||
char **e = NULL;
|
||||
char *buf = NULL, *path;
|
||||
@@ -27,10 +27,10 @@ Index: xen-3.2.1-testing/tools/ioemu/xenstore.c
|
||||
*dev = NULL, *params = NULL, *type = NULL, *drv = NULL;
|
||||
- int i, is_scsi, is_hdN = 0;
|
||||
+ int i, is_scsi, is_tap, is_hdN = 0;
|
||||
unsigned int len, num, hd_index;
|
||||
unsigned int len, num, hd_index, pci_devid = 0;
|
||||
BlockDriverState *bs;
|
||||
|
||||
@@ -118,6 +118,14 @@ void xenstore_parse_domain_config(int do
|
||||
BlockDriver *format;
|
||||
@@ -122,6 +122,14 @@ void xenstore_parse_domain_config(int hv
|
||||
bpath = xs_read(xsh, XBT_NULL, buf, &len);
|
||||
if (bpath == NULL)
|
||||
continue;
|
||||
@@ -45,7 +45,7 @@ Index: xen-3.2.1-testing/tools/ioemu/xenstore.c
|
||||
/* read the name of the device */
|
||||
if (pasprintf(&buf, "%s/dev", bpath) == -1)
|
||||
continue;
|
||||
@@ -262,6 +270,7 @@ void xenstore_parse_domain_config(int do
|
||||
@@ -364,6 +372,7 @@ void xenstore_parse_domain_config(int hv
|
||||
free(type);
|
||||
free(params);
|
||||
free(dev);
|
||||
|
Reference in New Issue
Block a user