SHA256
1
0
forked from pool/xen
OBS User unknown
2008-07-18 23:04:37 +00:00
committed by Git OBS Bridge
parent 8ae8ea2a74
commit f5d6338f4d
101 changed files with 2069 additions and 10556 deletions

View File

@@ -1,16 +1,16 @@
Index: xen-3.2.1-testing/tools/ioemu/xenstore.c
Index: xen-3.3.0-testing/tools/ioemu/xenstore.c
===================================================================
--- xen-3.2.1-testing.orig/tools/ioemu/xenstore.c
+++ xen-3.2.1-testing/tools/ioemu/xenstore.c
@@ -91,6 +91,7 @@ void xenstore_parse_domain_config(int do
--- xen-3.3.0-testing.orig/tools/ioemu/xenstore.c
+++ xen-3.3.0-testing/tools/ioemu/xenstore.c
@@ -88,6 +88,7 @@ void xenstore_parse_domain_config(int hv
char *fpath = NULL, *bpath = NULL, *btype = NULL,
*dev = NULL, *params = NULL, *type = NULL, *drv = NULL;
int i, is_scsi, is_tap, is_hdN = 0;
+ int j;
unsigned int len, num, hd_index;
unsigned int len, num, hd_index, pci_devid = 0;
BlockDriverState *bs;
@@ -173,12 +174,7 @@ void xenstore_parse_domain_config(int do
BlockDriver *format;
@@ -179,12 +180,7 @@ void xenstore_parse_domain_config(int hv
continue;
free(type);
type = xs_read(xsh, XBT_NULL, buf, &len);
@@ -24,7 +24,7 @@ Index: xen-3.2.1-testing/tools/ioemu/xenstore.c
/* read the name of the device */
if (pasprintf(&buf, "%s/type", bpath) == -1)
continue;
@@ -186,6 +182,35 @@ void xenstore_parse_domain_config(int do
@@ -192,6 +188,35 @@ void xenstore_parse_domain_config(int hv
drv = xs_read(xsh, XBT_NULL, buf, &len);
if (drv == NULL)
continue;
@@ -57,6 +57,6 @@ Index: xen-3.2.1-testing/tools/ioemu/xenstore.c
+ continue;
+ }
+
/* Strip off blktap sub-type prefix aio: - QEMU can autodetect this */
/* Obtain blktap sub-type prefix */
if (!strcmp(drv, "tap") && params[0]) {
char *offset = strchr(params, ':');