This commit is contained in:
committed by
Git OBS Bridge
parent
616dfa112f
commit
b4c780fd71
@@ -1,7 +1,7 @@
|
||||
Index: xen-3.4.0-testing/tools/blktap/drivers/blktapctrl.c
|
||||
Index: xen-3.4.1-testing/tools/blktap/drivers/blktapctrl.c
|
||||
===================================================================
|
||||
--- xen-3.4.0-testing.orig/tools/blktap/drivers/blktapctrl.c
|
||||
+++ xen-3.4.0-testing/tools/blktap/drivers/blktapctrl.c
|
||||
--- xen-3.4.1-testing.orig/tools/blktap/drivers/blktapctrl.c
|
||||
+++ xen-3.4.1-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;
|
||||
@@ -10,10 +10,10 @@ Index: xen-3.4.0-testing/tools/blktap/drivers/blktapctrl.c
|
||||
|
||||
break;
|
||||
|
||||
Index: xen-3.4.0-testing/tools/blktap/lib/blktaplib.h
|
||||
Index: xen-3.4.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
|
||||
--- xen-3.4.1-testing.orig/tools/blktap/lib/blktaplib.h
|
||||
+++ xen-3.4.1-testing/tools/blktap/lib/blktaplib.h
|
||||
@@ -189,6 +189,7 @@ typedef struct msg_hdr {
|
||||
typedef struct msg_newdev {
|
||||
uint8_t devnum;
|
||||
@@ -22,10 +22,10 @@ Index: xen-3.4.0-testing/tools/blktap/lib/blktaplib.h
|
||||
} msg_newdev_t;
|
||||
|
||||
typedef struct msg_pid {
|
||||
Index: xen-3.4.0-testing/tools/ioemu-remote/hw/xen_blktap.c
|
||||
Index: xen-3.4.1-testing/tools/ioemu-remote/hw/xen_blktap.c
|
||||
===================================================================
|
||||
--- 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
|
||||
--- xen-3.4.1-testing.orig/tools/ioemu-remote/hw/xen_blktap.c
|
||||
+++ xen-3.4.1-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;
|
||||
@@ -87,10 +87,10 @@ Index: xen-3.4.0-testing/tools/ioemu-remote/hw/xen_blktap.c
|
||||
|
||||
memset(buf, 0x00, MSG_SIZE);
|
||||
msglen = sizeof(msg_hdr_t);
|
||||
Index: xen-3.4.0-testing/tools/ioemu-remote/xenstore.c
|
||||
Index: xen-3.4.1-testing/tools/ioemu-remote/xenstore.c
|
||||
===================================================================
|
||||
--- xen-3.4.0-testing.orig/tools/ioemu-remote/xenstore.c
|
||||
+++ xen-3.4.0-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
|
||||
@@ -38,6 +38,8 @@ static QEMUTimer *insert_timer = NULL;
|
||||
#define UWAIT_MAX (30*1000000) /* thirty seconds */
|
||||
#define UWAIT (100000) /* 1/10th second */
|
||||
|
Reference in New Issue
Block a user