Add HTTP protocol using curl v3
PATCH 1/1 Add HTTP protocol using curl v3
From: Alexander Graf <[email protected]>
Currently Qemu can read from posix I/O and NBD. This patch adds a third protocol to the game: HTTP.
In certain situations it can be useful to access HTTP data directly, for example if you want to try out an http provided OS image, but don't know if you want to download it yet.
Using this patch you can now try it on on the fly. Just use it like:
qemu -cdrom http://host/path/my.iso
In order to not reinvent the wheel, this patch uses libcurl.
v2 changes:
- fix the segfault (yay!)
- implement AIO
v3 changes:
- remove synchronous API
- implement caching
--- Makefile | 6 + Makefile.target | 2 +- block-http.c | 431 +++++++++++++++++++++++++++++++++++++++++++++++++++++++ block.c | 3 + block.h | 1 + configure | 25 ++++ 6 files changed, 467 insertions(+), 1 deletions(-) create mode 100644 block-http.c
Makefile +6 -0
@@ -77,6 +77,10 @@ endif BLOCK_OBJS += block-raw-posix.o endif +ifdef CONFIG_CURL +BLOCK_OBJS += block-http.o +endif + ###################################################################### # libqemu_common.a: Target independent part of system emulation. The # long term path is to suppress *all* target specific code in case of
@@ -185,6 +189,8 @@ endif LIBS+=$(VDE_LIBS) +LIBS+=$(CURL_LIBS) + cocoa.o: cocoa.m keymaps.o: keymaps.c keymaps.h
Makefile.target +1 -1
@@ -735,7 +735,7 @@ endif vl.o: qemu-options.h -$(QEMU_PROG): LIBS += $(SDL_LIBS) $(COCOA_LIBS) $(CURSES_LIBS) $(BRLAPI_LIBS) $(VDE_LIBS) +$(QEMU_PROG): LIBS += $(SDL_LIBS) $(COCOA_LIBS) $(CURSES_LIBS) $(BRLAPI_LIBS) $(VDE_LIBS) $(CURL_LIBS) $(QEMU_PROG): $(OBJS) ../libqemu_common.a libqemu.a $(LINK)
block-http.c new file +431 -0
431 lines not on this page · raw message
block.c +3 -0
@@ -1504,6 +1504,9 @@ void bdrv_init(void)bdrv_register (&bdrv_qcow2);bdrv_register (&bdrv_parallels);bdrv_register (&bdrv_nbd); +#ifdef CONFIG_CURL +bdrv_register (&bdrv_http); +#endif } void aio_pool_init(AIOPool *pool, int aiocb_size,
block.h +1 -0
@@ -20,6 +20,7 @@ extern BlockDriver bdrv_vvfat;extern BlockDriver bdrv_qcow2;extern BlockDriver bdrv_parallels;extern BlockDriver bdrv_nbd; +extern BlockDriver bdrv_http; typedef struct BlockDriverInfo { /* in bytes, 0 if irrelevant */
configure +25 -0
@@ -181,6 +181,7 @@ bsd_user="no" build_docs="no" uname_release="" curses="yes" +curl="yes" pthread="yes" aio="yes" io_thread="no"
@@ -477,6 +478,8 @@ for opt do ;; --disable-curses) curses="no" ;; + --disable-curl) curl="no" + ;; --disable-nptl) nptl="no" ;; --enable-mixemu) mixemu="yes"
@@ -600,6 +603,7 @@ echo " --disable-brlapi disable BrlAPI" echo " --disable-vnc-tls disable TLS encryption for VNC server" echo " --disable-vnc-sasl disable SASL encryption for VNC server" echo " --disable-curses disable curses output" +echo " --disable-curl disable curl connectivity" echo " --disable-bluez disable bluez stack connectivity" echo " --disable-kvm disable KVM acceleration support" echo " --disable-nptl disable usermode NPTL support"
@@ -1062,6 +1066,21 @@ EOF fi # test "$curses" ########################################## +# curl probe + +if test "$curl" = "yes" ; then + curl=no + cat > $TMPC << EOF +#include <curl/curl.h> +int main(void) { return curl_easy_init(); } +EOF + curl_libs=`curl-config --libs` + if $cc $ARCH_CFLAGS $curl_libs -o $TMPE $TMPC > /dev/null 2> /dev/null ; then + curl=yes + fi +fi # test "$curl" + +########################################## # bluez support probe if test "$bluez" = "yes" ; then `pkg-config bluez 2> /dev/null` || bluez="no"
@@ -1311,6 +1330,7 @@ if test "$sdl" != "no" ; then echo "SDL static link $sdl_static" fi echo "curses support $curses" +echo "curl support $curl" echo "mingw32 support $mingw32" echo "Audio drivers $audio_drv_list" echo "Extra audio cards $audio_card_list"
@@ -1637,6 +1657,11 @@ fi if test "$inotify" = "yes" ; then echo "#define CONFIG_INOTIFY 1" >> $config_h fi +if test "$curl" = "yes" ; then + echo "CONFIG_CURL=yes" >> $config_mak + echo "CURL_LIBS=$curl_libs" >> $config_mak + echo "#define CONFIG_CURL 1" >> $config_h +fi if test "$brlapi" = "yes" ; then echo "CONFIG_BRLAPI=yes" >> $config_mak echo "#define CONFIG_BRLAPI 1" >> $config_h
Signature · 1 line
1.6.0.2
block-http.c line 421
Quoted 5 lines · [email protected] wrote:
block-http.c new file +4
-0+ +BlockDriver bdrv_http = { + .format_name ="http" , + .protocol_name ="http" ,
curl supports a bunch of protocols (from the man page, HTTP, HTTPS, FTP, FTPS, SCP, SFTP, TFTP, DICT, TELNET, LDAP, FILE). I suggest registering all of them (except FILE) so users can enjoy booting VMs over LDAP.
(well that only works for protocols that support byte range operations)
Signature · 1 line
error compiling committee.c: too many arguments to function
Quoted 10 lines · Avi Kivity
block-http.c line 421
Quoted 5 lines · [email protected] wrote:
block-http.c new file +4
-0+ +BlockDriver bdrv_http = { + .format_name ="http" , + .protocol_name ="http" ,curl supports a bunch of protocols (from the man page, HTTP, HTTPS, FTP, FTPS, SCP, SFTP, TFTP, DICT, TELNET, LDAP, FILE). I suggest registering all of them (except FILE) so users can enjoy booting VMs over LDAP.
(well that only works for protocols that support byte range operations)
I'd like to get HTTP up and running first and as soon as that's rock-stable go and activate other protocols, probably ftp and https following first.
Either way - those protocols would have to get tested before enabling them, so I'd like to stick with "simple" for now :-).
Alex