f6f3ce5586
OBS-URL: https://build.opensuse.org/package/show/Virtualization/xen?expand=0&rev=bab18b4d77fe039fab5382a8e1a339f4
64 lines
2.2 KiB
Diff
64 lines
2.2 KiB
Diff
Index: xen-3.4.1-testing/tools/ioemu-remote/xenstore.c
|
|
===================================================================
|
|
--- xen-3.4.1-testing.orig/tools/ioemu-remote/xenstore.c
|
|
+++ xen-3.4.1-testing/tools/ioemu-remote/xenstore.c
|
|
@@ -313,7 +313,7 @@ void xenstore_parse_domain_config(int hv
|
|
char *buf = NULL;
|
|
char *fpath = NULL, *bpath = NULL, *btype = NULL,
|
|
*dev = NULL, *params = NULL, *drv = NULL;
|
|
- int i, any_hdN = 0, ret, is_tap;
|
|
+ int i, j, any_hdN = 0, ret, is_tap;
|
|
unsigned int len, num, hd_index, pci_devid = 0;
|
|
BlockDriverState *bs;
|
|
BlockDriver *format;
|
|
@@ -400,12 +400,7 @@ void xenstore_parse_domain_config(int hv
|
|
continue;
|
|
free(danger_type);
|
|
danger_type = xs_read(xsh, XBT_NULL, danger_buf, &len);
|
|
- if (pasprintf(&buf, "%s/params", bpath) == -1)
|
|
- continue;
|
|
- free(params);
|
|
- params = xs_read(xsh, XBT_NULL, buf, &len);
|
|
- if (params == NULL)
|
|
- continue;
|
|
+
|
|
/* read the name of the device */
|
|
if (pasprintf(&buf, "%s/type", bpath) == -1)
|
|
continue;
|
|
@@ -413,6 +408,35 @@ void xenstore_parse_domain_config(int hv
|
|
drv = xs_read(xsh, XBT_NULL, buf, &len);
|
|
if (drv == NULL)
|
|
continue;
|
|
+
|
|
+ free(params);
|
|
+ if (!strcmp(drv,"iscsi") || !strcmp(drv, "npiv"))
|
|
+ {
|
|
+ if (pasprintf(&buf, "%s/node", bpath) == -1)
|
|
+ continue;
|
|
+
|
|
+ /* wait for block-[iscsi|npiv] script to complete and populate the
|
|
+ * node entry. try 30 times (30 secs) */
|
|
+ for (j = 0; j < 30; j++) {
|
|
+ params = xs_read(xsh, XBT_NULL, buf, &len);
|
|
+ if (params != NULL)
|
|
+ break;
|
|
+ sleep(1);
|
|
+ }
|
|
+ if (params == NULL) {
|
|
+ fprintf(stderr, "qemu: %s device not found -- timed out \n", drv);
|
|
+ continue;
|
|
+ }
|
|
+ }
|
|
+ else
|
|
+ {
|
|
+ if (pasprintf(&buf, "%s/params", bpath) == -1)
|
|
+ continue;
|
|
+ params = xs_read(xsh, XBT_NULL, buf, &len);
|
|
+ if (params == NULL)
|
|
+ continue;
|
|
+ }
|
|
+
|
|
/* Obtain blktap sub-type prefix */
|
|
if (!strcmp(drv, "tap") && params[0]) {
|
|
char *offset = strchr(params, ':');
|