49 lines
2.3 KiB
Diff
49 lines
2.3 KiB
Diff
Index: xen-3.3.0-testing/tools/ioemu-remote/Makefile
|
|
===================================================================
|
|
--- xen-3.3.0-testing.orig/tools/ioemu-remote/Makefile
|
|
+++ xen-3.3.0-testing/tools/ioemu-remote/Makefile
|
|
@@ -31,13 +31,6 @@ subdir-%: libqemu_common.a
|
|
|
|
recurse-all: $(patsubst %,subdir-%, $(TARGET_DIRS))
|
|
|
|
-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 cutils.c block.c block-raw.c block-cow.c block-qcow.c aes.c block-vmdk.c block-cloop.c block-dmg.c block-bochs.c block-vpc.c block-vvfat.c block-qcow2.c hw/xen_blktap.c osdep.c
|
|
- $(CC) -DQEMU_TOOL $(CFLAGS) $(CPPFLAGS) $(BASE_CFLAGS) $(LDFLAGS) $(BASE_LDFLAGS) -o $@ $^ -lz $(LIBS)
|
|
-
|
|
#######################################################################
|
|
# 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
|
|
BLOCK_OBJS+=block-dmg.o block-bochs.o block-vpc.o block-vvfat.o
|
|
BLOCK_OBJS+=block-qcow2.o block-parallels.o
|
|
|
|
+#######################################################################
|
|
+# tapdisk-ioemu
|
|
+
|
|
+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)
|
|
+
|
|
######################################################################
|
|
# 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
|
|
===================================================================
|
|
--- xen-3.3.0-testing.orig/tools/ioemu-remote/configure
|
|
+++ xen-3.3.0-testing/tools/ioemu-remote/configure
|
|
@@ -1150,7 +1150,7 @@ fi
|
|
|
|
echo "#define CONFIG_UNAME_RELEASE \"$uname_release\"" >> $config_h
|
|
|
|
-tools=
|
|
+tools="tapdisk-ioemu"
|
|
if test `expr "$target_list" : ".*softmmu.*"` != 0 ; then
|
|
tools="qemu-img\$(EXESUF) $tools"
|
|
fi
|