From: Vladimir Sementsov-Ogievskiy <vsementsov@virtuozzo.com> To: qemu-block@nongnu.org Cc: qemu-devel@nongnu.org, mreitz@redhat.com, kwolf@redhat.com, vsementsov@virtuozzo.com, eblake@redhat.com, rvkagan@yandex-team.ru, den@openvz.org Subject: [PATCH 04/14] block/nbd: split connect_thread_cb() out of connect_thread_func() Date: Wed, 7 Apr 2021 13:46:27 +0300 [thread overview] Message-ID: <20210407104637.36033-5-vsementsov@virtuozzo.com> (raw) In-Reply-To: <20210407104637.36033-1-vsementsov@virtuozzo.com> We are going to split connect-thread to separate file. Start from splitting the callback. Signed-off-by: Vladimir Sementsov-Ogievskiy <vsementsov@virtuozzo.com> --- block/nbd.c | 27 +++++++++++++++++---------- 1 file changed, 17 insertions(+), 10 deletions(-) diff --git a/block/nbd.c b/block/nbd.c index fbf5154048..a9d351cbbc 100644 --- a/block/nbd.c +++ b/block/nbd.c @@ -385,20 +385,11 @@ static void nbd_free_connect_thread(NBDConnectThread *thr) g_free(thr); } -static void *connect_thread_func(void *opaque) +static void connect_thread_cb(int ret, void *opaque) { NBDConnectThread *thr = opaque; - int ret; bool do_free = false; - thr->sioc = qio_channel_socket_new(); - - ret = qio_channel_socket_connect_sync(thr->sioc, thr->saddr, NULL); - if (ret < 0) { - object_unref(OBJECT(thr->sioc)); - thr->sioc = NULL; - } - qemu_mutex_lock(&thr->mutex); switch (thr->state) { @@ -423,6 +414,22 @@ static void *connect_thread_func(void *opaque) if (do_free) { nbd_free_connect_thread(thr); } +} + +static void *connect_thread_func(void *opaque) +{ + NBDConnectThread *thr = opaque; + int ret; + + thr->sioc = qio_channel_socket_new(); + + ret = qio_channel_socket_connect_sync(thr->sioc, thr->saddr, NULL); + if (ret < 0) { + object_unref(OBJECT(thr->sioc)); + thr->sioc = NULL; + } + + connect_thread_cb(ret, thr); return NULL; } -- 2.29.2
next prev parent reply other threads:[~2021-04-07 10:52 UTC|newest] Thread overview: 21+ messages / expand[flat|nested] mbox.gz Atom feed top 2021-04-07 10:46 [PATCH 00/14] nbd: move reconnect-thread to separate file Vladimir Sementsov-Ogievskiy 2021-04-07 10:46 ` [PATCH 01/14] block/nbd: BDRVNBDState: drop unused connect_err Vladimir Sementsov-Ogievskiy 2021-04-07 11:13 ` Roman Kagan 2021-04-07 10:46 ` [PATCH 02/14] block/nbd: nbd_co_establish_connection(): drop unused errp Vladimir Sementsov-Ogievskiy 2021-04-07 11:28 ` Roman Kagan 2021-04-07 10:46 ` [PATCH 03/14] block/nbd: drop unused NBDConnectThread::err field Vladimir Sementsov-Ogievskiy 2021-04-07 11:42 ` Roman Kagan 2021-04-07 11:55 ` Vladimir Sementsov-Ogievskiy 2021-04-07 10:46 ` Vladimir Sementsov-Ogievskiy [this message] 2021-04-07 10:46 ` [PATCH 05/14] block/nbd: rename NBDConnectThread to NBDConnectCB Vladimir Sementsov-Ogievskiy 2021-04-07 10:46 ` [PATCH 06/14] block/nbd: further segregation of connect-thread Vladimir Sementsov-Ogievskiy 2021-04-08 10:44 ` Roman Kagan 2021-04-07 10:46 ` [PATCH 07/14] block/nbd: drop nbd_free_connect_thread() Vladimir Sementsov-Ogievskiy 2021-04-07 10:46 ` [PATCH 08/14] block/nbd: move nbd connect-thread to nbd/client-connect.c Vladimir Sementsov-Ogievskiy 2021-04-07 10:46 ` [PATCH 09/14] block/nbd: NBDConnectCB: drop bh_* fields Vladimir Sementsov-Ogievskiy 2021-04-07 10:46 ` [PATCH 10/14] block/nbd: move wait_connect field under mutex protection Vladimir Sementsov-Ogievskiy 2021-04-07 10:46 ` [PATCH 11/14] block/nbd: refactor connect_bh() Vladimir Sementsov-Ogievskiy 2021-04-07 10:46 ` [PATCH 12/14] block/nbd: refactor nbd_co_establish_connection Vladimir Sementsov-Ogievskiy 2021-04-07 10:46 ` [PATCH 13/14] block/nbd: nbd_co_establish_connection_cancel(): rename wake to do_wake Vladimir Sementsov-Ogievskiy 2021-04-07 10:46 ` [PATCH 14/14] block/nbd: drop thr->state Vladimir Sementsov-Ogievskiy 2021-04-08 10:03 ` DROP THIS Re: [PATCH 00/14] nbd: move reconnect-thread to separate file Vladimir Sementsov-Ogievskiy
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=20210407104637.36033-5-vsementsov@virtuozzo.com \ --to=vsementsov@virtuozzo.com \ --cc=den@openvz.org \ --cc=eblake@redhat.com \ --cc=kwolf@redhat.com \ --cc=mreitz@redhat.com \ --cc=qemu-block@nongnu.org \ --cc=qemu-devel@nongnu.org \ --cc=rvkagan@yandex-team.ru \ --subject='Re: [PATCH 04/14] block/nbd: split connect_thread_cb() out of connect_thread_func()' \ /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
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).