- bnc#564406 - Make the new PV drivers work with older hosts that
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
This commit is contained in:
committed by
Git OBS Bridge
parent
e6b6844bcf
commit
fe31f9be81
@@ -1,8 +1,8 @@
|
||||
Index: xen-3.4.1-testing/tools/blktap/drivers/block-cdrom.c
|
||||
Index: xen-4.0.0-testing/tools/blktap/drivers/block-cdrom.c
|
||||
===================================================================
|
||||
--- /dev/null
|
||||
+++ xen-3.4.1-testing/tools/blktap/drivers/block-cdrom.c
|
||||
@@ -0,0 +1,536 @@
|
||||
+++ xen-4.0.0-testing/tools/blktap/drivers/block-cdrom.c
|
||||
@@ -0,0 +1,535 @@
|
||||
+/* block-cdrom.c
|
||||
+ *
|
||||
+ * simple slow synchronous cdrom disk implementation. Based off
|
||||
@@ -42,7 +42,6 @@ Index: xen-3.4.1-testing/tools/blktap/drivers/block-cdrom.c
|
||||
+#include <stdlib.h>
|
||||
+#include <unistd.h>
|
||||
+#include <string.h>
|
||||
+#include <linux/cdrom.h>
|
||||
+#include <sys/statvfs.h>
|
||||
+#include <sys/stat.h>
|
||||
+#include <sys/ioctl.h>
|
||||
@@ -539,11 +538,11 @@ Index: xen-3.4.1-testing/tools/blktap/drivers/block-cdrom.c
|
||||
+ .td_get_parent_id = tdcdrom_get_parent_id,
|
||||
+ .td_validate_parent = tdcdrom_validate_parent
|
||||
+};
|
||||
Index: xen-3.4.1-testing/xen/include/public/io/cdromif.h
|
||||
Index: xen-4.0.0-testing/xen/include/public/io/cdromif.h
|
||||
===================================================================
|
||||
--- /dev/null
|
||||
+++ xen-3.4.1-testing/xen/include/public/io/cdromif.h
|
||||
@@ -0,0 +1,120 @@
|
||||
+++ xen-4.0.0-testing/xen/include/public/io/cdromif.h
|
||||
@@ -0,0 +1,122 @@
|
||||
+/******************************************************************************
|
||||
+ * cdromif.h
|
||||
+ *
|
||||
@@ -574,6 +573,8 @@ Index: xen-3.4.1-testing/xen/include/public/io/cdromif.h
|
||||
+#ifndef __XEN_PUBLIC_IO_CDROMIF_H__
|
||||
+#define __XEN_PUBLIC_IO_CDROMIF_H__
|
||||
+
|
||||
+#include <linux/cdrom.h>
|
||||
+
|
||||
+/*
|
||||
+ * Queries backend for CDROM support
|
||||
+ */
|
||||
@@ -664,23 +665,23 @@ Index: xen-3.4.1-testing/xen/include/public/io/cdromif.h
|
||||
+ sizeof(struct vcd_generic_command) - sizeof(struct request_sense))
|
||||
+
|
||||
+#endif
|
||||
Index: xen-3.4.1-testing/tools/blktap/drivers/Makefile
|
||||
Index: xen-4.0.0-testing/tools/blktap/drivers/Makefile
|
||||
===================================================================
|
||||
--- xen-3.4.1-testing.orig/tools/blktap/drivers/Makefile
|
||||
+++ xen-3.4.1-testing/tools/blktap/drivers/Makefile
|
||||
@@ -20,8 +20,9 @@ CRYPT_LIB := -lcrypto
|
||||
$(warning === libgcrypt not installed: falling back to libcrypto ===)
|
||||
--- xen-4.0.0-testing.orig/tools/blktap/drivers/Makefile
|
||||
+++ xen-4.0.0-testing/tools/blktap/drivers/Makefile
|
||||
@@ -28,8 +28,9 @@ CFLAGS += -DMEMSHR
|
||||
MEMSHRLIBS += $(MEMSHR_DIR)/libmemshr.a
|
||||
endif
|
||||
|
||||
-LDFLAGS_blktapctrl := $(LDFLAGS_libxenctrl) $(LDFLAGS_libxenstore) -L../lib -lblktap
|
||||
-LDFLAGS_blktapctrl := $(LDFLAGS_libxenctrl) $(LDFLAGS_libxenstore) $(MEMSHRLIBS) -L../lib -lblktap -lrt -lm
|
||||
-LDFLAGS_img := $(LIBAIO_DIR)/libaio.a $(CRYPT_LIB) -lpthread -lz
|
||||
+LDFLAGS_xen := $(LDFLAGS_libxenctrl) $(LDFLAGS_libxenstore)
|
||||
+LDFLAGS_blktapctrl := $(LDFLAGS_xen) -L../lib -lblktap
|
||||
+LDFLAGS_blktapctrl := $(LDFLAGS_xen) $(MEMSHRLIBS) -L../lib -lblktap -lrt -lm
|
||||
+LDFLAGS_img := $(LIBAIO_DIR)/libaio.a $(CRYPT_LIB) -lpthread -lz $(LDFLAGS_xen)
|
||||
|
||||
BLK-OBJS-y := block-aio.o
|
||||
BLK-OBJS-y += block-sync.o
|
||||
@@ -29,6 +30,7 @@ BLK-OBJS-y += block-vmdk.o
|
||||
@@ -37,6 +38,7 @@ BLK-OBJS-y += block-vmdk.o
|
||||
BLK-OBJS-y += block-ram.o
|
||||
BLK-OBJS-y += block-qcow.o
|
||||
BLK-OBJS-y += block-qcow2.o
|
||||
@@ -688,10 +689,10 @@ Index: xen-3.4.1-testing/tools/blktap/drivers/Makefile
|
||||
BLK-OBJS-y += aes.o
|
||||
BLK-OBJS-y += tapaio.o
|
||||
BLK-OBJS-$(CONFIG_Linux) += blk_linux.o
|
||||
Index: xen-3.4.1-testing/tools/blktap/drivers/tapdisk.h
|
||||
Index: xen-4.0.0-testing/tools/blktap/drivers/tapdisk.h
|
||||
===================================================================
|
||||
--- xen-3.4.1-testing.orig/tools/blktap/drivers/tapdisk.h
|
||||
+++ xen-3.4.1-testing/tools/blktap/drivers/tapdisk.h
|
||||
--- xen-4.0.0-testing.orig/tools/blktap/drivers/tapdisk.h
|
||||
+++ xen-4.0.0-testing/tools/blktap/drivers/tapdisk.h
|
||||
@@ -137,6 +137,9 @@ struct tap_disk {
|
||||
int (*td_get_parent_id) (struct disk_driver *dd, struct disk_id *id);
|
||||
int (*td_validate_parent)(struct disk_driver *dd,
|
||||
@@ -736,11 +737,11 @@ Index: xen-3.4.1-testing/tools/blktap/drivers/tapdisk.h
|
||||
};
|
||||
|
||||
typedef struct driver_list_entry {
|
||||
Index: xen-3.4.1-testing/tools/blktap/lib/blktaplib.h
|
||||
Index: xen-4.0.0-testing/tools/blktap/lib/blktaplib.h
|
||||
===================================================================
|
||||
--- xen-3.4.1-testing.orig/tools/blktap/lib/blktaplib.h
|
||||
+++ xen-3.4.1-testing/tools/blktap/lib/blktaplib.h
|
||||
@@ -220,6 +220,7 @@ typedef struct msg_pid {
|
||||
--- xen-4.0.0-testing.orig/tools/blktap/lib/blktaplib.h
|
||||
+++ xen-4.0.0-testing/tools/blktap/lib/blktaplib.h
|
||||
@@ -219,6 +219,7 @@ typedef struct msg_pid {
|
||||
#define DISK_TYPE_RAM 3
|
||||
#define DISK_TYPE_QCOW 4
|
||||
#define DISK_TYPE_QCOW2 5
|
||||
@@ -748,10 +749,10 @@ Index: xen-3.4.1-testing/tools/blktap/lib/blktaplib.h
|
||||
|
||||
/* xenstore/xenbus: */
|
||||
#define DOMNAME "Domain-0"
|
||||
Index: xen-3.4.1-testing/xen/include/public/io/blkif.h
|
||||
Index: xen-4.0.0-testing/xen/include/public/io/blkif.h
|
||||
===================================================================
|
||||
--- xen-3.4.1-testing.orig/xen/include/public/io/blkif.h
|
||||
+++ xen-3.4.1-testing/xen/include/public/io/blkif.h
|
||||
--- xen-4.0.0-testing.orig/xen/include/public/io/blkif.h
|
||||
+++ xen-4.0.0-testing/xen/include/public/io/blkif.h
|
||||
@@ -76,6 +76,10 @@
|
||||
* "feature-flush-cache" node!
|
||||
*/
|
||||
@@ -763,10 +764,10 @@ Index: xen-3.4.1-testing/xen/include/public/io/blkif.h
|
||||
|
||||
/*
|
||||
* Maximum scatter/gather segments per request.
|
||||
Index: xen-3.4.1-testing/tools/blktap/drivers/tapdisk.c
|
||||
Index: xen-4.0.0-testing/tools/blktap/drivers/tapdisk.c
|
||||
===================================================================
|
||||
--- xen-3.4.1-testing.orig/tools/blktap/drivers/tapdisk.c
|
||||
+++ xen-3.4.1-testing/tools/blktap/drivers/tapdisk.c
|
||||
--- xen-4.0.0-testing.orig/tools/blktap/drivers/tapdisk.c
|
||||
+++ xen-4.0.0-testing/tools/blktap/drivers/tapdisk.c
|
||||
@@ -735,6 +735,22 @@ static void get_io_request(struct td_sta
|
||||
goto out;
|
||||
}
|
||||
@@ -790,15 +791,15 @@ Index: xen-3.4.1-testing/tools/blktap/drivers/tapdisk.c
|
||||
default:
|
||||
DPRINTF("Unknown block operation\n");
|
||||
break;
|
||||
Index: xen-3.4.1-testing/tools/python/xen/xend/server/BlktapController.py
|
||||
Index: xen-4.0.0-testing/tools/python/xen/xend/server/BlktapController.py
|
||||
===================================================================
|
||||
--- xen-3.4.1-testing.orig/tools/python/xen/xend/server/BlktapController.py
|
||||
+++ xen-3.4.1-testing/tools/python/xen/xend/server/BlktapController.py
|
||||
@@ -14,6 +14,7 @@ blktap_disk_types = [
|
||||
--- xen-4.0.0-testing.orig/tools/python/xen/xend/server/BlktapController.py
|
||||
+++ xen-4.0.0-testing/tools/python/xen/xend/server/BlktapController.py
|
||||
@@ -20,6 +20,7 @@ blktap1_disk_types = [
|
||||
'ram',
|
||||
'qcow',
|
||||
'qcow2',
|
||||
+ 'cdrom',
|
||||
|
||||
'ioemu',
|
||||
'tapdisk',
|
||||
]
|
||||
|
||||
|
Reference in New Issue
Block a user