rpm/xen
SHA256
1
0
Fork 0
forked from pool/xen
Code Pull Requests Activity

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

Browse Source
This commit is contained in:
OBS User unknown
2009-05-04 16:38:09 +00:00
committed by Git OBS Bridge
parent 4790095364
commit 0bb51565d6
187 changed files with 2454 additions and 20791 deletions
Download Patch File Download Diff File Expand all files Collapse all files

46
snapshot-ioemu-restore.patch
View File

@@ -1,8 +1,8 @@
Index: xen-3.3.1-testing/tools/blktap/drivers/blktapctrl.c
Index: xen-3.4.0-testing/tools/blktap/drivers/blktapctrl.c
===================================================================
--- xen-3.3.1-testing.orig/tools/blktap/drivers/blktapctrl.c
+++ xen-3.3.1-testing/tools/blktap/drivers/blktapctrl.c
@@ -305,6 +305,7 @@ static int write_msg(int fd, int msgtype
--- xen-3.4.0-testing.orig/tools/blktap/drivers/blktapctrl.c
+++ xen-3.4.0-testing/tools/blktap/drivers/blktapctrl.c
@@ -346,6 +346,7 @@ static int write_msg(int fd, int msgtype
msg_dev = (msg_newdev_t *)(buf + sizeof(msg_hdr_t));
msg_dev->devnum = blkif->minor;
msg_dev->domid = blkif->domid;
@@ -10,10 +10,10 @@ Index: xen-3.3.1-testing/tools/blktap/drivers/blktapctrl.c
break;
Index: xen-3.3.1-testing/tools/blktap/lib/blktaplib.h
Index: xen-3.4.0-testing/tools/blktap/lib/blktaplib.h
===================================================================
--- xen-3.3.1-testing.orig/tools/blktap/lib/blktaplib.h
+++ xen-3.3.1-testing/tools/blktap/lib/blktaplib.h
--- xen-3.4.0-testing.orig/tools/blktap/lib/blktaplib.h
+++ xen-3.4.0-testing/tools/blktap/lib/blktaplib.h
@@ -189,6 +189,7 @@ typedef struct msg_hdr {
typedef struct msg_newdev {
uint8_t devnum;
@@ -22,11 +22,11 @@ Index: xen-3.3.1-testing/tools/blktap/lib/blktaplib.h
} msg_newdev_t;
typedef struct msg_pid {
Index: xen-3.3.1-testing/tools/ioemu-remote/hw/xen_blktap.c
Index: xen-3.4.0-testing/tools/ioemu-remote/hw/xen_blktap.c
===================================================================
--- xen-3.3.1-testing.orig/tools/ioemu-remote/hw/xen_blktap.c
+++ xen-3.3.1-testing/tools/ioemu-remote/hw/xen_blktap.c
@@ -69,6 +69,8 @@ int write_fd;
--- xen-3.4.0-testing.orig/tools/ioemu-remote/hw/xen_blktap.c
+++ xen-3.4.0-testing/tools/ioemu-remote/hw/xen_blktap.c
@@ -67,6 +67,8 @@ int write_fd;
static pid_t process;
fd_list_entry_t *fd_start = NULL;
@@ -35,7 +35,7 @@ Index: xen-3.3.1-testing/tools/ioemu-remote/hw/xen_blktap.c
static void handle_blktap_iomsg(void* private);
struct aiocb_info {
@@ -502,6 +504,10 @@ static void handle_blktap_ctrlmsg(void*
@@ -500,6 +502,10 @@ static void handle_blktap_ctrlmsg(void*
char buf[MSG_SIZE];
@@ -46,7 +46,7 @@ Index: xen-3.3.1-testing/tools/ioemu-remote/hw/xen_blktap.c
length = read(read_fd, buf, MSG_SIZE);
if (length > 0 && length >= sizeof(msg_hdr_t))
@@ -557,7 +563,39 @@ static void handle_blktap_ctrlmsg(void*
@@ -555,7 +561,39 @@ static void handle_blktap_ctrlmsg(void*
if (s != NULL) {
ret = ((map_new_dev(s, msg_dev->devnum)
== msg_dev->devnum ? 0: -1));
@@ -87,11 +87,11 @@ Index: xen-3.3.1-testing/tools/ioemu-remote/hw/xen_blktap.c
memset(buf, 0x00, MSG_SIZE);
msglen = sizeof(msg_hdr_t);
Index: xen-3.3.1-testing/tools/ioemu-remote/xenstore.c
Index: xen-3.4.0-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
@@ -37,6 +37,8 @@ static QEMUTimer *insert_timer = NULL;
--- xen-3.4.0-testing.orig/tools/ioemu-remote/xenstore.c
+++ xen-3.4.0-testing/tools/ioemu-remote/xenstore.c
@@ -38,6 +38,8 @@ static QEMUTimer *insert_timer = NULL;
#define UWAIT_MAX (30*1000000) /* thirty seconds */
#define UWAIT (100000) /* 1/10th second */
@@ -100,15 +100,15 @@ Index: xen-3.3.1-testing/tools/ioemu-remote/xenstore.c
static int pasprintf(char **buf, const char *fmt, ...)
{
va_list ap;
@@ -363,8 +365,33 @@ void xenstore_parse_domain_config(int hv
@@ -533,8 +535,33 @@ void xenstore_parse_domain_config(int hv
}
}
pstrcpy(bs->filename, sizeof(bs->filename), params);
- if (bdrv_open2(bs, params, 0 /* snapshot */, format) < 0)
+ if (bdrv_open2(bs, params, 0 /* snapshot */, format) < 0) {
- if (bdrv_open2(bs, params, BDRV_O_CACHE_WB /* snapshot and write-back */, format) < 0)
+ if (bdrv_open2(bs, params, BDRV_O_CACHE_WB /* snapshot and write-back */, format) < 0) {
fprintf(stderr, "qemu: could not open vbd '%s' or hard disk image '%s' (drv '%s' format '%s')\n", buf, params, drv ? drv : "?", format ? format->format_name : "0");
+ } else {
+ char* snapshot = get_snapshot_name(atoi(e[i]));
+ char* snapshot = get_snapshot_name(atoi(e_danger[i]));
+ if (snapshot) {
+ fprintf(stderr, "Using snapshot %s\n", snapshot);
+ ret = bdrv_snapshot_goto(bs, snapshot);
@@ -135,8 +135,8 @@ Index: xen-3.3.1-testing/tools/ioemu-remote/xenstore.c
}
/* if cdrom pyhsical put a watch on media-present */
if (bdrv_get_type_hint(bs) == BDRV_TYPE_CDROM) {
@@ -474,6 +485,23 @@ void xenstore_parse_domain_config(int hv
return;
@@ -726,6 +753,23 @@ int xenstore_parse_disable_pf_config ()
return disable_pf;
}
+