SHA256
1
0
forked from pool/xen
OBS User unknown
2009-08-01 09:53:46 +00:00
committed by Git OBS Bridge
parent 616dfa112f
commit b4c780fd71
80 changed files with 627 additions and 602 deletions

View File

@@ -15,10 +15,10 @@ Signed-off-by: Kevin Wolf <kwolf@suse.de>
tapdisk-ioemu.c | 17 -----------------
4 files changed, 17 insertions(+), 26 deletions(-)
Index: xen-3.4.0-testing/tools/ioemu-remote/Makefile
Index: xen-3.4.1-testing/tools/ioemu-remote/Makefile
===================================================================
--- xen-3.4.0-testing.orig/tools/ioemu-remote/Makefile
+++ xen-3.4.0-testing/tools/ioemu-remote/Makefile
--- xen-3.4.1-testing.orig/tools/ioemu-remote/Makefile
+++ xen-3.4.1-testing/tools/ioemu-remote/Makefile
@@ -46,13 +46,6 @@ $(filter %-user,$(SUBDIR_RULES)): libqem
recurse-all: $(SUBDIR_RULES)
@@ -55,10 +55,10 @@ Index: xen-3.4.0-testing/tools/ioemu-remote/Makefile
######################################################################
# libqemu_common.a: Target independent part of system emulation. The
# long term path is to suppress *all* target specific code in case of
Index: xen-3.4.0-testing/tools/ioemu-remote/configure
Index: xen-3.4.1-testing/tools/ioemu-remote/configure
===================================================================
--- xen-3.4.0-testing.orig/tools/ioemu-remote/configure
+++ xen-3.4.0-testing/tools/ioemu-remote/configure
--- xen-3.4.1-testing.orig/tools/ioemu-remote/configure
+++ xen-3.4.1-testing/tools/ioemu-remote/configure
@@ -1508,7 +1508,7 @@ bsd)
;;
esac
@@ -68,10 +68,10 @@ Index: xen-3.4.0-testing/tools/ioemu-remote/configure
if test `expr "$target_list" : ".*softmmu.*"` != 0 ; then
tools="qemu-img\$(EXESUF) $tools"
if [ "$linux" = "yes" ] ; then
Index: xen-3.4.0-testing/tools/ioemu-remote/qemu-tool.c
Index: xen-3.4.1-testing/tools/ioemu-remote/qemu-tool.c
===================================================================
--- xen-3.4.0-testing.orig/tools/ioemu-remote/qemu-tool.c
+++ xen-3.4.0-testing/tools/ioemu-remote/qemu-tool.c
--- xen-3.4.1-testing.orig/tools/ioemu-remote/qemu-tool.c
+++ xen-3.4.1-testing/tools/ioemu-remote/qemu-tool.c
@@ -68,7 +68,7 @@ void qemu_bh_delete(QEMUBH *bh)
qemu_free(bh);
}
@@ -81,10 +81,10 @@ Index: xen-3.4.0-testing/tools/ioemu-remote/qemu-tool.c
IOCanRWHandler *fd_read_poll,
IOHandler *fd_read,
IOHandler *fd_write,
Index: xen-3.4.0-testing/tools/ioemu-remote/tapdisk-ioemu.c
Index: xen-3.4.1-testing/tools/ioemu-remote/tapdisk-ioemu.c
===================================================================
--- xen-3.4.0-testing.orig/tools/ioemu-remote/tapdisk-ioemu.c
+++ xen-3.4.0-testing/tools/ioemu-remote/tapdisk-ioemu.c
--- xen-3.4.1-testing.orig/tools/ioemu-remote/tapdisk-ioemu.c
+++ xen-3.4.1-testing/tools/ioemu-remote/tapdisk-ioemu.c
@@ -12,34 +12,12 @@
extern void qemu_aio_init(void);