This commit is contained in:
committed by
Git OBS Bridge
parent
997dde689d
commit
b834258fb8
@@ -1,7 +1,7 @@
|
||||
Index: xen-3.3.0-testing/tools/misc/miniterm/miniterm.c
|
||||
Index: xen-3.3.1-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
|
||||
--- xen-3.3.1-testing.orig/tools/misc/miniterm/miniterm.c
|
||||
+++ xen-3.3.1-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.3.0-testing/tools/misc/miniterm/miniterm.c
|
||||
break;
|
||||
}
|
||||
|
||||
Index: xen-3.3.0-testing/xen/tools/symbols.c
|
||||
Index: xen-3.3.1-testing/xen/tools/symbols.c
|
||||
===================================================================
|
||||
--- xen-3.3.0-testing.orig/xen/tools/symbols.c
|
||||
+++ xen-3.3.0-testing/xen/tools/symbols.c
|
||||
--- xen-3.3.1-testing.orig/xen/tools/symbols.c
|
||||
+++ xen-3.3.1-testing/xen/tools/symbols.c
|
||||
@@ -81,7 +81,8 @@ static int read_symbol(FILE *in, struct
|
||||
if (rc != 3) {
|
||||
if (rc != EOF) {
|
||||
@@ -49,10 +49,10 @@ Index: xen-3.3.0-testing/xen/tools/symbols.c
|
||||
}
|
||||
return -1;
|
||||
}
|
||||
Index: xen-3.3.0-testing/tools/libxc/xc_dom_elfloader.c
|
||||
Index: xen-3.3.1-testing/tools/libxc/xc_dom_elfloader.c
|
||||
===================================================================
|
||||
--- xen-3.3.0-testing.orig/tools/libxc/xc_dom_elfloader.c
|
||||
+++ xen-3.3.0-testing/tools/libxc/xc_dom_elfloader.c
|
||||
--- xen-3.3.1-testing.orig/tools/libxc/xc_dom_elfloader.c
|
||||
+++ xen-3.3.1-testing/tools/libxc/xc_dom_elfloader.c
|
||||
@@ -193,8 +193,9 @@ static int xc_dom_load_elf_symtab(struct
|
||||
|
||||
if ( load )
|
||||
@@ -64,10 +64,10 @@ Index: xen-3.3.0-testing/tools/libxc/xc_dom_elfloader.c
|
||||
elf_section_start(elf, shdr2),
|
||||
size);
|
||||
}
|
||||
Index: xen-3.3.0-testing/tools/xenstore/Makefile
|
||||
Index: xen-3.3.1-testing/tools/xenstore/Makefile
|
||||
===================================================================
|
||||
--- xen-3.3.0-testing.orig/tools/xenstore/Makefile
|
||||
+++ xen-3.3.0-testing/tools/xenstore/Makefile
|
||||
--- xen-3.3.1-testing.orig/tools/xenstore/Makefile
|
||||
+++ xen-3.3.1-testing/tools/xenstore/Makefile
|
||||
@@ -4,7 +4,7 @@ include $(XEN_ROOT)/tools/Rules.mk
|
||||
MAJOR = 3.0
|
||||
MINOR = 0
|
||||
@@ -77,10 +77,10 @@ Index: xen-3.3.0-testing/tools/xenstore/Makefile
|
||||
CFLAGS += -I.
|
||||
CFLAGS += $(CFLAGS_libxenctrl)
|
||||
|
||||
Index: xen-3.3.0-testing/tools/xenstore/xenstored_core.c
|
||||
Index: xen-3.3.1-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
|
||||
--- xen-3.3.1-testing.orig/tools/xenstore/xenstored_core.c
|
||||
+++ xen-3.3.1-testing/tools/xenstore/xenstored_core.c
|
||||
@@ -77,8 +77,8 @@ static void check_store(void);
|
||||
|
||||
int quota_nb_entry_per_domain = 1000;
|
||||
@@ -105,10 +105,10 @@ Index: xen-3.3.0-testing/tools/xenstore/xenstored_core.c
|
||||
break;
|
||||
case 'T':
|
||||
tracefile = optarg;
|
||||
Index: xen-3.3.0-testing/tools/xenstore/xenstored_domain.c
|
||||
Index: xen-3.3.1-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
|
||||
--- xen-3.3.1-testing.orig/tools/xenstore/xenstored_domain.c
|
||||
+++ xen-3.3.1-testing/tools/xenstore/xenstored_domain.c
|
||||
@@ -212,7 +212,7 @@ void handle_event(void)
|
||||
{
|
||||
evtchn_port_t port;
|
||||
@@ -127,10 +127,10 @@ Index: xen-3.3.0-testing/tools/xenstore/xenstored_domain.c
|
||||
return -1;
|
||||
|
||||
dom0 = new_domain(NULL, 0, port);
|
||||
Index: xen-3.3.0-testing/tools/xenstore/xenstored_transaction.c
|
||||
Index: xen-3.3.1-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
|
||||
--- xen-3.3.1-testing.orig/tools/xenstore/xenstored_transaction.c
|
||||
+++ xen-3.3.1-testing/tools/xenstore/xenstored_transaction.c
|
||||
@@ -82,7 +82,7 @@ struct transaction
|
||||
struct list_head changed_domains;
|
||||
};
|
||||
@@ -140,10 +140,10 @@ Index: xen-3.3.0-testing/tools/xenstore/xenstored_transaction.c
|
||||
static unsigned int generation;
|
||||
|
||||
/* Return tdb context to use for this connection. */
|
||||
Index: xen-3.3.0-testing/tools/xenstore/xenstore_client.c
|
||||
Index: xen-3.3.1-testing/tools/xenstore/xenstore_client.c
|
||||
===================================================================
|
||||
--- xen-3.3.0-testing.orig/tools/xenstore/xenstore_client.c
|
||||
+++ xen-3.3.0-testing/tools/xenstore/xenstore_client.c
|
||||
--- xen-3.3.1-testing.orig/tools/xenstore/xenstore_client.c
|
||||
+++ xen-3.3.1-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);
|
||||
|
||||
@@ -153,10 +153,10 @@ Index: xen-3.3.0-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.3.0-testing/tools/libxen/src/xen_common.c
|
||||
Index: xen-3.3.1-testing/tools/libxen/src/xen_common.c
|
||||
===================================================================
|
||||
--- xen-3.3.0-testing.orig/tools/libxen/src/xen_common.c
|
||||
+++ xen-3.3.0-testing/tools/libxen/src/xen_common.c
|
||||
--- xen-3.3.1-testing.orig/tools/libxen/src/xen_common.c
|
||||
+++ xen-3.3.1-testing/tools/libxen/src/xen_common.c
|
||||
@@ -1055,6 +1055,8 @@ static size_t size_of_member(const abstr
|
||||
default:
|
||||
assert(false);
|
||||
@@ -175,32 +175,3 @@ Index: xen-3.3.0-testing/tools/libxen/src/xen_common.c
|
||||
}
|
||||
|
||||
|
||||
Index: xen-3.3.0-testing/unmodified_drivers/linux-2.6/platform-pci/platform-compat.c
|
||||
===================================================================
|
||||
--- xen-3.3.0-testing.orig/unmodified_drivers/linux-2.6/platform-pci/platform-compat.c
|
||||
+++ xen-3.3.0-testing/unmodified_drivers/linux-2.6/platform-pci/platform-compat.c
|
||||
@@ -14,7 +14,10 @@ EXPORT_SYMBOL(system_state);
|
||||
|
||||
void ctrl_alt_del(void)
|
||||
{
|
||||
- kill_proc(1, SIGINT, 1); /* interrupt init */
|
||||
+ siginfo_t si;
|
||||
+ pid_t p = 1;
|
||||
+
|
||||
+ kill_proc_info(1, &si, p);
|
||||
}
|
||||
|
||||
#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,8)
|
||||
Index: xen-3.3.0-testing/unmodified_drivers/linux-2.6/platform-pci/machine_reboot.c
|
||||
===================================================================
|
||||
--- xen-3.3.0-testing.orig/unmodified_drivers/linux-2.6/platform-pci/machine_reboot.c
|
||||
+++ xen-3.3.0-testing/unmodified_drivers/linux-2.6/platform-pci/machine_reboot.c
|
||||
@@ -44,7 +44,7 @@ static void ap_suspend(void *_info)
|
||||
atomic_dec(&info->nr_spinning);
|
||||
}
|
||||
|
||||
-#define initiate_ap_suspend(i) smp_call_function(ap_suspend, i, 0, 0)
|
||||
+#define initiate_ap_suspend(i) smp_call_function(ap_suspend, i, 0)
|
||||
|
||||
#else /* !defined(CONFIG_SMP) */
|
||||
|
||||
|
Reference in New Issue
Block a user