From f7393fe35030ace07ad7d9468a54ca7bae132e3b Mon Sep 17 00:00:00 2001

From: Paolo Bonzini <pbonzini@redhat.com>

Date: Wed, 17 May 2017 13:09:18 +0200

Subject: [PATCH 12/27] curl: split curl_find_state/curl_init_state

RH-Author: Paolo Bonzini <pbonzini@redhat.com>

Message-id: <20170517130921.27402-5-pbonzini@redhat.com>

Patchwork-id: 75263

O-Subject: [RHEL7.4 qemu-kvm PATCH v2 4/7] curl: split curl_find_state/curl_init_state

Bugzilla: 1437393

RH-Acked-by: Max Reitz <mreitz@redhat.com>

RH-Acked-by: Stefan Hajnoczi <stefanha@redhat.com>

RH-Acked-by: Jeffrey Cody <jcody@redhat.com>

If curl_easy_init fails, a CURLState is left with s->in_use = 1.  Split

curl_init_state in two, so that we can distinguish the two failures and

call curl_clean_state if needed.

While at it, simplify curl_find_state, removing a dummy loop.  The

aio_poll loop is moved to the sole caller that needs it.

Reviewed-by: Jeff Cody <jcody@redhat.com>

Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>

Reviewed-by: Max Reitz <mreitz@redhat.com>

Message-id: 20170515100059.15795-5-pbonzini@redhat.com

Signed-off-by: Jeff Cody <jcody@redhat.com>

(cherry picked from commit 3ce6a729b5d78b13283ddc6c529811f67519a62d)

Signed-off-by: Miroslav Rezanina <mrezanin@redhat.com>

---

 block/curl.c | 52 ++++++++++++++++++++++++++++++----------------------

 1 file changed, 30 insertions(+), 22 deletions(-)

diff --git a/block/curl.c b/block/curl.c

index 7001476..75e63d3 100644

--- a/block/curl.c

+++ b/block/curl.c

@@ -455,34 +455,27 @@ static void curl_multi_timeout_do(void *arg)

 }

 /* Called with s->mutex held.  */

-static CURLState *curl_init_state(BlockDriverState *bs, BDRVCURLState *s)

+static CURLState *curl_find_state(BDRVCURLState *s)

 {

     CURLState *state = NULL;

-    int i, j;

-

-    do {

-        for (i=0; i

-            for (j=0; j

-                if (s->states[i].acb[j])

-                    continue;

-            if (s->states[i].in_use)

-                continue;

+    int i;

+    for (i = 0; i < CURL_NUM_STATES; i++) {

+        if (!s->states[i].in_use) {

             state = &s->states[i];

             state->in_use = 1;

             break;

         }

-        if (!state) {

-            qemu_mutex_unlock(&s->mutex);

-            aio_poll(bdrv_get_aio_context(bs), true);

-            qemu_mutex_lock(&s->mutex);

-        }

-    } while(!state);

+    }

+    return state;

+}

+static int curl_init_state(BDRVCURLState *s, CURLState *state)

+{

     if (!state->curl) {

         state->curl = curl_easy_init();

         if (!state->curl) {

-            return NULL;

+            return -EIO;

         }

         curl_easy_setopt(state->curl, CURLOPT_URL, s->url);

         curl_easy_setopt(state->curl, CURLOPT_SSL_VERIFYPEER,

@@ -535,7 +528,7 @@ static CURLState *curl_init_state(BlockDriverState *bs, BDRVCURLState *s)

     QLIST_INIT(&state->sockets);

     state->s = s;

-    return state;

+    return 0;

 }

 /* Called with s->mutex held.  */

@@ -756,13 +749,18 @@ static int curl_open(BlockDriverState *bs, QDict *options, int flags,

     s->aio_context = bdrv_get_aio_context(bs);

     s->url = g_strdup(file);

     qemu_mutex_lock(&s->mutex);

-    state = curl_init_state(bs, s);

+    state = curl_find_state(s);

     qemu_mutex_unlock(&s->mutex);

-    if (!state)

+    if (!state) {

         goto out_noclean;

+    }

     // Get file size

+    if (curl_init_state(s, state) < 0) {

+        goto out;

+    }

+

     s->accept_range = false;

     curl_easy_setopt(state->curl, CURLOPT_NOBODY, 1);

     curl_easy_setopt(state->curl, CURLOPT_HEADERFUNCTION,

@@ -857,8 +855,18 @@ static void curl_readv_bh_cb(void *p)

     }

     // No cache found, so let's start a new request

-    state = curl_init_state(acb->common.bs, s);

-    if (!state) {

+    for (;;) {

+        state = curl_find_state(s);

+        if (state) {

+            break;

+        }

+        qemu_mutex_unlock(&s->mutex);

+        aio_poll(bdrv_get_aio_context(bs), true);

+        qemu_mutex_lock(&s->mutex);

+    }

+

+    if (curl_init_state(s, state) < 0) {

+        curl_clean_state(state);

         ret = -EIO;

         goto out;

     }

-- 

1.8.3.1