Skip to contentSkip to conversation

Add tapdisk-ioemu tool

PATCH In review Kevin Wolf 2 participants 2 messages Apr 8, 2008

lore
Share & tools
lore

Kevin Wolf

author
#0 lore raw

PATCH 1/1 Add tapdisk-ioemu tool

Currently, tap:ioemu can only be used for domains which have a device model running. This isn't the case for all domains. The most important of the missing domains is Dom0 which needs acces e.g. to extract the kernel from the domain's image.

tapdisk-ioemu is a tool compiled from ioemu source plus a small wrapper which handles tap:ioemu access for domains without device model (currently Dom0). You must start tapdisk-ioemu manually before trying to attach a tap:ioemu disk to Dom0 at the moment. A patch to blktapctrl will follow to automatically start tapdisk-ioemu when needed.

Signed-off-by Kevin Wolf <[email protected]>
tools/ioemu/Makefile +9 -2
diff -r ed6bd8daa82b tools/ioemu/Makefile
@@ -16,6 +16,10 @@
 BASE_CFLAGS += -mcpu=ultrasparc
 endif
 CPPFLAGS += -I. -D_GNU_SOURCE -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE
+CPPFLAGS += -I$(XEN_ROOT)/tools/libxc
+CPPFLAGS += -I$(XEN_ROOT)/tools/blktap/lib
+CPPFLAGS += -I$(XEN_ROOT)/tools/xenstore
+CPPFLAGS += -I$(XEN_ROOT)/tools/include
 LIBS=
 TOOLS=qemu-img$(EXESUF)
 ifdef CONFIG_STATIC

@@ -35,7 +39,7 @@
 endif
 endif
 
-TOOLS=
+TOOLS=tapdisk-ioemu
 
 all: $(TOOLS) $(DOCS) recurse-all
 

@@ -43,6 +47,9 @@
 	$(MAKE) -C $(subst subdir-,,$@) all
 
 recurse-all: $(patsubst %,subdir-%, $(TARGET_DIRS))
+
+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
+	$(CC) -DQEMU_TOOL $(CFLAGS) $(CPPFLAGS) $(BASE_CFLAGS) $(LDFLAGS) $(BASE_LDFLAGS) -o $@ $^ -lz $(LIBS)
 
 qemu-img$(EXESUF): qemu-img.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
 	$(CC) -DQEMU_TOOL $(CFLAGS) $(CPPFLAGS) $(BASE_CFLAGS) $(LDFLAGS) $(BASE_LDFLAGS) -o $@ $^ -lz $(LIBS)

@@ -80,7 +87,7 @@
 
 install: all $(if $(BUILD_DOCS),install-doc)
 	mkdir -p "$(DESTDIR)$(bindir)"
-#	$(INSTALL) -m 755 -s $(TOOLS) "$(DESTDIR)$(bindir)"
+	$(INSTALL) -m 755 -s $(TOOLS) "$(DESTDIR)$(prefix)/sbin"
 #	mkdir -p "$(DESTDIR)$(datadir)"
 #	for x in bios.bin vgabios.bin vgabios-cirrus.bin ppc_rom.bin \
 #		video.x openbios-sparc32 linux_boot.bin pxe-ne2k_pci.bin \
tools/ioemu/cutils.c +35 -0
diff -r ed6bd8daa82b tools/ioemu/cutils.c
@@ -81,3 +81,38 @@
         *ptr = p;
     return 1;
 }
+
+void *get_mmap_addr(unsigned long size)
+{
+    return NULL;
+}
+
+void qemu_free(void *ptr)
+{
+    free(ptr);
+}
+
+void *qemu_malloc(size_t size)
+{
+    return malloc(size);
+}
+
+void *qemu_mallocz(size_t size)
+{
+    void *ptr;
+    ptr = qemu_malloc(size);
+    if (!ptr)
+        return NULL;
+    memset(ptr, 0, size);
+    return ptr;
+}
+
+char *qemu_strdup(const char *str)
+{
+    char *ptr;
+    ptr = qemu_malloc(strlen(str) + 1);
+    if (!ptr)
+        return NULL;
+    strcpy(ptr, str);
+    return ptr;
+}
tools/ioemu/osdep.c +0 -35
diff -r ed6bd8daa82b tools/ioemu/osdep.c
@@ -44,21 +44,6 @@
 #else
 #include <malloc.h>
 #endif
-
-void *get_mmap_addr(unsigned long size)
-{
-    return NULL;
-}
-
-void qemu_free(void *ptr)
-{
-    free(ptr);
-}
-
-void *qemu_malloc(size_t size)
-{
-    return malloc(size);
-}
 
 #if defined(_WIN32)
 void *qemu_memalign(size_t alignment, size_t size)

@@ -216,23 +201,3 @@
 }
 
 #endif
-
-void *qemu_mallocz(size_t size)
-{
-    void *ptr;
-    ptr = qemu_malloc(size);
-    if (!ptr)
-        return NULL;
-    memset(ptr, 0, size);
-    return ptr;
-}
-
-char *qemu_strdup(const char *str)
-{
-    char *ptr;
-    ptr = qemu_malloc(strlen(str) + 1);
-    if (!ptr)
-        return NULL;
-    strcpy(ptr, str);
-    return ptr;
-}
tools/ioemu/vl.h +3 -1
diff -r ed6bd8daa82b tools/ioemu/vl.h
@@ -159,7 +159,7 @@
 extern FILE *logfile;
 
 
-#if defined(__i386__) || defined(__x86_64__)
+#if (defined(__i386__) || defined(__x86_64__)) && !defined(QEMU_TOOL)
 #define MAPCACHE
 uint8_t *qemu_map_cache(target_phys_addr_t phys_addr);
 void     qemu_invalidate_map_cache(void);

@@ -1552,7 +1552,9 @@
 void timeoffset_get(void);
 
 /* xen_platform.c */
+#ifndef QEMU_TOOL
 void pci_xen_platform_init(PCIBus *bus);
+#endif
 
 
 void kqemu_record_dump(void);
tools/ioemu/tapdisk-ioemu.c new file +141 -0

141 lines not on this page · raw message

_______________________________________________
Xen-devel mailing list
[email protected]
http://lists.xensource.com/xen-devel

#1 lore raw
Quoted 5 lines · Kevin Wolf

Currently, tap:ioemu can only be used for domains which have a device model running. This isn't the case for all domains. The most important of the missing domains is Dom0 which needs acces e.g. to extract the kernel from the domain's image.

Quoted 7 lines

tapdisk-ioemu is a tool compiled from ioemu source plus a small wrapper which handles tap:ioemu access for domains without device model (currently Dom0). You must start tapdisk-ioemu manually before trying to attach a tap:ioemu disk to Dom0 at the moment. A patch to blktapctrl will follow to automatically start tapdisk-ioemu when needed.

Signed-off-by Kevin Wolf <[email protected]>

Tidied up and checked in.

Thanks,
Keir