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/ioemu-remote/xen-vl-extra.c
|
||||
Index: xen-3.3.1-testing/tools/ioemu-remote/xen-vl-extra.c
|
||||
===================================================================
|
||||
--- xen-3.3.0-testing.orig/tools/ioemu-remote/xen-vl-extra.c
|
||||
+++ xen-3.3.0-testing/tools/ioemu-remote/xen-vl-extra.c
|
||||
--- xen-3.3.1-testing.orig/tools/ioemu-remote/xen-vl-extra.c
|
||||
+++ xen-3.3.1-testing/tools/ioemu-remote/xen-vl-extra.c
|
||||
@@ -8,12 +8,18 @@
|
||||
* there is only one place where this file is included. */
|
||||
|
||||
@@ -103,10 +103,10 @@ Index: xen-3.3.0-testing/tools/ioemu-remote/xen-vl-extra.c
|
||||
struct qemu_alarm_timer;
|
||||
static int unix_start_timer(struct qemu_alarm_timer *t) { return 0; }
|
||||
static void unix_stop_timer(struct qemu_alarm_timer *t) { }
|
||||
Index: xen-3.3.0-testing/tools/ioemu-remote/i386-dm/helper2.c
|
||||
Index: xen-3.3.1-testing/tools/ioemu-remote/i386-dm/helper2.c
|
||||
===================================================================
|
||||
--- xen-3.3.0-testing.orig/tools/ioemu-remote/i386-dm/helper2.c
|
||||
+++ xen-3.3.0-testing/tools/ioemu-remote/i386-dm/helper2.c
|
||||
--- xen-3.3.1-testing.orig/tools/ioemu-remote/i386-dm/helper2.c
|
||||
+++ xen-3.3.1-testing/tools/ioemu-remote/i386-dm/helper2.c
|
||||
@@ -101,6 +101,9 @@ int send_vcpu = 0;
|
||||
#define NR_CPUS 32
|
||||
evtchn_port_t ioreq_local_port[NR_CPUS];
|
||||
@@ -145,10 +145,10 @@ Index: xen-3.3.0-testing/tools/ioemu-remote/i386-dm/helper2.c
|
||||
|
||||
xenstore_record_dm_state("paused");
|
||||
|
||||
Index: xen-3.3.0-testing/tools/ioemu-remote/qemu-xen.h
|
||||
Index: xen-3.3.1-testing/tools/ioemu-remote/qemu-xen.h
|
||||
===================================================================
|
||||
--- xen-3.3.0-testing.orig/tools/ioemu-remote/qemu-xen.h
|
||||
+++ xen-3.3.0-testing/tools/ioemu-remote/qemu-xen.h
|
||||
--- xen-3.3.1-testing.orig/tools/ioemu-remote/qemu-xen.h
|
||||
+++ xen-3.3.1-testing/tools/ioemu-remote/qemu-xen.h
|
||||
@@ -14,6 +14,15 @@ void qemu_invalidate_map_cache(void)
|
||||
#define mapcache_lock() ((void)0)
|
||||
#define mapcache_unlock() ((void)0)
|
||||
@@ -165,10 +165,10 @@ Index: xen-3.3.0-testing/tools/ioemu-remote/qemu-xen.h
|
||||
/* helper2.c */
|
||||
extern long time_offset;
|
||||
void timeoffset_get(void);
|
||||
Index: xen-3.3.0-testing/tools/ioemu-remote/xenstore.c
|
||||
Index: xen-3.3.1-testing/tools/ioemu-remote/xenstore.c
|
||||
===================================================================
|
||||
--- xen-3.3.0-testing.orig/tools/ioemu-remote/xenstore.c
|
||||
+++ xen-3.3.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
|
||||
@@ -24,6 +24,7 @@
|
||||
|
||||
#include "exec-all.h"
|
||||
|
Reference in New Issue
Block a user