SHA256
1
0
forked from pool/xen
OBS User unknown
2008-09-12 15:57:53 +00:00
committed by Git OBS Bridge
parent 258bc46c96
commit 997dde689d
33 changed files with 5126 additions and 5313 deletions

View File

@@ -1,7 +1,7 @@
Index: xen-3.3.0-testing/tools/ioemu-remote/Makefile
Index: xen-3.3.1-testing/tools/ioemu-remote/Makefile
===================================================================
--- xen-3.3.0-testing.orig/tools/ioemu-remote/Makefile
+++ xen-3.3.0-testing/tools/ioemu-remote/Makefile
--- xen-3.3.1-testing.orig/tools/ioemu-remote/Makefile
+++ xen-3.3.1-testing/tools/ioemu-remote/Makefile
@@ -31,13 +31,6 @@ subdir-%: libqemu_common.a
recurse-all: $(patsubst %,subdir-%, $(TARGET_DIRS))
@@ -16,28 +16,33 @@ Index: xen-3.3.0-testing/tools/ioemu-remote/Makefile
#######################################################################
# BLOCK_OBJS is code used by both qemu system emulation and qemu-img
@@ -46,6 +39,16 @@ BLOCK_OBJS+=block-cow.o block-qcow.o aes
@@ -46,6 +39,21 @@ BLOCK_OBJS+=block-cow.o block-qcow.o aes
BLOCK_OBJS+=block-dmg.o block-bochs.o block-vpc.o block-vvfat.o
BLOCK_OBJS+=block-qcow2.o block-parallels.o
+#######################################################################
+# tapdisk-ioemu
+
+hw/tapdisk-xen_blktap.o: hw/xen_blktap.c
+ $(CC) $(CFLAGS) $(CPPFLAGS) -DQEMU_IMG -DQEMU_TOOL -c -o $@ $<
+tapdisk-ioemu.o: tapdisk-ioemu.c
+ $(CC) $(CFLAGS) $(CPPFLAGS) -DQEMU_IMG -DQEMU_TOOL -c -o $@ $<
+
+tapdisk-ioemu: CPPFLAGS += -I$(XEN_ROOT)/tools/libxc
+tapdisk-ioemu: CPPFLAGS += -I$(XEN_ROOT)/tools/blktap/lib
+tapdisk-ioemu: CPPFLAGS += -I$(XEN_ROOT)/tools/xenstore
+tapdisk-ioemu: CPPFLAGS += -I$(XEN_ROOT)/tools/include
+tapdisk-ioemu: tapdisk-ioemu.c $(BLOCK_OBJS) qemu-img-block.o qemu-img-block-raw-posix.o hw/xen_blktap.c
+ $(CC) -DQEMU_TOOL -DQEMU_IMG $(CFLAGS) $(CPPFLAGS) $(BASE_CFLAGS) $(LDFLAGS) $(BASE_LDFLAGS) -o $@ $^ -lz $(LIBS)
+tapdisk-ioemu: tapdisk-ioemu.o $(BLOCK_OBJS) qemu-img-block.o qemu-img-block-raw-posix.o hw/tapdisk-xen_blktap.o
+ $(CC) $(LDFLAGS) -o $@ $^ -lz $(LIBS)
+
######################################################################
# 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.3.0-testing/tools/ioemu-remote/configure
Index: xen-3.3.1-testing/tools/ioemu-remote/configure
===================================================================
--- xen-3.3.0-testing.orig/tools/ioemu-remote/configure
+++ xen-3.3.0-testing/tools/ioemu-remote/configure
@@ -1150,7 +1150,7 @@ fi
--- xen-3.3.1-testing.orig/tools/ioemu-remote/configure
+++ xen-3.3.1-testing/tools/ioemu-remote/configure
@@ -1144,7 +1144,7 @@ fi
echo "#define CONFIG_UNAME_RELEASE \"$uname_release\"" >> $config_h