OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/xen?expand=0&rev=48

2008-07-18 23:04:37 +00:00
parent 8ae8ea2a74
commit f5d6338f4d
101 changed files with 2069 additions and 10556 deletions
--- a/blktapctrl-default-to-ioemu.patch
+++ b/blktapctrl-default-to-ioemu.patch
@@ -0,0 +1,55 @@
+Index: xen-3.3.0-testing/tools/blktap/drivers/blktapctrl.c
+===================================================================
+--- xen-3.3.0-testing.orig/tools/blktap/drivers/blktapctrl.c
+++ xen-3.3.0-testing/tools/blktap/drivers/blktapctrl.c
+@@ -503,6 +503,7 @@ static int launch_tapdisk_provider(char
+ 	return child;
+ }
+ 
+#if 0
+ static int launch_tapdisk(char *wrctldev, char *rdctldev)
+ {
+ 	char *argv[] = { "tapdisk", wrctldev, rdctldev, NULL };
+@@ -512,6 +513,7 @@ static int launch_tapdisk(char *wrctldev
+ 
+ 	return 0;
+ }
+#endif
+ 
+ static int launch_tapdisk_ioemu(void)
+ {
+@@ -583,6 +585,7 @@ static int connect_qemu(blkif_t *blkif,
+ 	return 0;
+ }
+ 
+#if 0
+ /* Launch tapdisk instance */
+ static int connect_tapdisk(blkif_t *blkif, int minor)
+ {
+@@ -626,6 +629,7 @@ fail:
+ 
+ 	return ret;
+ }
+#endif
+ 
+ int blktapctrl_new_blkif(blkif_t *blkif)
+ {
+@@ -650,6 +654,7 @@ int blktapctrl_new_blkif(blkif_t *blkif)
+ 		blkif->cookie = next_cookie++;
+ 
+ 		if (!exist) {
+#if 0
+ 			if (type == DISK_TYPE_IOEMU) {
+ 				if (connect_qemu(blkif, blkif->domid))
+ 					goto fail;
+@@ -657,6 +662,10 @@ int blktapctrl_new_blkif(blkif_t *blkif)
+ 				if (connect_tapdisk(blkif, minor))
+ 					goto fail;
+ 			}
+#else
+			if (connect_qemu(blkif, blkif->domid))
+				goto fail;
+#endif
+ 
+ 		} else {
+ 			DPRINTF("Process exists!\n");