qemu-devel.nongnu.org archive mirror
 help / color / mirror / Atom feed
From: Jeff Cody <jcody@redhat.com>
To: qemu-block@nongnu.org
Cc: peter.maydell@linaro.org, jcody@redhat.com,
	qemu-devel@nongnu.org, Paolo Bonzini <pbonzini@redhat.com>,
	qemu-stable@nongnu.org
Subject: [Qemu-devel] [PULL 2/8] curl: strengthen assertion in curl_clean_state
Date: Tue, 16 May 2017 11:54:14 -0400	[thread overview]
Message-ID: <20170516155420.10106-3-jcody@redhat.com> (raw)
In-Reply-To: <20170516155420.10106-1-jcody@redhat.com>

From: Paolo Bonzini <pbonzini@redhat.com>

curl_clean_state should only be called after all AIOCBs have been
completed.  This is not so obvious for the call from curl_detach_aio_context,
so assert that.

Cc: qemu-stable@nongnu.org
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-2-pbonzini@redhat.com
Signed-off-by: Jeff Cody <jcody@redhat.com>
---
 block/curl.c | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/block/curl.c b/block/curl.c
index 4382234..562340f 100644
--- a/block/curl.c
+++ b/block/curl.c
@@ -533,6 +533,11 @@ static CURLState *curl_init_state(BlockDriverState *bs, BDRVCURLState *s)
 
 static void curl_clean_state(CURLState *s)
 {
+    int j;
+    for (j = 0; j < CURL_NUM_ACB; j++) {
+        assert(!s->acb[j]);
+    }
+
     if (s->s->multi)
         curl_multi_remove_handle(s->s->multi, s->curl);
 
-- 
2.9.3

  parent reply	other threads:[~2017-05-16 15:54 UTC|newest]

Thread overview: 10+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2017-05-16 15:54 [Qemu-devel] [PULL 0/8] Block patches for curl Jeff Cody
2017-05-16 15:54 ` [Qemu-devel] [PULL 1/8] block: curl: Allow passing cookies via QCryptoSecret Jeff Cody
2017-05-16 15:54 ` Jeff Cody [this message]
2017-05-16 15:54 ` [Qemu-devel] [PULL 3/8] curl: never invoke callbacks with s->mutex held Jeff Cody
2017-05-16 15:54 ` [Qemu-devel] [PULL 4/8] curl: avoid recursive locking of BDRVCURLState mutex Jeff Cody
2017-05-16 15:54 ` [Qemu-devel] [PULL 5/8] curl: split curl_find_state/curl_init_state Jeff Cody
2017-05-16 15:54 ` [Qemu-devel] [PULL 6/8] curl: convert CURLAIOCB to byte values Jeff Cody
2017-05-16 15:54 ` [Qemu-devel] [PULL 7/8] curl: convert readv to coroutines Jeff Cody
2017-05-16 15:54 ` [Qemu-devel] [PULL 8/8] curl: do not do aio_poll when waiting for a free CURLState Jeff Cody
2017-05-17 12:55 ` [Qemu-devel] [Qemu-block] [PULL 0/8] Block patches for curl Stefan Hajnoczi

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20170516155420.10106-3-jcody@redhat.com \
    --to=jcody@redhat.com \
    --cc=pbonzini@redhat.com \
    --cc=peter.maydell@linaro.org \
    --cc=qemu-block@nongnu.org \
    --cc=qemu-devel@nongnu.org \
    --cc=qemu-stable@nongnu.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).