56 lines
2.0 KiB
Diff
56 lines
2.0 KiB
Diff
bug #239173
|
|
bug #242953
|
|
|
|
Index: xen-3.3.1-testing/tools/python/xen/xend/XendDomainInfo.py
|
|
===================================================================
|
|
--- xen-3.3.1-testing.orig/tools/python/xen/xend/XendDomainInfo.py
|
|
+++ xen-3.3.1-testing/tools/python/xen/xend/XendDomainInfo.py
|
|
@@ -2596,7 +2596,7 @@ class XendDomainInfo:
|
|
(fn, BOOTLOADER_LOOPBACK_DEVICE))
|
|
|
|
vbd = {
|
|
- 'mode': 'RO',
|
|
+ 'mode': 'RW',
|
|
'device': BOOTLOADER_LOOPBACK_DEVICE,
|
|
}
|
|
|
|
Index: xen-3.3.1-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
|
|
@@ -151,9 +151,9 @@ void xenstore_parse_domain_config(int hv
|
|
{
|
|
char **e = NULL;
|
|
char *buf = NULL, *path;
|
|
- char *fpath = NULL, *bpath = NULL,
|
|
+ char *fpath = NULL, *bpath = NULL, *btype = NULL,
|
|
*dev = NULL, *params = NULL, *type = NULL, *drv = NULL;
|
|
- int i, any_hdN = 0, ret;
|
|
+ int i, any_hdN = 0, ret, is_tap;
|
|
unsigned int len, num, hd_index, pci_devid = 0;
|
|
BlockDriverState *bs;
|
|
BlockDriver *format;
|
|
@@ -188,6 +188,14 @@ void xenstore_parse_domain_config(int hv
|
|
bpath = xs_read(xsh, XBT_NULL, buf, &len);
|
|
if (bpath == NULL)
|
|
continue;
|
|
+ /* check to see if type is tap or not */
|
|
+ if (pasprintf(&buf, "%s/type", bpath) == -1)
|
|
+ continue;
|
|
+ free(btype);
|
|
+ btype = xs_read(xsh, XBT_NULL, buf, &len);
|
|
+ if (btype == NULL)
|
|
+ continue;
|
|
+ is_tap = !strncmp(btype, "tap", 3);
|
|
/* read the name of the device */
|
|
if (pasprintf(&buf, "%s/dev", bpath) == -1)
|
|
continue;
|
|
@@ -429,6 +437,7 @@ void xenstore_parse_domain_config(int hv
|
|
free(type);
|
|
free(params);
|
|
free(dev);
|
|
+ free(btype);
|
|
free(bpath);
|
|
free(buf);
|
|
free(path);
|