Commit b932caba32c6eb627470d29e7ba1933589b4f8a0
1 parent
3eb2619f
new disk image layer
git-svn-id: svn://svn.savannah.nongnu.org/qemu/trunk@1030 c046a42c-6fe2-441c-8c8c-71466251a162
Showing
2 changed files
with
10 additions
and
11 deletions
Makefile
| 1 | 1 | include config-host.mak |
| 2 | 2 | |
| 3 | -CFLAGS=-Wall -O2 -g | |
| 3 | +CFLAGS=-Wall -O2 -g -fno-strict-aliasing | |
| 4 | 4 | ifdef CONFIG_DARWIN |
| 5 | 5 | CFLAGS+= -mdynamic-no-pic |
| 6 | 6 | endif |
| ... | ... | @@ -10,9 +10,7 @@ endif |
| 10 | 10 | LDFLAGS=-g |
| 11 | 11 | LIBS= |
| 12 | 12 | DEFINES+=-D_GNU_SOURCE |
| 13 | -ifndef CONFIG_WIN32 | |
| 14 | -TOOLS=qemu-mkcow vmdk2raw | |
| 15 | -endif | |
| 13 | +TOOLS=qemu-img | |
| 16 | 14 | ifdef CONFIG_STATIC |
| 17 | 15 | LDFLAGS+=-static |
| 18 | 16 | endif |
| ... | ... | @@ -22,11 +20,8 @@ all: dyngen$(EXESUF) $(TOOLS) qemu-doc.html qemu-tech.html qemu.1 |
| 22 | 20 | $(MAKE) -C $$d $@ || exit 1 ; \ |
| 23 | 21 | done |
| 24 | 22 | |
| 25 | -qemu-mkcow: qemu-mkcow.c | |
| 26 | - $(CC) $(CFLAGS) $(LDFLAGS) $(DEFINES) -o $@ $^ $(LIBS) | |
| 27 | - | |
| 28 | -vmdk2raw: vmdk2raw.c | |
| 29 | - $(CC) $(CFLAGS) $(LDFLAGS) $(DEFINES) -o $@ $^ $(LIBS) | |
| 23 | +qemu-img: qemu-img.c block.c block-cow.c block-qcow.c aes.c block-vmdk.c | |
| 24 | + $(CC) -DQEMU_TOOL $(CFLAGS) $(LDFLAGS) $(DEFINES) -o $@ $^ -lz $(LIBS) | |
| 30 | 25 | |
| 31 | 26 | dyngen$(EXESUF): dyngen.c |
| 32 | 27 | $(HOST_CC) $(CFLAGS) $(DEFINES) -o $@ $^ |
| ... | ... | @@ -99,7 +94,7 @@ tarbin: |
| 99 | 94 | $(bindir)/qemu-arm \ |
| 100 | 95 | $(bindir)/qemu-sparc \ |
| 101 | 96 | $(bindir)/qemu-ppc \ |
| 102 | - $(bindir)/qemu-mkcow $(bindir)/vmdk2raw \ | |
| 97 | + $(bindir)/qemu-img \ | |
| 103 | 98 | $(datadir)/bios.bin \ |
| 104 | 99 | $(datadir)/vgabios.bin \ |
| 105 | 100 | $(datadir)/vgabios-cirrus.bin \ | ... | ... |
Makefile.target
| ... | ... | @@ -161,6 +161,9 @@ endif |
| 161 | 161 | |
| 162 | 162 | DEFINES+=-D_GNU_SOURCE |
| 163 | 163 | LIBS+=-lm |
| 164 | +ifndef CONFIG_USER_ONLY | |
| 165 | +LIBS+=-lz | |
| 166 | +endif | |
| 164 | 167 | ifdef CONFIG_WIN32 |
| 165 | 168 | LIBS+=-lwinmm -lws2_32 -liphlpapi |
| 166 | 169 | endif |
| ... | ... | @@ -237,7 +240,8 @@ ifeq ($(ARCH),alpha) |
| 237 | 240 | endif |
| 238 | 241 | |
| 239 | 242 | # must use static linking to avoid leaving stuff in virtual address space |
| 240 | -VL_OBJS=vl.o osdep.o block.o monitor.o pci.o console.o | |
| 243 | +VL_OBJS=vl.o osdep.o block.o readline.o monitor.o pci.o console.o | |
| 244 | +VL_OBJS+=block-cow.o block-qcow.o aes.o block-vmdk.o | |
| 241 | 245 | |
| 242 | 246 | ifeq ($(TARGET_ARCH), i386) |
| 243 | 247 | # Hardware support | ... | ... |