This commit is contained in:
committed by
Git OBS Bridge
parent
8ae8ea2a74
commit
f5d6338f4d
@@ -1,7 +1,7 @@
|
||||
Index: xen-3.2-testing/tools/misc/miniterm/miniterm.c
|
||||
Index: xen-3.3.0-testing/tools/misc/miniterm/miniterm.c
|
||||
===================================================================
|
||||
--- xen-3.2-testing.orig/tools/misc/miniterm/miniterm.c
|
||||
+++ xen-3.2-testing/tools/misc/miniterm/miniterm.c
|
||||
--- xen-3.3.0-testing.orig/tools/misc/miniterm/miniterm.c
|
||||
+++ xen-3.3.0-testing/tools/misc/miniterm/miniterm.c
|
||||
@@ -157,7 +157,7 @@ int main(int argc, char **argv)
|
||||
case 0:
|
||||
close(1); /* stdout not needed */
|
||||
@@ -35,10 +35,10 @@ Index: xen-3.2-testing/tools/misc/miniterm/miniterm.c
|
||||
break;
|
||||
}
|
||||
|
||||
Index: xen-3.2-testing/xen/tools/symbols.c
|
||||
Index: xen-3.3.0-testing/xen/tools/symbols.c
|
||||
===================================================================
|
||||
--- xen-3.2-testing.orig/xen/tools/symbols.c
|
||||
+++ xen-3.2-testing/xen/tools/symbols.c
|
||||
--- xen-3.3.0-testing.orig/xen/tools/symbols.c
|
||||
+++ xen-3.3.0-testing/xen/tools/symbols.c
|
||||
@@ -81,7 +81,8 @@ static int read_symbol(FILE *in, struct
|
||||
if (rc != 3) {
|
||||
if (rc != EOF) {
|
||||
@@ -49,11 +49,11 @@ Index: xen-3.2-testing/xen/tools/symbols.c
|
||||
}
|
||||
return -1;
|
||||
}
|
||||
Index: xen-3.2-testing/tools/libxc/xc_dom_elfloader.c
|
||||
Index: xen-3.3.0-testing/tools/libxc/xc_dom_elfloader.c
|
||||
===================================================================
|
||||
--- xen-3.2-testing.orig/tools/libxc/xc_dom_elfloader.c
|
||||
+++ xen-3.2-testing/tools/libxc/xc_dom_elfloader.c
|
||||
@@ -195,8 +195,9 @@ static int xc_dom_load_elf_symtab(struct
|
||||
--- xen-3.3.0-testing.orig/tools/libxc/xc_dom_elfloader.c
|
||||
+++ xen-3.3.0-testing/tools/libxc/xc_dom_elfloader.c
|
||||
@@ -193,8 +193,9 @@ static int xc_dom_load_elf_symtab(struct
|
||||
|
||||
if ( load )
|
||||
{
|
||||
@@ -64,23 +64,23 @@ Index: xen-3.2-testing/tools/libxc/xc_dom_elfloader.c
|
||||
elf_section_start(elf, shdr2),
|
||||
size);
|
||||
}
|
||||
Index: xen-3.2-testing/tools/xenstore/Makefile
|
||||
Index: xen-3.3.0-testing/tools/xenstore/Makefile
|
||||
===================================================================
|
||||
--- xen-3.2-testing.orig/tools/xenstore/Makefile
|
||||
+++ xen-3.2-testing/tools/xenstore/Makefile
|
||||
@@ -6,7 +6,7 @@ MAJOR = 3.0
|
||||
--- xen-3.3.0-testing.orig/tools/xenstore/Makefile
|
||||
+++ xen-3.3.0-testing/tools/xenstore/Makefile
|
||||
@@ -4,7 +4,7 @@ include $(XEN_ROOT)/tools/Rules.mk
|
||||
MAJOR = 3.0
|
||||
MINOR = 0
|
||||
|
||||
PROFILE=#-pg
|
||||
-BASECFLAGS=-Werror
|
||||
+BASECFLAGS=-Werror -fno-strict-aliasing
|
||||
# Make gcc generate dependencies.
|
||||
BASECFLAGS += -Wp,-MD,.$(@F).d
|
||||
PROG_DEP = .*.d
|
||||
Index: xen-3.2-testing/tools/xenstore/xenstored_core.c
|
||||
-CFLAGS += -Werror
|
||||
+CFLAGS += -Werror -fno-strict-aliasing
|
||||
CFLAGS += -I.
|
||||
CFLAGS += $(CFLAGS_libxenctrl)
|
||||
|
||||
Index: xen-3.3.0-testing/tools/xenstore/xenstored_core.c
|
||||
===================================================================
|
||||
--- xen-3.2-testing.orig/tools/xenstore/xenstored_core.c
|
||||
+++ xen-3.2-testing/tools/xenstore/xenstored_core.c
|
||||
--- xen-3.3.0-testing.orig/tools/xenstore/xenstored_core.c
|
||||
+++ xen-3.3.0-testing/tools/xenstore/xenstored_core.c
|
||||
@@ -77,8 +77,8 @@ static void check_store(void);
|
||||
|
||||
int quota_nb_entry_per_domain = 1000;
|
||||
@@ -92,7 +92,7 @@ Index: xen-3.2-testing/tools/xenstore/xenstored_core.c
|
||||
|
||||
TDB_CONTEXT *tdb_context(struct connection *conn)
|
||||
{
|
||||
@@ -1789,10 +1789,10 @@ int main(int argc, char *argv[])
|
||||
@@ -1803,10 +1803,10 @@ int main(int argc, char *argv[])
|
||||
remove_local = false;
|
||||
break;
|
||||
case 'S':
|
||||
@@ -105,10 +105,10 @@ Index: xen-3.2-testing/tools/xenstore/xenstored_core.c
|
||||
break;
|
||||
case 'T':
|
||||
tracefile = optarg;
|
||||
Index: xen-3.2-testing/tools/xenstore/xenstored_domain.c
|
||||
Index: xen-3.3.0-testing/tools/xenstore/xenstored_domain.c
|
||||
===================================================================
|
||||
--- xen-3.2-testing.orig/tools/xenstore/xenstored_domain.c
|
||||
+++ xen-3.2-testing/tools/xenstore/xenstored_domain.c
|
||||
--- xen-3.3.0-testing.orig/tools/xenstore/xenstored_domain.c
|
||||
+++ xen-3.3.0-testing/tools/xenstore/xenstored_domain.c
|
||||
@@ -212,7 +212,7 @@ void handle_event(void)
|
||||
{
|
||||
evtchn_port_t port;
|
||||
@@ -118,7 +118,7 @@ Index: xen-3.2-testing/tools/xenstore/xenstored_domain.c
|
||||
barf_perror("Failed to read from event fd");
|
||||
|
||||
if (port == virq_port)
|
||||
@@ -516,7 +516,7 @@ static int dom0_init(void)
|
||||
@@ -561,7 +561,7 @@ static int dom0_init(void)
|
||||
struct domain *dom0;
|
||||
|
||||
port = xenbus_evtchn();
|
||||
@@ -127,10 +127,10 @@ Index: xen-3.2-testing/tools/xenstore/xenstored_domain.c
|
||||
return -1;
|
||||
|
||||
dom0 = new_domain(NULL, 0, port);
|
||||
Index: xen-3.2-testing/tools/xenstore/xenstored_transaction.c
|
||||
Index: xen-3.3.0-testing/tools/xenstore/xenstored_transaction.c
|
||||
===================================================================
|
||||
--- xen-3.2-testing.orig/tools/xenstore/xenstored_transaction.c
|
||||
+++ xen-3.2-testing/tools/xenstore/xenstored_transaction.c
|
||||
--- xen-3.3.0-testing.orig/tools/xenstore/xenstored_transaction.c
|
||||
+++ xen-3.3.0-testing/tools/xenstore/xenstored_transaction.c
|
||||
@@ -82,7 +82,7 @@ struct transaction
|
||||
struct list_head changed_domains;
|
||||
};
|
||||
@@ -140,11 +140,11 @@ Index: xen-3.2-testing/tools/xenstore/xenstored_transaction.c
|
||||
static unsigned int generation;
|
||||
|
||||
/* Return tdb context to use for this connection. */
|
||||
Index: xen-3.2-testing/tools/xenstore/xenstore_client.c
|
||||
Index: xen-3.3.0-testing/tools/xenstore/xenstore_client.c
|
||||
===================================================================
|
||||
--- xen-3.2-testing.orig/tools/xenstore/xenstore_client.c
|
||||
+++ xen-3.2-testing/tools/xenstore/xenstore_client.c
|
||||
@@ -119,7 +119,7 @@ do_chmod(char *path, struct xs_permissio
|
||||
--- xen-3.3.0-testing.orig/tools/xenstore/xenstore_client.c
|
||||
+++ xen-3.3.0-testing/tools/xenstore/xenstore_client.c
|
||||
@@ -251,7 +251,7 @@ do_chmod(char *path, struct xs_permissio
|
||||
char **xsval = xs_directory(xsh, xth, path, &xsval_n);
|
||||
|
||||
if (xsval) {
|
||||
@@ -153,43 +153,11 @@ Index: xen-3.2-testing/tools/xenstore/xenstore_client.c
|
||||
for (i = 0; i < xsval_n; i++) {
|
||||
snprintf(buf, MAX_PATH_LEN, "%s/%s", path, xsval[i]);
|
||||
|
||||
Index: xen-3.2-testing/tools/xenstore/xsls.c
|
||||
Index: xen-3.3.0-testing/tools/libxen/src/xen_common.c
|
||||
===================================================================
|
||||
--- xen-3.2-testing.orig/tools/xenstore/xsls.c
|
||||
+++ xen-3.2-testing/tools/xenstore/xsls.c
|
||||
@@ -24,8 +24,7 @@ void print_dir(struct xs_handle *h, char
|
||||
char **e;
|
||||
char newpath[STRING_MAX], *val;
|
||||
int newpath_len;
|
||||
- int i;
|
||||
- unsigned int num, len;
|
||||
+ unsigned int i, num, len;
|
||||
|
||||
e = xs_directory(h, XBT_NULL, path, &num);
|
||||
if (e == NULL)
|
||||
@@ -69,7 +68,7 @@ void print_dir(struct xs_handle *h, char
|
||||
printf(":\n");
|
||||
}
|
||||
else {
|
||||
- if (max_width < (linewid + len + TAG_LEN)) {
|
||||
+ if (max_width < (int)(linewid + len + TAG_LEN)) {
|
||||
printf(" = \"%.*s\\...\"",
|
||||
(int)(max_width - TAG_LEN - linewid),
|
||||
sanitise_value(&ebuf, val, len));
|
||||
@@ -94,7 +93,7 @@ void print_dir(struct xs_handle *h, char
|
||||
warn("\ncould not access permissions for %s", e[i]);
|
||||
}
|
||||
else {
|
||||
- int i;
|
||||
+ unsigned int i;
|
||||
fputs(" (", stdout);
|
||||
for (i = 0; i < nperms; i++) {
|
||||
if (i)
|
||||
Index: xen-3.2-testing/tools/libxen/src/xen_common.c
|
||||
===================================================================
|
||||
--- xen-3.2-testing.orig/tools/libxen/src/xen_common.c
|
||||
+++ xen-3.2-testing/tools/libxen/src/xen_common.c
|
||||
@@ -1051,6 +1051,8 @@ static size_t size_of_member(const abstr
|
||||
--- xen-3.3.0-testing.orig/tools/libxen/src/xen_common.c
|
||||
+++ xen-3.3.0-testing/tools/libxen/src/xen_common.c
|
||||
@@ -1055,6 +1055,8 @@ static size_t size_of_member(const abstr
|
||||
default:
|
||||
assert(false);
|
||||
}
|
||||
@@ -198,7 +166,7 @@ Index: xen-3.2-testing/tools/libxen/src/xen_common.c
|
||||
}
|
||||
|
||||
|
||||
@@ -1550,6 +1552,8 @@ get_val_as_string(const struct abstract_
|
||||
@@ -1566,6 +1568,8 @@ get_val_as_string(const struct abstract_
|
||||
default:
|
||||
assert(false);
|
||||
}
|
||||
@@ -207,3 +175,25 @@ Index: xen-3.2-testing/tools/libxen/src/xen_common.c
|
||||
}
|
||||
|
||||
|
||||
Index: xen-3.3.0-testing/tools/ioemu/hw/pass-through.c
|
||||
===================================================================
|
||||
--- xen-3.3.0-testing.orig/tools/ioemu/hw/pass-through.c
|
||||
+++ xen-3.3.0-testing/tools/ioemu/hw/pass-through.c
|
||||
@@ -1389,7 +1389,7 @@ static int pt_register_regions(struct pt
|
||||
return 0;
|
||||
}
|
||||
|
||||
-static int pt_unregister_regions(struct pt_dev *assigned_device)
|
||||
+static void pt_unregister_regions(struct pt_dev *assigned_device)
|
||||
{
|
||||
int i, type, ret;
|
||||
uint32_t e_size;
|
||||
@@ -1434,7 +1434,7 @@ static int pt_unregister_regions(struct
|
||||
}
|
||||
|
||||
}
|
||||
-
|
||||
+
|
||||
}
|
||||
|
||||
uint8_t find_cap_offset(struct pci_dev *pci_dev, uint8_t cap)
|
||||
|
Reference in New Issue
Block a user