Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Qcow2 support #1

Open
wants to merge 17 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 4 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@
*.trs
.deps
.libs
.dirstamp
cscope.*
TAGS
VERSION
Expand Down Expand Up @@ -51,6 +52,7 @@ Makefile.in
/vhd/vhd-util
/vhd/lib/test/random-copy
/vhd/lib/test/test-snapshot
/qcow2/qemu-img
/tapback/tapback
/test-driver

Expand All @@ -73,6 +75,8 @@ Makefile.in
/vhd/Makefile
/vhd/lib/Makefile
/vhd/lib/test/Makefile
/qcow2/Makefile
/qcow2/lib/Makefile
/tapback/Makefile
mk/config.log

Expand Down
1 change: 1 addition & 0 deletions Makefile.am
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@

SUBDIRS = lvm
SUBDIRS += vhd
SUBDIRS += qcow2
SUBDIRS += cpumond
SUBDIRS += control
SUBDIRS += drivers
Expand Down
8 changes: 8 additions & 0 deletions configure.ac
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,12 @@ AC_CHECK_LIB([uuid], [main],
[:],
AC_MSG_ERROR([Need uuid-dev]))

PKG_PROG_PKG_CONFIG
PKG_CHECK_MODULES([GLIB], [glib-2.0])
PKG_CHECK_MODULES([ZLIB], [zlib])
PKG_CHECK_MODULES([GNUTLS], [gnutls])
PKG_CHECK_MODULES([LIBZSTD], [libzstd])

AS_IF([test x$with_libiconv != xno],
[AC_CHECK_LIB([iconv], [main],
[AC_SUBST([LIBICONV], ["-liconv"])],
Expand Down Expand Up @@ -64,6 +70,8 @@ cbt/Makefile
vhd/Makefile
vhd/lib/Makefile
vhd/lib/test/Makefile
qcow2/Makefile
qcow2/lib/Makefile
control/Makefile
drivers/Makefile
drivers/crypto/Makefile
Expand Down
3 changes: 3 additions & 0 deletions drivers/Makefile.am
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@ AM_CFLAGS += $(if $(GCOV),-fprofile-dir=/tmp/coverage/blktap/drivers -fprofile-a

AM_CPPFLAGS = -D_GNU_SOURCE
AM_CPPFLAGS += -I$(top_srcdir)/include
AM_CPPFLAGS += $(GLIB_CFLAGS)

libexec_PROGRAMS = tapdisk

Expand Down Expand Up @@ -90,6 +91,7 @@ libtapdisk_la_SOURCES += block-lcache.c
libtapdisk_la_SOURCES += block-llcache.c
libtapdisk_la_SOURCES += block-nbd.c
libtapdisk_la_SOURCES += block-log.c
libtapdisk_la_SOURCES += block-qcow2.c

# shared ring
libtapdisk_la_SOURCES += td-blkif.c
Expand All @@ -102,6 +104,7 @@ libtapdisk_la_SOURCES += td-stats.c
libtapdisk_la_SOURCES += td-stats.h

libtapdisk_la_LIBADD = ../vhd/lib/libvhd.la
libtapdisk_la_LIBADD += ../qcow2/lib/libqcow2.la
libtapdisk_la_LIBADD += -laio
libtapdisk_la_LIBADD += -lxenevtchn
libtapdisk_la_LIBADD += -lxengnttab
Expand Down
Loading