fe31f9be81
do not understand the new PV driver protocol. - Upstream Xen version renamed to 4.0.0 in changeset 20624 & 20625. - fate#307594: HP-MCBS: XEN: support NR_CPUS=256 This is a spec file change (xen.spec) - bnc#555152 - "NAME" column in xentop (SLES11) output limited to 10 characters unlike SLES10 The update to c/s 20572 includes this fix (at c/s 20567). - Modify xen-paths.diff - Merge xend-tap-fix.patch to xen-domUloader.diff remove part of it which accepted by upstream - Load gntdev module in xend init script similar to blkbk, netbk, etc. - Backport dmmd from sles11/xen block-dmmd xen-qemu-iscsi-fix.patch xen.spec - Fix regression when create_vbd for tap xend-tap-fix.patch - Temporarily disable libxl because of libconfig dependency. - fate#302864 domUloader support lvm in disk domUloader.py Note: for test in Beta1, if not good, remove it - fate#302864 domUloader support fs on whole disk domUloader.py - Turn KMPs back on now that kernel side fix is checked in. - fate#304415 VMM: ability to switch networking mode Add vif-route-ifup to handle routed configurations using sysconfig scripts. vif-route-ifup.patch - fate#307540 USB for Xen VMs usb-add.patch - fate#305545 XEN extra descriptive field within xenstore add_des.patch - Update to Xen version 3.5.0 for the following features. fate#304226 XEN: FlexMigration feature of VT-x2 support fate#305004 Add SR-IOV PF and VF drivers to Vt-d enabled Xen fate#306830 T states in Xen controlling by MSR fate#306832 Fix for xen panic on new processors fate#306833 Westmere and Nehalem-EX: Add support for Pause Loop exiting feature for Xen fate#306835 Xen: server virtual power management enhacement fate#306837 VT-d2 - PCI SIG ATS support fate#306872 Xen: Node manager support P/T-states change when Vt-d enable fate#306873 Xen: SMP guest live migration may fail with hap=1 on NHM fate#306875 Westmere: LT-SX (Xen) fate#306891 RAS features for Xen: Add support for Machine Check and CPU/Memory online/offline features fate#307322 1GB page support in Xen fate#307324 Xen IOMMU support OBS-URL: https://build.opensuse.org/package/show/Virtualization/xen?expand=0&rev=26
64 lines
2.3 KiB
Diff
64 lines
2.3 KiB
Diff
Index: xen-4.0.0-testing/tools/ioemu-remote/xenstore.c
|
|
===================================================================
|
|
--- xen-4.0.0-testing.orig/tools/ioemu-remote/xenstore.c
|
|
+++ xen-4.0.0-testing/tools/ioemu-remote/xenstore.c
|
|
@@ -398,7 +398,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, ret, is_tap;
|
|
+ int i, j, ret, is_tap;
|
|
unsigned int len, num, hd_index, pci_devid = 0;
|
|
BlockDriverState *bs;
|
|
BlockDriver *format;
|
|
@@ -485,12 +485,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;
|
|
@@ -498,6 +493,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") ||
|
|
+ !strcmp(drv,"dmmd")) {
|
|
+ if (pasprintf(&buf, "%s/node", bpath) == -1)
|
|
+ continue;
|
|
+
|
|
+ /* wait for block-[iscsi|npiv|dmmd] 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, ':');
|