[Qemu-devel] Curl updates

[PATCH 1/4] curl: Fix parsing of readahead option from filename [PATCH 2/4] curl: Add sslverify option [PATCH 3/4] curl: Add usage documentation The first 3 patches are reposted with updates following discussion of the option syntax. With this patch I've decided to break entirely with the previous

[Qemu-devel] [PATCH 1/4] curl: Fix parsing of readahead option from filename

fined as long as square brackets in the URI are escaped. This change is also preparation for the addition of more options. Signed-off-by: Matthew Booth --- block/curl.c | 101 +++ 1 file changed, 67 insertions(+), 34 deletions(-) diff --

[Qemu-devel] [PATCH 3/4] curl: Add usage documentation

Signed-off-by: Matthew Booth --- qemu-options.hx | 72 + 1 file changed, 72 insertions(+) diff --git a/qemu-options.hx b/qemu-options.hx index 781af14..4cc36bf 100644 --- a/qemu-options.hx +++ b/qemu-options.hx @@ -2191,6 +2191,78 @@ qemu

[Qemu-devel] [PATCH 2/4] curl: Add sslverify option

This allows qemu to use images over https with a self-signed certificate. It defaults to verifying the certificate. Signed-off-by: Matthew Booth --- block/curl.c | 31 +++ 1 file changed, 31 insertions(+) diff --git a/block/curl.c b/block/curl.c index e31b6f3

[Qemu-devel] [PATCH 4/4] curl: Fix build when curl_multi_socket_action isn't available

Signed-off-by: Matthew Booth --- block/curl.c | 15 +++ 1 file changed, 15 insertions(+) diff --git a/block/curl.c b/block/curl.c index 8cf0a3e..e5581f5 100644 --- a/block/curl.c +++ b/block/curl.c @@ -38,6 +38,21 @@ #if LIBCURL_VERSION_NUM >= 0x071000 /* The multi interface ti

Re: [Qemu-devel] Curl updates

-BEGIN PGP SIGNED MESSAGE- Hash: SHA1 On 13/05/14 15:47, Eric Blake wrote: > On 05/08/2014 02:42 AM, Matthew Booth wrote: >> [PATCH 1/4] curl: Fix parsing of readahead option from filename >> [PATCH 2/4] curl: Add sslverify option [PATCH 3/4] curl: Add >> usage doc

Re: [Qemu-devel] Curl updates

-BEGIN PGP SIGNED MESSAGE- Hash: SHA1 On 14/05/14 03:48, Kevin Wolf wrote: > Am 13.05.2014 um 21:47 hat Eric Blake geschrieben: >> On 05/08/2014 02:42 AM, Matthew Booth wrote: >>> [PATCH 1/4] curl: Fix parsing of readahead option from >>> filename [PATCH 2/4]

Re: [Qemu-devel] [PATCH 1/4] curl: Fix parsing of readahead option from filename

-BEGIN PGP SIGNED MESSAGE- Hash: SHA1 On 13/05/14 13:29, Eric Blake wrote: > On 05/08/2014 02:42 AM, Matthew Booth wrote: >> curl_parse_filename wasn't removing the option string from the >> url, resulting in a 404. >> >> This change is a rewrite of the

Re: [Qemu-devel] Curl updates

-BEGIN PGP SIGNED MESSAGE- Hash: SHA1 On 14/05/14 13:02, Eric Blake wrote: > On 05/14/2014 10:06 AM, Matthew Booth wrote: > >>>> The new syntax is: >>>> >>>> http://user:passw...@example.com/path?query[opt1=val:opt2=val] >>>> &g

Re: [Qemu-devel] Curl updates

-BEGIN PGP SIGNED MESSAGE- Hash: SHA1 On 14/05/14 12:43, Kevin Wolf wrote: > Am 14.05.2014 um 18:08 hat Matthew Booth geschrieben: >> On 14/05/14 03:48, Kevin Wolf wrote: >>> Am 13.05.2014 um 21:47 hat Eric Blake geschrieben: >>>> On 05/08/2014 02:42 AM, Mat

[Qemu-devel] [PATCH 4/4] curl: Add usage documentation

Signed-off-by: Matthew Booth --- qemu-options.hx | 68 + 1 file changed, 68 insertions(+) diff --git a/qemu-options.hx b/qemu-options.hx index 781af14..7587bce 100644 --- a/qemu-options.hx +++ b/qemu-options.hx @@ -2191,6 +2191,74 @@ qemu

[Qemu-devel] [PATCH 1/4] curl: Fix build when curl_multi_socket_action isn't available

Signed-off-by: Matthew Booth --- block/curl.c | 15 +++ 1 file changed, 15 insertions(+) diff --git a/block/curl.c b/block/curl.c index d2f1084..f3c797a 100644 --- a/block/curl.c +++ b/block/curl.c @@ -37,6 +37,21 @@ #if LIBCURL_VERSION_NUM >= 0x071000 /* The multi interface ti

[Qemu-devel] [PATCH 3/4] curl: Add sslverify option

This allows qemu to use images over https with a self-signed certificate. It defaults to verifying the certificate. Signed-off-by: Matthew Booth --- block/curl.c | 11 +++ 1 file changed, 11 insertions(+) diff --git a/block/curl.c b/block/curl.c index 1b9f2f2..43d6646 100644 --- a

[Qemu-devel] [PATCH 2/4] curl: Remove broken parsing of options from url

The block layer now supports a generic json syntax for passing option parameters explicitly, making parsing of options from the url redundant. Signed-off-by: Matthew Booth --- block/curl.c | 52 ++-- 1 file changed, 10 insertions(+), 42 deletions

Re: [Qemu-devel] [PATCH v2] curl: Allow a cookie or cookies to be sent with http/https requests.

Looks good. Please add: Reviewed-by: Matthew Booth Matt On 29/08/14 16:03, Richard W.M. Jones wrote: > In order to access VMware ESX efficiently, we need to send a session > cookie. This patch is very simple and just allows you to send that > session cookie. It punts on the questi

Re: [Qemu-devel] [PATCH] curl: Allow a cookie or cookies to be sent with http/https requests.

g_free(s->url); > } > > diff --git a/qemu-options.hx b/qemu-options.hx > index c573dd8..7b4a58a 100644 > --- a/qemu-options.hx > +++ b/qemu-options.hx > @@ -2351,6 +2351,11 @@ multiple of 512 bytes. It defaults to 256k. > @item sslverify > Whether to verify the remote server's certificate when connecting over SSL. > It > can have the value 'on' or 'off'. It defaults to 'on'. > + > +@item cookie > +Send this cookie (it can also be a list of cookies separated by ';') with > +each outgoing request. Only supported when using protocols such as HTTP > +which support cookies, otherwise ignored. > @end table > > Note that when passing options to qemu explicitly, @option{driver} is the > value > -- Matthew Booth Red Hat Engineering, Virtualisation Team Phone: +442070094448 (UK) GPG ID: D33C3490 GPG FPR: 3733 612D 2D05 5458 8A8A 1600 3441 EA19 D33C 3490

Re: [Qemu-devel] [PATCH v2] curl: Allow a cookie or cookies to be sent with http/https requests.

ion and handle escaping issues. I doubt this will be a commonly used option, and even less frequently used with multiple cookies, if ever[1]. Given that it is possible to use multiple cookies without massive effort, I think the substantially simpler code is a reasonable trade-off. Matt [1] Feel free to lart me with this at a later date ;) -- Matthew Booth Red Hat Engineering, Virtualisation Team Phone: +442070094448 (UK) GPG ID: D33C3490 GPG FPR: 3733 612D 2D05 5458 8A8A 1600 3441 EA19 D33C 3490

[Qemu-devel] [PATCH 1/8] curl: Fix long line

Signed-off-by: Matthew Booth --- block/curl.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/block/curl.c b/block/curl.c index 6731d28..0404dbd 100644 --- a/block/curl.c +++ b/block/curl.c @@ -256,7 +256,8 @@ static void curl_multi_read(BDRVCURLState *s) case

[Qemu-devel] [PATCH 0/8] curl: Fix hang reading from slow connections

[PATCH 1/8] curl: Fix long line [PATCH 2/8] curl: Remove unnecessary use of goto [PATCH 3/8] curl: Fix return from curl_read_cb with invalid state [PATCH 4/8] curl: Remove erroneous sleep waiting for curl completion [PATCH 5/8] curl: Remove unnecessary explicit calls to internal event [PATCH 6/8] c

[Qemu-devel] [PATCH 4/8] curl: Remove erroneous sleep waiting for curl completion

ernal handler rather than waiting on existing registered handlers to be called from the main loop. This change causes it simply to wait for a period of time whilst allowing the main loop to execute. Signed-off-by: Matthew Booth --- block/curl.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-)

[Qemu-devel] [PATCH 6/8] curl: Eliminate unnecessary use of curl_multi_socket_all

relevant handle. At the same time, it also ensures that the driver only checks for completion of read operations after reading from a socket, rather than both reading and writing. Signed-off-by: Matthew Booth --- block/curl.c | 32 ++-- 1 file changed, 22 insertions(+), 10

[Qemu-devel] [PATCH 3/8] curl: Fix return from curl_read_cb with invalid state

A curl write callback is supposed to return the number of bytes it handled. curl_read_cb would have erroneously reported it had handled all bytes in the event that the internal curl state was invalid. Signed-off-by: Matthew Booth --- block/curl.c | 3 +-- 1 file changed, 1 insertion(+), 2

[Qemu-devel] [PATCH 5/8] curl: Remove unnecessary explicit calls to internal event handler

Remove calls to curl_multi_do where the relevant handles are already registered to the event loop. Ensure that we kick off socket handling with CURL_SOCKET_TIMEOUT after adding a new handle. Signed-off-by: Matthew Booth --- block/curl.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions

[Qemu-devel] [PATCH 2/8] curl: Remove unnecessary use of goto

This isn't any of the usually acceptable uses of goto. Signed-off-by: Matthew Booth --- block/curl.c | 55 +++ 1 file changed, 27 insertions(+), 28 deletions(-) diff --git a/block/curl.c b/block/curl.c index 0404dbd..e97f449 100644

[Qemu-devel] [PATCH 7/8] curl: Ensure all informationals are checked for completion

According to the documentation, the correct way to ensure all informationals have been returned by curl_multi_info_read is to loop until it returns NULL. Signed-off-by: Matthew Booth --- block/curl.c | 53 +++-- 1 file changed, 23 insertions

[Qemu-devel] [PATCH 8/8] curl: Fix hang reading from slow connections

which would never complete and had already been cancelled, resulting in a hang. Signed-off-by: Matthew Booth --- block/curl.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/block/curl.c b/block/curl.c index 16e7db8..d2f1084 100644 --- a/block/curl.c +++ b/block/curl.c @@ -

[Qemu-devel] [PATCH 0/3] curl: Add sslverify option and documentation

[PATCH 1/3] curl: Fix parsing of readahead option from filename [PATCH 2/3] curl: Add sslverify option [PATCH 3/3] curl: Add usage documentation Parsing the readahead option from a curl filename seems to have been broken for some time. The first patch restores what seems to have been its undocumen

[Qemu-devel] [PATCH 3/3] curl: Add usage documentation

Signed-off-by: Matthew Booth --- qemu-options.hx | 70 + 1 file changed, 70 insertions(+) diff --git a/qemu-options.hx b/qemu-options.hx index 781af14..e076e1c 100644 --- a/qemu-options.hx +++ b/qemu-options.hx @@ -2191,6 +2191,76 @@ qemu

[Qemu-devel] [PATCH 1/3] curl: Fix parsing of readahead option from filename

curl_parse_filename wasn't removing the option string from the url, resulting in a 404. This change is a essentially a rewrite of that function as I also need to extend it to handle more options. The rewrite is also much easier to read. Signed-off-by: Matthew Booth --- block/curl.c

[Qemu-devel] [PATCH 2/3] curl: Add sslverify option

This allows qemu to use images over https with a self-signed certificate. It defaults to verifying the certificate. Signed-off-by: Matthew Booth --- block/curl.c | 28 1 file changed, 28 insertions(+) diff --git a/block/curl.c b/block/curl.c index 2a03924..8731f63

[Qemu-devel] [PATCH 1/3] curl: Fix parsing of readahead option from filename

curl_parse_filename wasn't removing the option string from the url, resulting in a 404. This change is a essentially a rewrite of that function as I also need to extend it to handle more options. The rewrite is also much easier to read. Signed-off-by: Matthew Booth --- block/curl.c

[Qemu-devel] V2 curl: Fixup option parsing and add sslverify and documentation

[PATCH 1/3] curl: Fix parsing of readahead option from filename [PATCH 2/3] curl: Add sslverify option [PATCH 3/3] curl: Add usage documentation This updated version fixes a couple of bugs in the previously posted patch, and adds some addition code tidy-up. Matt

[Qemu-devel] [PATCH 3/3] curl: Add usage documentation

Signed-off-by: Matthew Booth --- qemu-options.hx | 70 + 1 file changed, 70 insertions(+) diff --git a/qemu-options.hx b/qemu-options.hx index 781af14..e076e1c 100644 --- a/qemu-options.hx +++ b/qemu-options.hx @@ -2191,6 +2191,76 @@ qemu

[Qemu-devel] [PATCH 2/3] curl: Add sslverify option

This allows qemu to use images over https with a self-signed certificate. It defaults to verifying the certificate. Signed-off-by: Matthew Booth --- block/curl.c | 33 + 1 file changed, 33 insertions(+) diff --git a/block/curl.c b/block/curl.c index 4de6856

Re: [Qemu-devel] [PATCH 1/3] curl: Fix parsing of readahead option from filename

On 30/04/14 16:16, Kevin Wolf wrote: > Am 30.04.2014 um 16:20 hat Matthew Booth geschrieben: >> curl_parse_filename wasn't removing the option string from the url, >> resulting in a 404. >> >> This change is a essentially a rewrite of that function as I also nee

Re: [Qemu-devel] [PATCH 2/3] curl: Add sslverify option

On 30/04/14 16:32, Kevin Wolf wrote: > Am 30.04.2014 um 16:20 hat Matthew Booth geschrieben: >> This allows qemu to use images over https with a self-signed certificate. It >> defaults to verifying the certificate. >> >> Signed-off-by: Matthew Booth &

Re: [Qemu-devel] [PULL 28/31] curl: Remove unnecessary explicit calls to internal event handler

On 06/05/14 10:56, Kevin Wolf wrote: > Am 06.05.2014 um 11:44 hat Laurent Desnogues geschrieben: >> Hello, >> >> sorry for another late detection of the use of too recent features. >> >> On Wed, Apr 30, 2014 at 8:24 PM, Kevin Wolf wrote: >>> Fr

[Qemu-devel] [PATCH] Documentation: Add documentation for -chardev

This patch adds documentation for -chardev. Please note that I am not the author of the -chardev code, so please read it carefully!

[Qemu-devel] [PATCH] Documentation: Add documentation for -chardev

Adds documentation for all -chardev backends. --- qemu-options.hx | 254 ++- 1 files changed, 251 insertions(+), 3 deletions(-) diff --git a/qemu-options.hx b/qemu-options.hx index d78b738..bc447a5 100644 --- a/qemu-options.hx +++ b/qemu-option

[Qemu-devel] [PATCH] Documentation: Add documentation for -chardev

Noticed that I'd omitted id= from -chardev null. Updated patch adds it.

[Qemu-devel] [PATCH] Documentation: Add documentation for -chardev

Adds documentation for all -chardev backends. --- qemu-options.hx | 254 ++- 1 files changed, 251 insertions(+), 3 deletions(-) diff --git a/qemu-options.hx b/qemu-options.hx index d78b738..0d74b48 100644 --- a/qemu-options.hx +++ b/qemu-option

[Qemu-devel] Re: [PATCH] Documentation: Add documentation for -chardev

On 30/10/09 09:17, Gerd Hoffmann wrote: On 10/29/09 17:56, Matthew Booth wrote: +DEFHEADING() + +DEFHEADING(Character device options:) + +DEF("chardev", HAS_ARG, QEMU_OPTION_chardev, + "-chardev null[,id=id]\n" + " A void device. This device will not emit any data, and

[Qemu-devel] Documentation: Add documentation for -chardev

Matt

[Qemu-devel] [PATCH] Documentation: Add documentation for -chardev

Adds documentation for all -chardev backends. Signed-off-by: Matthew Booth --- qemu-options.hx | 234 ++- 1 files changed, 230 insertions(+), 4 deletions(-) diff --git a/qemu-options.hx b/qemu-options.hx index d78b738..7922191 100644 --- a

Re: [Qemu-devel] [PATCH 2/4] block/curl: Fix return value from curl_read_cb

gt; > > > Reviewed-by: Eric Blake > > > > But given that it undoes 38bbc0a, I'd rather that it gets reviewed by > > Matthew and/or tested by Richard. > > In that case, I guess we should CC them. (Hereby done.) > > Kevin > -- Matthew Booth Red Hat Engineering, Virtualisation Team Phone: +442070094448 (UK)