From nobody Fri Mar 29 14:24:56 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; arc=pass (i=1dmarc=pass fromdomain=virtuozzo.com); dmarc=pass(p=quarantine dis=none) header.from=virtuozzo.com ARC-Seal: i=2; a=rsa-sha256; t=1617792751; cv=pass; d=zohomail.com; s=zohoarc; b=Rp0rFol6V3vW04+En61E+ElLyLnnnHtzTBxTgpF/qIElfaoM72hQF5jXIkO+6SZ1BeQXqzytP/RtSB3eZpxNF//D0MbRI4eImWj+fPBOPweuPQRV86istuYjKNlKuAspCo1iHUtGs+n0wcPs0S6Whb8JFF55TTLh//9Ij9yjoc8= ARC-Message-Signature: i=2; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1617792751; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=DoSxa8d6P7dvltNkte57NzMS4nfNANxUMrTAJFypjeU=; b=n7dV3+JKJJvENgDkup/uiNsDEASIYjQd5humtInyLwlUATa1d8joNqHB4/pKha3QLyNZnJa5jtgsIDhVxWDEObts9qp/mS+89KqsURBEvb2gmJbFrGnIo7KyHzcW1Us57DhkfxshfOSARiBsBb81E/taIgck59tK4EXJXLBsFUw= ARC-Authentication-Results: i=2; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; arc=pass (i=1dmarc=pass fromdomain=virtuozzo.com); dmarc=pass header.from= (p=quarantine dis=none) header.from= Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1617792751664852.6532047654088; Wed, 7 Apr 2021 03:52:31 -0700 (PDT) Received: from localhost ([::1]:60888 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1lU5nS-00024N-KG for importer@patchew.org; Wed, 07 Apr 2021 06:52:30 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:58426) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lU5iE-0005K9-7L; Wed, 07 Apr 2021 06:47:06 -0400 Received: from mail-vi1eur05on2103.outbound.protection.outlook.com ([40.107.21.103]:59841 helo=EUR05-VI1-obe.outbound.protection.outlook.com) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lU5iA-0001Lp-Fk; Wed, 07 Apr 2021 06:47:05 -0400 Received: from AM7PR08MB5494.eurprd08.prod.outlook.com (2603:10a6:20b:dc::15) by AS8PR08MB6376.eurprd08.prod.outlook.com (2603:10a6:20b:33e::11) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.3999.32; Wed, 7 Apr 2021 10:46:57 +0000 Received: from AM7PR08MB5494.eurprd08.prod.outlook.com ([fe80::b403:c1a9:6bb7:133]) by AM7PR08MB5494.eurprd08.prod.outlook.com ([fe80::b403:c1a9:6bb7:133%7]) with mapi id 15.20.4020.017; Wed, 7 Apr 2021 10:46:57 +0000 Received: from localhost.localdomain (185.215.60.206) by HE1PR0902CA0021.eurprd09.prod.outlook.com (2603:10a6:3:e5::31) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4020.17 via Frontend Transport; Wed, 7 Apr 2021 10:46:56 +0000 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=Xu92dROCTrM++YoAzvJ8BzRyh1GoiAHQajmmAc16GIOoMYN111y6lYwx+xtasX1gxOL0aBegIgxDKdWTFtforFTzgxIBzZq9h2ZxuwQu8fNV24uBPW4loitzsIJZx+wZ0EXUb+ojuQTFtBjkRKKBcVpnjXrP7BwuvkRF59m3EElZptZ9UVJBhOzSUBRzuye7SIVVQtXN3RqStmlqFy2IoXAnvt+4pISc3Ucws9IUIFIWU6oRnZna3B1BVVq6/6ywk8wUtkQHQMXeA5BctyAt6vU9eZQTzaj1GIC5qvQy1H1JEwBuidu2LZ+OxqFQqueMFFibRzxsjA+ZJK/tndLr2g== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=DoSxa8d6P7dvltNkte57NzMS4nfNANxUMrTAJFypjeU=; b=cGtxYiIybT6uhjl/Jo2aPs4Lgz+0suJsLW94knphCgcJtU6XSiTtCFfEzu99BloGktRa93f9hONxy7Js8FiUrepJNFFKohpiRB1oWt16ejJfoPOMfQ4hnZhHU6TnHLr6W0fEkI5u+jkMUbzf9Wh57E8PqigA/ie+FVzJ9dMRx19X6+7n16l8T8eXKMpbrypD5fbdIaEBMV4cGhzgSRlmqgsWCGclu/UdWgCmJMGeCzl7td1pr/iQ5CKc60+wQRMgMfFYiZEbT/XcfSgX3fwq8V5TW1vT2I0ub7lD/GejcSej2TaVcdIPG1fv7Eq8XSuzTWvx262YN21SBdzNOPn8gw== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=virtuozzo.com; dmarc=pass action=none header.from=virtuozzo.com; dkim=pass header.d=virtuozzo.com; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=virtuozzo.com; s=selector2; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=DoSxa8d6P7dvltNkte57NzMS4nfNANxUMrTAJFypjeU=; b=CdidK/fdwyusPToS9F8A3ZUy4x+g6sQp5nI9J/jnZfArGUll48IiS6Ng5QxvmcJiKEJjYGVbTcO9Tvse0G2z2TzWNewQg/UXPG41vjLNYiajFMkfCG6blbS27hHdmZQ6fvCrAON0wSwHb1m1rZvCpK7PXyCPZ3ZRJyqAuFZA1uA= Authentication-Results: nongnu.org; dkim=none (message not signed) header.d=none;nongnu.org; dmarc=none action=none header.from=virtuozzo.com; From: Vladimir Sementsov-Ogievskiy 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 01/14] block/nbd: BDRVNBDState: drop unused connect_err Date: Wed, 7 Apr 2021 13:46:24 +0300 Message-Id: <20210407104637.36033-2-vsementsov@virtuozzo.com> X-Mailer: git-send-email 2.29.2 In-Reply-To: <20210407104637.36033-1-vsementsov@virtuozzo.com> References: <20210407104637.36033-1-vsementsov@virtuozzo.com> Content-Transfer-Encoding: quoted-printable X-Originating-IP: [185.215.60.206] X-ClientProxiedBy: HE1PR0902CA0021.eurprd09.prod.outlook.com (2603:10a6:3:e5::31) To AM7PR08MB5494.eurprd08.prod.outlook.com (2603:10a6:20b:dc::15) MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 0d08d382-fdff-4805-50d5-08d8f9b27753 X-MS-TrafficTypeDiagnostic: AS8PR08MB6376: X-MS-Exchange-Transport-Forked: True X-Microsoft-Antispam-PRVS: X-MS-Oob-TLC-OOBClassifiers: OLM:231; X-MS-Exchange-SenderADCheck: 1 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: nFqz95XcUH2xzGwwPXsOIAER0UZcLjGgGHhF7hX7odt6WzrsIfpo8nP9z1Pt1xXQMk8j8M39uL9JTb/PU2pIRhZq6IwZohXb48NQwY+e1+/sb6kuCYkT2TB04uDYyx8ccdAxUXy8EA/oj0xOB07JoO+gk1raxsLL3Skx1XyWc+A74iP2VJNzwbNjtsAhtA9+Mc3ccJ+P2K0FxSOfMo6m7ZrnbSqUtOBzZSGhQ3nZFA5bShLDqWnaV9usCFEIeJ73mCaz6U0Q0GOyr9gWXRr7+yMPCBr2xRyrWWr/RXangbghvhcuPEaAXiY9TXwOF8mMZJoxDuSNhPy7L1c96IoLsJj8G7IV/77QcA3H7YmCKxhTjlZtEZE45pow/a6jerscFUpKK7SvINgVN3gy/+DClJsX7RRu/3EdYHTT3zAAnHDs9o2xVdg9b05Ntko1vxArveo7t4wyEgBtsOgs9XWxj1HX2CUqVkacSc92KJnnH6TpgeHEkrv/l4vDjSk6aDE0sj1QQ2pOtBTnlA+qo/V7WTDGKr7gtAXCBCMj9sJbv4Sm52LdPPqQ7XKyigUcbmQ+ysu84T1FQRbNhB1BVImcKCZPD47w8O10OY+uJPaQzbcoY0xxCXDBYlQtHSP1ogbHOQL7cN1adriYaiCiK3HGws8TnGuuc+uFJhhACE2HISotCArFtre0BNkXgd0m2thUi007h7hG5md1Njvc4RszcfBPXwCqahK2UivLy9k41Fw= X-Forefront-Antispam-Report: CIP:255.255.255.255; CTRY:; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:AM7PR08MB5494.eurprd08.prod.outlook.com; PTR:; CAT:NONE; SFS:(4636009)(136003)(39840400004)(366004)(376002)(396003)(346002)(107886003)(69590400012)(83380400001)(6506007)(6666004)(66946007)(6512007)(38350700001)(8936002)(6916009)(316002)(16526019)(4326008)(186003)(8676002)(52116002)(956004)(26005)(5660300002)(38100700001)(6486002)(2616005)(36756003)(66556008)(66476007)(86362001)(2906002)(478600001)(1076003); DIR:OUT; SFP:1102; X-MS-Exchange-AntiSpam-MessageData: =?us-ascii?Q?O30ddZEKpLvHXZBqGfb4bMrtaRschQ17tb8Xn63vTy5dZ57Tei53Zxn2akBA?= =?us-ascii?Q?AG06h1s9rj1mk/ieD01sOLYvm+gTRJ1g+CLTg5++wdX7IT3z1QKoGYeuGVwk?= =?us-ascii?Q?86BMtTAYrNZ0d5t1ixPUxotkp0P4oPwv/kLA3UXHBCvRrmi4krs0MnEsU9ka?= =?us-ascii?Q?q5F/A07KptR5FsqxBjh1LNdq7xnvD7Ft6eNUuOZDY3h/Vd31EujD/7P2+gop?= =?us-ascii?Q?9owzfK8RiCPqh5YSzk19fM7Wybjd/eNEqKjws8yLfPPLj/u9V3wtHgQKF4lu?= =?us-ascii?Q?iyb0tM6NyGBKqrbjxqpObgGEFt/jlTNEwpPc1o63FA/la7e4L3qmeotet183?= =?us-ascii?Q?GHX1izMcuinUZzZnXsWtMOZpshR5sOF9kJUcPNl/0f0so9ZTcq/GGPMR6gL1?= =?us-ascii?Q?OAH0FLQ+RUozugZr+dbdYv4via2bz0qR2QPw8FDrFagsnIjuKrNxvJ0KXOpz?= =?us-ascii?Q?M6+BWbTH/b7A1o6pmt25p9PTyN8jqKfGFqBMVcx7shW7XV3v+NMH+093XuVU?= =?us-ascii?Q?2fal7ZI81KxOONUc9JzEzK3RKguJd9w9RlzQlrUE1tEgiALlx8cXtFlN/z6i?= =?us-ascii?Q?/rcOP8qr9pZtm9g3HphaPrwg6xD3+5iukLfM8Y/4Mvymy3anAwp5ru9BltT+?= =?us-ascii?Q?bbllj1CuFjK5SO/g4y17E9hHlFRnYIQ61shBpJ1ADVD6zg19PI8Zs9Of4M47?= =?us-ascii?Q?Bj1OGtDbHcXShK+y58tabkWwDcvgaHK+9F0VQeVQFV+/HcG8iApY6JqsUUuQ?= =?us-ascii?Q?0aH3iyBoG109OS67VY3DgZqN3dhCtzY/oUUA6DgpLHFdtlmtodUguU11VfUl?= =?us-ascii?Q?EapsnfeOYZaGERBLJnYTTtz6tb97WNzXep8GICSjjUV9CHJ0szvcPEG/6WGB?= =?us-ascii?Q?Nb85X+tlrB05cshDRXpNRkal9cpCFy9U8+/YbffUQcu1EudSs5EE0OxwMtaj?= =?us-ascii?Q?tJszHdUwyGOZ+aJlrEl9hE81paVTpHzPAYMLOMOZ1ZsPJp1tJeMoae1BVdaH?= =?us-ascii?Q?oZRZEW6A1+OgJYqOPTYK+35zPCVSBHQLFlGPKIIThNKY0G9QnkVGUkk6g7Nf?= =?us-ascii?Q?zq1kaOU2CdZ6Zw6npV2AP5jHrgY/EQWdzXuZz7aocLeHjVvwm55x/YatMSTa?= =?us-ascii?Q?/rp3YFsUTQvqC3eUvLExIVJBfhHk5J6dQOiNoEF62IAc3P/fXt5M7+yWAA2R?= =?us-ascii?Q?KK3T5QiCr+3lYCVz3/grncEpyp25uqDE5nTrfcGFnYLaPPGF5xukr0OenOOs?= =?us-ascii?Q?4HzOBoMOWNnIfsTckLtJM5S/qy+PtUs6NxaL0S7ZUgymFpfLKL9Yd0xmUO3a?= =?us-ascii?Q?tc3EXdLQtQN3RLz+eoUCM+v5?= X-OriginatorOrg: virtuozzo.com X-MS-Exchange-CrossTenant-Network-Message-Id: 0d08d382-fdff-4805-50d5-08d8f9b27753 X-MS-Exchange-CrossTenant-AuthSource: AM7PR08MB5494.eurprd08.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 07 Apr 2021 10:46:57.6151 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 0bc7f26d-0264-416e-a6fc-8352af79c58f X-MS-Exchange-CrossTenant-MailboxType: HOSTED X-MS-Exchange-CrossTenant-UserPrincipalName: Jh9o5ql+mYniqHxDdFDoI9LcEQBH1lITn5FJlgnkWv0/82jNLXBYjGqt1NsYchyrA5Fx8HdNb04G38uSyNQWQJLtjzBa5cELVNmHptOpu0s= X-MS-Exchange-Transport-CrossTenantHeadersStamped: AS8PR08MB6376 Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=40.107.21.103; envelope-from=vsementsov@virtuozzo.com; helo=EUR05-VI1-obe.outbound.protection.outlook.com X-Spam_score_int: -27 X-Spam_score: -2.8 X-Spam_bar: -- X-Spam_report: (-2.8 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, MSGID_FROM_MTA_HEADER=0.001, RCVD_IN_DNSWL_LOW=-0.7, RCVD_IN_MSPIKE_H2=-0.001, SPF_HELO_PASS=-0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: pass (identity @virtuozzo.com) Content-Type: text/plain; charset="utf-8" The field is actually unused. Let's make things a bit simpler dropping it and corresponding logic. Signed-off-by: Vladimir Sementsov-Ogievskiy --- block/nbd.c | 9 ++------- 1 file changed, 2 insertions(+), 7 deletions(-) diff --git a/block/nbd.c b/block/nbd.c index c26dc5a54f..a47d6cfea3 100644 --- a/block/nbd.c +++ b/block/nbd.c @@ -122,7 +122,6 @@ typedef struct BDRVNBDState { int in_flight; NBDClientState state; int connect_status; - Error *connect_err; bool wait_in_flight; =20 QEMUTimer *reconnect_delay_timer; @@ -578,7 +577,6 @@ static void nbd_co_establish_connection_cancel(BlockDri= verState *bs, static coroutine_fn void nbd_reconnect_attempt(BDRVNBDState *s) { int ret; - Error *local_err =3D NULL; =20 if (!nbd_client_connecting(s)) { return; @@ -619,14 +617,14 @@ static coroutine_fn void nbd_reconnect_attempt(BDRVNB= DState *s) s->ioc =3D NULL; } =20 - if (nbd_co_establish_connection(s->bs, &local_err) < 0) { + if (nbd_co_establish_connection(s->bs, NULL) < 0) { ret =3D -ECONNREFUSED; goto out; } =20 bdrv_dec_in_flight(s->bs); =20 - ret =3D nbd_client_handshake(s->bs, &local_err); + ret =3D nbd_client_handshake(s->bs, NULL); =20 if (s->drained) { s->wait_drained_end =3D true; @@ -642,9 +640,6 @@ static coroutine_fn void nbd_reconnect_attempt(BDRVNBDS= tate *s) =20 out: s->connect_status =3D ret; - error_free(s->connect_err); - s->connect_err =3D NULL; - error_propagate(&s->connect_err, local_err); =20 if (ret >=3D 0) { /* successfully connected */ --=20 2.29.2 From nobody Fri Mar 29 14:24:56 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; arc=pass (i=1dmarc=pass fromdomain=virtuozzo.com); dmarc=pass(p=quarantine dis=none) header.from=virtuozzo.com ARC-Seal: i=2; a=rsa-sha256; t=1617792565; cv=pass; d=zohomail.com; s=zohoarc; b=iEd0xYZBKtmv7RJLz0nOleiShLv+xEM4iIKj+5MCLfaAH+8ak6dOqBf/P/qxbw4JTsMWT6XwL8unZMw/N8hiVTPWCAw0uogjgwwpyJtQY3PA1WgHd0BpBG0n0g2wEMxEmpd265ejU7psTAj7VJLcHlCSpbHGXQY5/a/mvehD1YA= ARC-Message-Signature: i=2; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1617792565; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=UstyaWhcai2+zMpaiu1oCwjxGXfSR2FUfh73V1yqJlM=; b=A3pL4UhMGjRGYp9DqDVHSbhNukRnLDKftywQVUh12dwJ8glV06p1mu0gOKUVEX4bCHF+N5lN+x3Yih2R/fmwqymk0fj4l4LbGiyc6v+qX1hTBPc/qlkc/xyfare3UzoqL3rkHTlQSoIZ794U5XUT1sQou49FD2NkKoFio0u7Yv0= ARC-Authentication-Results: i=2; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; arc=pass (i=1dmarc=pass fromdomain=virtuozzo.com); dmarc=pass header.from= (p=quarantine dis=none) header.from= Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1617792565090490.18482966110594; Wed, 7 Apr 2021 03:49:25 -0700 (PDT) Received: from localhost ([::1]:53650 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1lU5kS-0007VI-27 for importer@patchew.org; Wed, 07 Apr 2021 06:49:24 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:58466) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lU5iI-0005St-Ce; Wed, 07 Apr 2021 06:47:10 -0400 Received: from mail-vi1eur05on2103.outbound.protection.outlook.com ([40.107.21.103]:59841 helo=EUR05-VI1-obe.outbound.protection.outlook.com) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lU5iE-0001Lp-W3; Wed, 07 Apr 2021 06:47:10 -0400 Received: from AM7PR08MB5494.eurprd08.prod.outlook.com (2603:10a6:20b:dc::15) by AS8PR08MB6376.eurprd08.prod.outlook.com (2603:10a6:20b:33e::11) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.3999.32; Wed, 7 Apr 2021 10:46:59 +0000 Received: from AM7PR08MB5494.eurprd08.prod.outlook.com ([fe80::b403:c1a9:6bb7:133]) by AM7PR08MB5494.eurprd08.prod.outlook.com ([fe80::b403:c1a9:6bb7:133%7]) with mapi id 15.20.4020.017; Wed, 7 Apr 2021 10:46:59 +0000 Received: from localhost.localdomain (185.215.60.206) by HE1PR0902CA0021.eurprd09.prod.outlook.com (2603:10a6:3:e5::31) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4020.17 via Frontend Transport; Wed, 7 Apr 2021 10:46:58 +0000 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=gUt1FzP0cRrxQjiOo1vkuiS5qAJ32+7QZitrt3oJKg9vyGK+jBQKb8whio4UV/pae3IN5G9BcZrsFCCNYn3ZtJOqD8kXgg9mPdGaw+FCHZQ8Mf1zILdFW6lH4+pM7AAy94yQP2p7MUjfi9nB2O4SGJ+77CqMHFn45O5EXCplhJtjxL/Rhy1HdUrJ+kHse6isNETqqhLtf4F4INeT5viTgVyiF5mPcmZhgXqPrMHDQjerpgdLAPRvLkUi1Ux+mHSYW1qIxBYVZmEwRN9ut4QDPBhf46qPcSXfaMxmNzHLp+YpiCBmKTMobiynH4zPioaJkiXOZ2tUtCuzxm+Ic1B9og== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=UstyaWhcai2+zMpaiu1oCwjxGXfSR2FUfh73V1yqJlM=; b=QX2z3pw+KKUBFAz8A9MhowX4FY0DoGoFvvGXeaLT0gpj7z09o3c6ZvhE70/gwA5gtYwsk5M8hpeL82JJ0PfeqB5IJMKWYL1On2mWthK3wqF+gpaZHSAy0XDO4xbl/uDxf4ucBN4xnQJs9rSn0Nezrn48Vjl6+OsfX/ojOe6GIDWLzEdLV10snQuKlWyxZD5qTdoES58AVjdU7JIcDtQzofF9RwXMzS0hk0QaavfOyE7aPlvSyeYZueaKpBzmadPosGEJ1oFMOMOgqKLfxcDUhn7cFqpbV4rIPn53cXe4bznswVTZKmYyjmuTZuzecvWikH72QrebddxtBHnDNGid2Q== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=virtuozzo.com; dmarc=pass action=none header.from=virtuozzo.com; dkim=pass header.d=virtuozzo.com; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=virtuozzo.com; s=selector2; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=UstyaWhcai2+zMpaiu1oCwjxGXfSR2FUfh73V1yqJlM=; b=QvdMTwZnFeqAyEIOuTMcoCULI4yt+67WNEX+Eu6CzL7C94vGWMn7616bhgncuIQt9imphv4unByiMZejhyeoWdi7t3T8e5q1hQy5N2oMHQ5/YcoCtBH293lyFdUlTIU5adgGfljtVRzgphPa5LLMP7fCczfteH8zsSPA173Vk3U= Authentication-Results: nongnu.org; dkim=none (message not signed) header.d=none;nongnu.org; dmarc=none action=none header.from=virtuozzo.com; From: Vladimir Sementsov-Ogievskiy 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 02/14] block/nbd: nbd_co_establish_connection(): drop unused errp Date: Wed, 7 Apr 2021 13:46:25 +0300 Message-Id: <20210407104637.36033-3-vsementsov@virtuozzo.com> X-Mailer: git-send-email 2.29.2 In-Reply-To: <20210407104637.36033-1-vsementsov@virtuozzo.com> References: <20210407104637.36033-1-vsementsov@virtuozzo.com> Content-Transfer-Encoding: quoted-printable X-Originating-IP: [185.215.60.206] X-ClientProxiedBy: HE1PR0902CA0021.eurprd09.prod.outlook.com (2603:10a6:3:e5::31) To AM7PR08MB5494.eurprd08.prod.outlook.com (2603:10a6:20b:dc::15) MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: b9bda354-e496-4c31-d037-08d8f9b2785b X-MS-TrafficTypeDiagnostic: AS8PR08MB6376: X-MS-Exchange-Transport-Forked: True X-Microsoft-Antispam-PRVS: X-MS-Oob-TLC-OOBClassifiers: OLM:416; X-MS-Exchange-SenderADCheck: 1 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: L1Q2+ESqfYM8tv1Mb+unX5iGTXNTTraSZGv6xEG+jyl1ig+cchdl+pkbTszqjhXxzv2xUPLrUCsnO0P7XBIpvo6U+NapEdUW10NPhUuaMS9qpjwIrPYHZYRzyq7wEjznrU9Rd1fq5J6Z0jvEtFQFQNjwiqUCQISdchUzccvuU/Qlr7JzidrCNX/G/UcpCfsVzC1d/+U9e6olKYw1UcduCYMAgZSt9fAGyIE6O8X7pgXpAXB6h3tuTWZF2BVm6eerpnZeR8tdSBHv6HCXln1cZ9gcyexk4Wy9KZImk6pr3UD4wC/Dntden12paNSQ4DI2H4ZE2AGvi8ZnVJPTy6h5/XLZh2Md6RGn6WLjray+P8expScVu770vPVFkPDMP/703bjnoML1oxOUXGv2BTk/DcuPDnwtg2iXXIJmUQwxahG3XEvUSfrKiquG3NMFK54BtQ/q9znqnCwEX2I89558Ex+FoKt6QPcIAqWRN/WSYFL3X+kMnMl/fmqjnEoJj2jBW4jRXnHjdpozefB+mX0UTVA6/hi8X4/Z8DA8eauSo+J7gf8RzKdak0jP+Wk1vITD8zzQcIHx6jDHrzcGs+8mw6ui8L6d8MzZU5y7i2IQvKIaCu/uvwE9t8a72DtQAd1u7m7x41T6+bmyD4dhPWBICy92V9/rOPLOKsOEX9TXto4pzRPSkhmrU3KBBTL2gubEbpvljD2xWqICQtaA0LnD+DngGhcRTjZMA1BW9EGeLN8= X-Forefront-Antispam-Report: CIP:255.255.255.255; CTRY:; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:AM7PR08MB5494.eurprd08.prod.outlook.com; PTR:; CAT:NONE; SFS:(4636009)(136003)(39840400004)(366004)(376002)(396003)(346002)(107886003)(69590400012)(83380400001)(6506007)(6666004)(66946007)(6512007)(38350700001)(8936002)(6916009)(316002)(16526019)(4326008)(186003)(8676002)(52116002)(956004)(26005)(5660300002)(38100700001)(6486002)(2616005)(36756003)(66556008)(66476007)(86362001)(2906002)(478600001)(1076003); DIR:OUT; SFP:1102; X-MS-Exchange-AntiSpam-MessageData: =?us-ascii?Q?lQSjUnMmYImIzAVoBeScsbEC8RVxylLTMuEJlvwb+2ckJzNxnhqxL1+YYF6A?= =?us-ascii?Q?7E01vc+NEH7e6wQz3uwxDOCamOMMOxyMe1HsTwVmKmcomaobsJJYYgYnN278?= =?us-ascii?Q?sTOLv8zTjSz9/FiEXtIpfnDor+dtduMLK34Qaos1JIM/oI6QPvgwwu0ymuTg?= =?us-ascii?Q?+FE1Ou4k/tUF/HhL9UgrwZ7hja8AvTs1yjJ44HL2M4gejuemRfMBPRsVWH15?= =?us-ascii?Q?MJ6VjDhNpdSTrxV6BUbTHm+iqvh9+6oTHd1gyJtAhNr43J1DQoF2QmstIdgV?= =?us-ascii?Q?wv7Z3jbV8/KBnWrcoDvVxZK5GJ3PF0+FFgpH2gMXHP1E3W2Lc/YN2EZ8oGvT?= =?us-ascii?Q?pH5f3Z+dmsA4dKDWq/hYnmPUfXgvomIi961OvsIf1ajUKNwXkINqfECFttPc?= =?us-ascii?Q?sL34EZIKnHA1RLmDyxo07zDhczbD1AHy8Fy2JjT6sWqsXDoPPj6OtWSolhB0?= =?us-ascii?Q?MLjoTfYtjMwKUYnF86VpoopUhqhlCo6TCkWlLQvn3RLjBphpiHy/aKa7ieHB?= =?us-ascii?Q?wRXY8F0EZrpfIYMGB+AV45Tiyi1RYutLN5CL53FaDeBxHmZQ43ITxpENBnDS?= =?us-ascii?Q?tOyi/oz6m6ObylFEG63Ds7jTI4415a/mcBRPKZSdpxPpNLUZzu7K2I/LCYjs?= =?us-ascii?Q?TcDPVqFp9SyQ6Yd0klm9NJqpaLpBTBTWfdg9UhFJ8BP4aVmbNoP7fDwphIpN?= =?us-ascii?Q?bM5FsXYP5Gb0z3AzNgKYNZQIWN7ILh64THUx6j37Ovy8RHRGSeiGV00a2KOY?= =?us-ascii?Q?ph9wrERO6F3zKA0+pHZm8HlJXTEwPAUfUqDf0PIdLtmV9C9ilbIF9OOtow6E?= =?us-ascii?Q?Ws1+5pKvAnS3m/49veBq77WMN+T+ibS78DHw4U0hmeEDUmtjzkxhVvIKNA49?= =?us-ascii?Q?8JeIeI6NjwoG3IAOk1+UtA+x5wbY4MiQO2dXmZmC+a7zQWUsGd0NWDm3shSn?= =?us-ascii?Q?d+C1pPJsxl7gqsox4/1wBurAgAIK7lhk/dcI4cTKmMVSuTWBo04t95n1xiaF?= =?us-ascii?Q?DYbgd3yARFv63LtmszcDAjyllMRR5pqECJyg+N4/F/9h4A5F9GFKftWIjuT5?= =?us-ascii?Q?fzw5N5aq+tCAYsu6jR8+o0SxEugpVlzEYAoE4HYpHz2Eh6BB/neokuXTNuxX?= =?us-ascii?Q?nDtk0y+A/P4kr147G6Fx4VgNhNxjaj6M0Dy8nmNoMEnvwKZ5MAw/xGsujW/g?= =?us-ascii?Q?1x/RF3hMmLQxme/UuHWI1gjwsoFCegtrJCspq/QSAcd7gNlVjII/5KdXF4D7?= =?us-ascii?Q?Qe1ggfLlUuKFNpvtlAhU+rLZgFg7ycishVxhqKiCNv1CRnBr6lEm5M7ORqtC?= =?us-ascii?Q?KIC9c6fxVdDM64GdLYUGS5JL?= X-OriginatorOrg: virtuozzo.com X-MS-Exchange-CrossTenant-Network-Message-Id: b9bda354-e496-4c31-d037-08d8f9b2785b X-MS-Exchange-CrossTenant-AuthSource: AM7PR08MB5494.eurprd08.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 07 Apr 2021 10:46:59.3883 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 0bc7f26d-0264-416e-a6fc-8352af79c58f X-MS-Exchange-CrossTenant-MailboxType: HOSTED X-MS-Exchange-CrossTenant-UserPrincipalName: SnrObGUdiU6CPYW5nzmWS4+uFdIDjb5bT+q1CDoJXxlg542EzSOn0bu82c242EhbvpSDikWAnSxA12UmG2kL43jyUOvbNFwSKWzb1R69eUc= X-MS-Exchange-Transport-CrossTenantHeadersStamped: AS8PR08MB6376 Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=40.107.21.103; envelope-from=vsementsov@virtuozzo.com; helo=EUR05-VI1-obe.outbound.protection.outlook.com X-Spam_score_int: -27 X-Spam_score: -2.8 X-Spam_bar: -- X-Spam_report: (-2.8 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, MSGID_FROM_MTA_HEADER=0.001, RCVD_IN_DNSWL_LOW=-0.7, RCVD_IN_MSPIKE_H2=-0.001, SPF_HELO_PASS=-0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: pass (identity @virtuozzo.com) Content-Type: text/plain; charset="utf-8" We are going to refactor connection logic to make it more understandable. Every bit that we can simplify in advance will help. Drop errp for now, it's unused anyway. We'll probably reimplement it in future. Signed-off-by: Vladimir Sementsov-Ogievskiy --- block/nbd.c | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/block/nbd.c b/block/nbd.c index a47d6cfea3..29c33338bf 100644 --- a/block/nbd.c +++ b/block/nbd.c @@ -145,7 +145,7 @@ typedef struct BDRVNBDState { =20 static int nbd_establish_connection(BlockDriverState *bs, SocketAddress *s= addr, Error **errp); -static int nbd_co_establish_connection(BlockDriverState *bs, Error **errp); +static int nbd_co_establish_connection(BlockDriverState *bs); static void nbd_co_establish_connection_cancel(BlockDriverState *bs, bool detach); static int nbd_client_handshake(BlockDriverState *bs, Error **errp); @@ -435,7 +435,7 @@ static void *connect_thread_func(void *opaque) } =20 static int coroutine_fn -nbd_co_establish_connection(BlockDriverState *bs, Error **errp) +nbd_co_establish_connection(BlockDriverState *bs) { int ret; QemuThread thread; @@ -491,7 +491,7 @@ nbd_co_establish_connection(BlockDriverState *bs, Error= **errp) case CONNECT_THREAD_SUCCESS: case CONNECT_THREAD_FAIL: thr->state =3D CONNECT_THREAD_NONE; - error_propagate(errp, thr->err); + error_free(thr->err); thr->err =3D NULL; s->sioc =3D thr->sioc; thr->sioc =3D NULL; @@ -509,7 +509,6 @@ nbd_co_establish_connection(BlockDriverState *bs, Error= **errp) * result may be used for next connection attempt. */ ret =3D -1; - error_setg(errp, "Connection attempt cancelled by other operation"= ); break; =20 case CONNECT_THREAD_NONE: @@ -617,7 +616,7 @@ static coroutine_fn void nbd_reconnect_attempt(BDRVNBDS= tate *s) s->ioc =3D NULL; } =20 - if (nbd_co_establish_connection(s->bs, NULL) < 0) { + if (nbd_co_establish_connection(s->bs) < 0) { ret =3D -ECONNREFUSED; goto out; } --=20 2.29.2 From nobody Fri Mar 29 14:24:56 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; arc=pass (i=1dmarc=pass fromdomain=virtuozzo.com); dmarc=pass(p=quarantine dis=none) header.from=virtuozzo.com ARC-Seal: i=2; a=rsa-sha256; t=1617792555; cv=pass; d=zohomail.com; s=zohoarc; b=eLt7Tawz68BGwAS2rG+AklI1EyGjEJ3KEMIedwpDzv0sIWKemXdRibHDGONfltuc8EYgfkd4EZqMz1WnLRqGZ6lyCoNQs69AxkpdLOOy1jBKw3dld13uI68Zic4PuHewHe8Yh5ho0R63jrrbxfcAzzAdfAYSHFk7lTZTz9Rzj1Y= ARC-Message-Signature: i=2; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1617792555; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=p7QCATIt5mdpHF4XkP+SmqY2FymiS+oRTZmPWFUD+QQ=; b=l1GnMFwMs5WjyqUux88Suc1eUfqJb1bjYO3gO0j0JCex5e5NX1y62Uk9XI4egPcgHNB1WeODCuLmFa4X1TAbaooU72RHvg18bTAPJEi2Nr3lIu4aYeAKl1v7ibxViVBS5W+4HoFhKx7bjm0qVU0mAdAzE1TMP8py+FIoR/xOstI= ARC-Authentication-Results: i=2; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; arc=pass (i=1dmarc=pass fromdomain=virtuozzo.com); dmarc=pass header.from= (p=quarantine dis=none) header.from= Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1617792555670243.7058519982918; Wed, 7 Apr 2021 03:49:15 -0700 (PDT) Received: from localhost ([::1]:52740 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1lU5kI-00077P-Lg for importer@patchew.org; Wed, 07 Apr 2021 06:49:14 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:58428) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lU5iE-0005Ks-KO; Wed, 07 Apr 2021 06:47:06 -0400 Received: from mail-eopbgr00091.outbound.protection.outlook.com ([40.107.0.91]:45540 helo=EUR02-AM5-obe.outbound.protection.outlook.com) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lU5iC-0001P2-8W; Wed, 07 Apr 2021 06:47:06 -0400 Received: from AM7PR08MB5494.eurprd08.prod.outlook.com (2603:10a6:20b:dc::15) by AS8PR08MB6805.eurprd08.prod.outlook.com (2603:10a6:20b:396::14) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4020.18; Wed, 7 Apr 2021 10:47:01 +0000 Received: from AM7PR08MB5494.eurprd08.prod.outlook.com ([fe80::b403:c1a9:6bb7:133]) by AM7PR08MB5494.eurprd08.prod.outlook.com ([fe80::b403:c1a9:6bb7:133%7]) with mapi id 15.20.4020.017; Wed, 7 Apr 2021 10:47:01 +0000 Received: from localhost.localdomain (185.215.60.206) by HE1PR0902CA0021.eurprd09.prod.outlook.com (2603:10a6:3:e5::31) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4020.17 via Frontend Transport; Wed, 7 Apr 2021 10:46:59 +0000 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=BugJfrcfOWqvoyfEsOX5W6rOhcTjQz4nSSUQdccr3iBRUIlXX2nNdEkK46v131cOitshxWIagdzXMOUNwn0uPj20G7SBiTPOuabwzLJaJMj0FqUCWlscDId7PtiAvqIalOLWMK4kCrZYpb7dVKFeWrO6GhH4IyDwrQNH2H2mnxTw5h135CejS6GUyOGTbgMU4802avjS/uyx3k3dKim6r5da7O6f8TnB27R/T3YH1Q+OC4lzbwTqWjbaoq5MRz+kDU7f7/ndqEmKcAleVxcyYFtYX9ddBw4TsrW/SgXPz4M1MDJPRVf3yEJmJ0zhEmV7UOexoT5Io/eZ57e0kdDk2Q== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=p7QCATIt5mdpHF4XkP+SmqY2FymiS+oRTZmPWFUD+QQ=; b=kGVVVNQ7aToxzVsaoa61jEY0nWP7CFoJl9bDliXYTxB0C3B3W+hbjNuSYI/3FVnYcOzmnSoasRzSRipw0WR6J1CPQd/mji6p/yxs1d6P0zmh1jSI4lyUNH/1SBjrcpXMcEha/8wry4vFuwSWIi6p7/u37Q9uSNA0dl+P0uH1oKuwy2OfvRIfQljWmfOaRCc2G2ffhJdP/WsGPMpjYFSzOrcH/DU0ZiwuUfS8AzkbiHIVPT532vITI5N1ivyjm2MG/Y4vvuQDGXw05ch6rpxttsgCJ0t+pgERBiVo764XaOZoqSxqlM95PPqz2rNQMsIGftRLyQiOZTai0raJkDERpQ== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=virtuozzo.com; dmarc=pass action=none header.from=virtuozzo.com; dkim=pass header.d=virtuozzo.com; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=virtuozzo.com; s=selector2; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=p7QCATIt5mdpHF4XkP+SmqY2FymiS+oRTZmPWFUD+QQ=; b=rPwTd3vWXxE2Zzy7zCtkGzw4MeV9ad4my9rVlVpECyoaKNBJmFKIM3pe81iUijWt9oeC+DLuWu8EQBoJw9YO8DfZDEw4+Lbtsmrd75LB81dhiBEzoZ6z6G5fIz4kKQmqbAez+p0J93lLYQEJnwUBvTFL4KfTCFDrNGkuTk7p9og= Authentication-Results: nongnu.org; dkim=none (message not signed) header.d=none;nongnu.org; dmarc=none action=none header.from=virtuozzo.com; From: Vladimir Sementsov-Ogievskiy 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 03/14] block/nbd: drop unused NBDConnectThread::err field Date: Wed, 7 Apr 2021 13:46:26 +0300 Message-Id: <20210407104637.36033-4-vsementsov@virtuozzo.com> X-Mailer: git-send-email 2.29.2 In-Reply-To: <20210407104637.36033-1-vsementsov@virtuozzo.com> References: <20210407104637.36033-1-vsementsov@virtuozzo.com> Content-Transfer-Encoding: quoted-printable X-Originating-IP: [185.215.60.206] X-ClientProxiedBy: HE1PR0902CA0021.eurprd09.prod.outlook.com (2603:10a6:3:e5::31) To AM7PR08MB5494.eurprd08.prod.outlook.com (2603:10a6:20b:dc::15) MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: b4ec8604-20e0-466d-8c9b-08d8f9b27957 X-MS-TrafficTypeDiagnostic: AS8PR08MB6805: X-MS-Exchange-Transport-Forked: True X-Microsoft-Antispam-PRVS: X-MS-Oob-TLC-OOBClassifiers: OLM:326; X-MS-Exchange-SenderADCheck: 1 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: i2iL7/zM3sSmCer+gbnLbhcQuV9fr3B/FJNybRbz9Qz2oJIZ+zyQyQ+7fgHyduiexZKPiXXHwr7O+tn9sndBL2/lzpYiIR9IZwrgh3kUIZNa1gAbe32Dj5/uyWImUcIARba5MKBFo+DaDXPsUBMzSjUJg3Xg8F2VzepgEkpjFd7iaStGzvqA9900PQql3twfLjrm6g0+7KhcN902GtXNrfmyJVHqRrT+q7EE+7gv16VQTq0eL4TJT0fV+FlWTiRdsQMd62bMX56q6h2SO/E8AxtzUzCwKlLwwbW++pMUux0b76Rg8/LQE32GMDiqwaqU+ihf2p1RzaaCCfCHI3hFgNp8pGsI360WYcJxlMBD7aWphIPfoB1GjT24yW8YHE0CqWPpp8XqPfqzU31v/MuEbf8aOxyen/fHNVNQ9s6aDDMjxlYcI2MPnSCQNdgHrfVxHlBZ7jODQFpixJ6WHZKkTAgGs/1kCrDN+WIWyZQGZvu1mSMD5xPOrRFTrVNR6jNVXZ/SGi93wSlo6OjeVYBr+aC8EaWFqsqYbcrnM3SVld6HQvyiCYi+WKAx68/lRAlvSfoAdb5+PcvCQfMW/6ZOr9Y+IHmVHmADhmcdZQ2L6bmcEX7QjyjU3gOt9FKvNk4j+gqQr47vKuYerRiUjMiRbNlsKPjTHSt4SmHlutH1ofYXatvbLuVHH2kQL25AE3/J8VPukK45Ya/Ysg4q2Ab/pAvIK43Pmb1WT3NzRiGEnQY= X-Forefront-Antispam-Report: CIP:255.255.255.255; CTRY:; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:AM7PR08MB5494.eurprd08.prod.outlook.com; PTR:; CAT:NONE; SFS:(4636009)(136003)(376002)(366004)(396003)(346002)(39840400004)(8936002)(6506007)(6916009)(8676002)(52116002)(478600001)(6486002)(38100700001)(956004)(2616005)(69590400012)(316002)(16526019)(186003)(83380400001)(4326008)(107886003)(26005)(6666004)(38350700001)(86362001)(2906002)(36756003)(5660300002)(6512007)(66476007)(66556008)(66946007)(1076003); DIR:OUT; SFP:1102; X-MS-Exchange-AntiSpam-MessageData: =?us-ascii?Q?XezHLQYSB3tIxU7wo3BmUoPOZQJKFkndtZ3F3DtW1JPr2lENuUasug991oJe?= =?us-ascii?Q?EN49zY9FaNjoQC+eDc/92OFL4ZondxU/Km477TMBx3hG39X/LFz5y3wduh1Z?= =?us-ascii?Q?rO2lKcrrhb/HwlnEC1dzAkuyc8l1lSiiLW7+Ht54+dNuPiFGaWjqd0oGkmEK?= =?us-ascii?Q?IW5gJDJPUCJ03j/kcTYaWD9oL/xfDEIRxkdB/CQz1RIGWo+bP1BuOuVNw/yy?= =?us-ascii?Q?4/7V28KfgSBqYuczhae48fgzwYivhHTE0TFGf5iK1STSDD4Hmdnb+e2wgKqW?= =?us-ascii?Q?cnAa6brEhDBnxE17IDolHdtwdeFmDwTmlqJxfeKAueyR6SFdBL6V2HU5zSF+?= =?us-ascii?Q?QIOGBK2ENmTc6+TikiJiHKDmFRyqynaTOtPm4nfs5ug0044ZuORlFtwIiJmk?= =?us-ascii?Q?vD7hWcJWzMnD37r9UT3fJS7TLiFpDxaICPxTN4/ZGR87MAouVrQ4nPUANlYw?= =?us-ascii?Q?jtOpy50C8tlWEm9Jcxv3Q6Wy2uIQqXXlNJjOQj7mqJ3qbT7Ncjo3Q8ke+B8T?= =?us-ascii?Q?PR3wLuC7OxtB6kbnCpZ73o0g5ddyEcRF2xjLgbMuoayG4UOBI4U9uFwt9aoi?= =?us-ascii?Q?EUtR/E+8g2mbDc0uz+93Ifg2NmjgF2ZOGc27ZTLkdFsRA8gVXm9ZZlwtRKOk?= =?us-ascii?Q?7KIrA93BDJV/pQDP4AIf7gvRu8c7t6qSOON5bo64U1mjydLrGKd5A4GgDErh?= =?us-ascii?Q?b6lIyC5hyq8zPtYeCGoXhTF0uo1kdxnXcIyWpibiv5PCGGq6F2TnslTPZnn+?= =?us-ascii?Q?j/72/LWbRi9F84hmcC0Au+qcmUQX9fZBEbvhK16NyjN6246GVrx6TspRXLyZ?= =?us-ascii?Q?4LbxUEl49sfyh3oytOm5wnMWk4A8vn4HI8O3kSF2qTgJnKLrc1bEKRkRlK30?= =?us-ascii?Q?TSOmWX2sommNbqbYBLXmWNsj1u9zkTu7A5qp7dM3hSPLhj/WHstOt02DKAl9?= =?us-ascii?Q?TuAMRdw+iSXzY+L+4+6Ey0S+1X5L1+eCt7bAlTqLlK19iY8QSZOs0VHsyADi?= =?us-ascii?Q?HLGBxcKQfSatHFv0jF9CJcwOQ/HKTHsnUZGhRQ0YbeTkgnKieb7imA2J5SYp?= =?us-ascii?Q?8omZ5kK0uX357ETkb1ZZ3Y8AoEkfodE77uMwuHjxdxRBJdeT8QC6arY061V5?= =?us-ascii?Q?JQAwNqT83AM/CgUtCcNo+JrGKtn9tZbvVfZoPxpZ18h4U+lbKSKnAvKVJL+z?= =?us-ascii?Q?Fpo60oiDvj32U+Cd2/bV7+RgZG/Hu1GkjLMpmPtqYkJxglfdr1BmbzSAVrm+?= =?us-ascii?Q?TBFStgiqaoHnQu0BaeJtZNZxTa1m7dgp/lgl56T3LhuxmXbf00jO45rully6?= =?us-ascii?Q?oikZ+sbN+VLcSPWwAzEMSkgl?= X-OriginatorOrg: virtuozzo.com X-MS-Exchange-CrossTenant-Network-Message-Id: b4ec8604-20e0-466d-8c9b-08d8f9b27957 X-MS-Exchange-CrossTenant-AuthSource: AM7PR08MB5494.eurprd08.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 07 Apr 2021 10:47:01.2651 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 0bc7f26d-0264-416e-a6fc-8352af79c58f X-MS-Exchange-CrossTenant-MailboxType: HOSTED X-MS-Exchange-CrossTenant-UserPrincipalName: 9qLZotbDvSpyNCoun/iKC4VIeYELY5MMBDa9rv5Gj9AJ/xN5LK13E2+r/8XjOQ8HsHljwtaCj1R5Wvd9gb3/2Ce6Hxu3qHlNWlHoTtj4wTc= X-MS-Exchange-Transport-CrossTenantHeadersStamped: AS8PR08MB6805 Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=40.107.0.91; envelope-from=vsementsov@virtuozzo.com; helo=EUR02-AM5-obe.outbound.protection.outlook.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, MSGID_FROM_MTA_HEADER=0.001, RCVD_IN_DNSWL_NONE=-0.0001, RCVD_IN_MSPIKE_H2=-0.001, SPF_HELO_PASS=-0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: pass (identity @virtuozzo.com) Content-Type: text/plain; charset="utf-8" The field is used only to free it. Let's drop it for now for simplicity. Signed-off-by: Vladimir Sementsov-Ogievskiy --- block/nbd.c | 15 ++------------- 1 file changed, 2 insertions(+), 13 deletions(-) diff --git a/block/nbd.c b/block/nbd.c index 29c33338bf..fbf5154048 100644 --- a/block/nbd.c +++ b/block/nbd.c @@ -94,12 +94,8 @@ typedef struct NBDConnectThread { QEMUBHFunc *bh_func; void *bh_opaque; =20 - /* - * Result of last attempt. Valid in FAIL and SUCCESS states. - * If you want to steal error, don't forget to set pointer to NULL. - */ + /* Result of last attempt. Valid in FAIL and SUCCESS states. */ QIOChannelSocket *sioc; - Error *err; =20 /* state and bh_ctx are protected by mutex */ QemuMutex mutex; @@ -385,7 +381,6 @@ static void nbd_free_connect_thread(NBDConnectThread *t= hr) if (thr->sioc) { qio_channel_close(QIO_CHANNEL(thr->sioc), NULL); } - error_free(thr->err); qapi_free_SocketAddress(thr->saddr); g_free(thr); } @@ -398,9 +393,7 @@ static void *connect_thread_func(void *opaque) =20 thr->sioc =3D qio_channel_socket_new(); =20 - error_free(thr->err); - thr->err =3D NULL; - ret =3D qio_channel_socket_connect_sync(thr->sioc, thr->saddr, &thr->e= rr); + ret =3D qio_channel_socket_connect_sync(thr->sioc, thr->saddr, NULL); if (ret < 0) { object_unref(OBJECT(thr->sioc)); thr->sioc =3D NULL; @@ -447,8 +440,6 @@ nbd_co_establish_connection(BlockDriverState *bs) switch (thr->state) { case CONNECT_THREAD_FAIL: case CONNECT_THREAD_NONE: - error_free(thr->err); - thr->err =3D NULL; thr->state =3D CONNECT_THREAD_RUNNING; qemu_thread_create(&thread, "nbd-connect", connect_thread_func, thr, QEMU_THREAD_DETACHED); @@ -491,8 +482,6 @@ nbd_co_establish_connection(BlockDriverState *bs) case CONNECT_THREAD_SUCCESS: case CONNECT_THREAD_FAIL: thr->state =3D CONNECT_THREAD_NONE; - error_free(thr->err); - thr->err =3D NULL; s->sioc =3D thr->sioc; thr->sioc =3D NULL; if (s->sioc) { --=20 2.29.2 From nobody Fri Mar 29 14:24:56 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; arc=pass (i=1dmarc=pass fromdomain=virtuozzo.com); dmarc=pass(p=quarantine dis=none) header.from=virtuozzo.com ARC-Seal: i=2; a=rsa-sha256; t=1617792755; cv=pass; d=zohomail.com; s=zohoarc; b=QI5v65rtn8K1drClrSiQvG/YJIcud/R7FxlT0pY0qz4Fon2iS5BAHI0knhzAUoCygw/xrl27zzOFmEYPa5ZwFXn8GymZ09tDjhJ7UhKZJcx4DJNqlSig0wZ5h5o9tZnyI+j7SBbBd9oPOV+RBh37LJ/va+wKlh1AdwLKW+kcqHA= ARC-Message-Signature: i=2; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1617792755; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=q4i9PiFL/BAI15BuGaTokWRxAqRRnkVBEf1WoiYwTGc=; b=NPdjkr6EDgWc69SyrroODPZwSv4FXLnx1Nv2SxsRuQataVslmZ3klvKWo+P388bQqRniT0tnXjhDITguSEko6v72OlLtvAJVZy4p1H2zSqrmiLvX4YGhOLqrfqj7Si4aESvtS93bNno0U1cvDJuEBCOaRvmEwJeafSp4DnG5p/c= ARC-Authentication-Results: i=2; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; arc=pass (i=1dmarc=pass fromdomain=virtuozzo.com); dmarc=pass header.from= (p=quarantine dis=none) header.from= Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 16177927556371013.8026597518196; Wed, 7 Apr 2021 03:52:35 -0700 (PDT) Received: from localhost ([::1]:33056 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1lU5nW-0002FU-Fj for importer@patchew.org; Wed, 07 Apr 2021 06:52:34 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:58454) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lU5iH-0005PY-0D; Wed, 07 Apr 2021 06:47:09 -0400 Received: from mail-eopbgr00091.outbound.protection.outlook.com ([40.107.0.91]:45540 helo=EUR02-AM5-obe.outbound.protection.outlook.com) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lU5iF-0001P2-9E; Wed, 07 Apr 2021 06:47:08 -0400 Received: from AM7PR08MB5494.eurprd08.prod.outlook.com (2603:10a6:20b:dc::15) by AS8PR08MB6805.eurprd08.prod.outlook.com (2603:10a6:20b:396::14) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4020.18; Wed, 7 Apr 2021 10:47:02 +0000 Received: from AM7PR08MB5494.eurprd08.prod.outlook.com ([fe80::b403:c1a9:6bb7:133]) by AM7PR08MB5494.eurprd08.prod.outlook.com ([fe80::b403:c1a9:6bb7:133%7]) with mapi id 15.20.4020.017; Wed, 7 Apr 2021 10:47:02 +0000 Received: from localhost.localdomain (185.215.60.206) by HE1PR0902CA0021.eurprd09.prod.outlook.com (2603:10a6:3:e5::31) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4020.17 via Frontend Transport; Wed, 7 Apr 2021 10:47:01 +0000 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=kp10pgbehnFOYANN4sUyUNaSKUecSK8oMWLLzgi0R+PCv/CyISxGKbUVd43inNYBtDO2Lg8rSj/YKhQ1Uf6I5r350sSOm1iFEZgjB1LPX/wrPW1qDxXLVB82oKhfoXqWrEXRyBiZ9iWAxAdKo4wiqC9KOqVKZQJKetJ089dNUWgjeEw8EVj4jxN8vw/NsccKBP+9PWTD2kpzueqvonsW79CAN/JEQlySa8osjWZ1dj5Gwx2HgEOrHCNwkJJTr2SJy0pUdmK72sgvPoluB0EjJwUJc2xVLJ17Aj2oqcu57oGq0CpM9L8g3zQUeQK2r1U7wUu3R6SY9IUCGn9onYlwlQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=q4i9PiFL/BAI15BuGaTokWRxAqRRnkVBEf1WoiYwTGc=; b=GWtLmkVm7swZXvj6rS5c4T6YZj5SdrO1qqxdbgsd3TBD643/hXcy6plb7U94UvY26Zqxy9ePc60DAAls8l+b2XZ2V5wiyrh65z82ZkY1TbLgBQ/bu+MldqNts+Mly3lO2mcc+X9z1bEOEXbYEz3LsfbCqWJTIsYvLNRloPzHQ9fp1fQT2RTiU0EvjKCvERmJBtRktMIKSTeIfD6s2jZREPVHMWefJrxKAt5TXABA//ld6jS6pGG25M3Gk22AihgAaDEW+jO9OmrGYFlOIcctWGQCMefbn9XpQomApRDnS1FdzGeMrwai+Duf0HsSE11NgWgpuS7ROIToE66NNcMVGw== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=virtuozzo.com; dmarc=pass action=none header.from=virtuozzo.com; dkim=pass header.d=virtuozzo.com; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=virtuozzo.com; s=selector2; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=q4i9PiFL/BAI15BuGaTokWRxAqRRnkVBEf1WoiYwTGc=; b=Txzl5awa4Z/TCyAhisaw1thDPYyYEWYb0rGOheIP/oEUhEGyoYfBRX176XmvUHdy5JbfvOvk1MUm3TTxXb50y+8MIUfH6Ej6pvg3pgnXXdkT5xbSPYDJPNR4zg7HZNe541HWyi2TgNBssS3QV03j30G936CFeyAQoXAGsi7xNLM= Authentication-Results: nongnu.org; dkim=none (message not signed) header.d=none;nongnu.org; dmarc=none action=none header.from=virtuozzo.com; From: Vladimir Sementsov-Ogievskiy 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 Message-Id: <20210407104637.36033-5-vsementsov@virtuozzo.com> X-Mailer: git-send-email 2.29.2 In-Reply-To: <20210407104637.36033-1-vsementsov@virtuozzo.com> References: <20210407104637.36033-1-vsementsov@virtuozzo.com> Content-Transfer-Encoding: quoted-printable X-Originating-IP: [185.215.60.206] X-ClientProxiedBy: HE1PR0902CA0021.eurprd09.prod.outlook.com (2603:10a6:3:e5::31) To AM7PR08MB5494.eurprd08.prod.outlook.com (2603:10a6:20b:dc::15) MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: d85b52c0-6fc6-4726-0814-08d8f9b27a4f X-MS-TrafficTypeDiagnostic: AS8PR08MB6805: X-MS-Exchange-Transport-Forked: True X-Microsoft-Antispam-PRVS: X-MS-Oob-TLC-OOBClassifiers: OLM:741; X-MS-Exchange-SenderADCheck: 1 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: dCW4la+g5sZnJh8ZCbQWJWrP6b38MC4djXmlW1CclkUdcsELLKlR+De5shp/sH/GN9I2qOhsh9Qwwqf2n3GnXUo9ipQIi33a9ESnDClplhVHFdUw6ftgHfc5ryRzCX9LsxwDHgJ3FjNQ1rk5KcpIkT3vZiOMwWLKbwcriTqOKrco5+gFPioADZpDJ1fTVyW8MtlGGH2unX/9sJ4u7BUEW9/nLnvyFfT9CdTEsMXvGOV4OFnyMi7EiBg9eO6pOSgQn8XYcSj5Iy0c6G8jNaaM/uZcJQALR6wquttAG7VAO88Lq91w/VwOyaOgy/GProeMq9lhW32dVGbYoTkLHJgTVDIR/I1CMU4VnMe2u4JErbkZWpPX8o/+o99xPA4LsAf8IGJjmtLZT9SPCm64p7Yslcj3aUoomjw9hN61TSCFvqdvYojhOPP9sNym0bhRJBn5MdvKt8m3FzTwEO37wQOQ/8nHBjug2jlux81iWSFRs0RP1vID1m5VI6LD2UDN/5wx+bSe8Z9B/o1n9d03MKRLVShE5ezI5L0m2PJ7ewtw3ajbM8P1ZW47WcDb4yS6BqljDc9mVQaKEcrponqTt0kSIhzAN27D3kgQ67lRhBkk4iNMNkJ73APMTTPEqaq05iXI9fLHYmX77oNSp5WVeqhxliFGY/vjtjD6wxeGdnqxAAzLuJdAHjTK/Jnux5wg7o/GeA6UHIqFavokx9vpi0cHx9OZOP6FzpW6NcNAOnvrnTw= X-Forefront-Antispam-Report: CIP:255.255.255.255; CTRY:; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:AM7PR08MB5494.eurprd08.prod.outlook.com; PTR:; CAT:NONE; SFS:(4636009)(136003)(376002)(366004)(396003)(346002)(39840400004)(8936002)(6506007)(6916009)(8676002)(52116002)(478600001)(6486002)(38100700001)(956004)(2616005)(69590400012)(316002)(16526019)(186003)(83380400001)(4326008)(107886003)(26005)(6666004)(38350700001)(86362001)(2906002)(36756003)(5660300002)(6512007)(66476007)(66556008)(66946007)(1076003); DIR:OUT; SFP:1102; X-MS-Exchange-AntiSpam-MessageData: =?us-ascii?Q?R3uPz7bq34bLjwSyUF7bqSEAZXWriAQR65m35tjUIlVZ2B+OPC0K55mhNA4E?= =?us-ascii?Q?UzkuHGOYS/YwbMIXTrefxXqINAA8JcH3ZxVxhQVwGWQVJSsbUd/KUkUPLbgq?= =?us-ascii?Q?RQTQ2ZiVM3LOVrzbvfG3dgjkp2J8ki9K8lchGBzXyIxnI1RaQGtFVPecQp7y?= =?us-ascii?Q?YKMxNTfqp2lIK+rsnz2Xn5QUIeKu7xsLR07oipUsXf/+g+OVslt7faOe58ES?= =?us-ascii?Q?pWbheC2IoffUIVjdupNfJWYwEygSAVZI0WR3dLa5wMFGBcQo3IYdpta50ATR?= =?us-ascii?Q?33F5EhgjH+s4zmh5x/EW2smFZz37Kag4n0rVqUPwZLUUeUF9Mhq3y4tjMQJe?= =?us-ascii?Q?oPmumQXOHIdmRC1Y7o020jYjfUed9kXklfBey9WeQ1ch62UclJ8EQm0yZpDx?= =?us-ascii?Q?jOvo1EKi6FBNlkCbqNqJS2rQi+oYf90WMXQpgTPaRb59otsvs1ln4Cim+orC?= =?us-ascii?Q?k96jU0yDGOx9OEgZN4dbyqh+qitZu/xI2PINeRnQtNXzwS+ZIFblIhFEr1rb?= =?us-ascii?Q?KPwFR8jIP2sn3umdNaPp2TzoNAhbCE2u/ojmx9ZeF8L8atL0oocobGNqZUMN?= =?us-ascii?Q?NMcyk2qeaWEXLgP06SEG5wmM0i0eFNoEVqsU1CB7+dZic0VWq8aJqWVFpyYX?= =?us-ascii?Q?TxeWhLX8eN9C0CFRShazqNVwB0PczH/J3wK7y1zFLSCZBMRsO1QDd1zlyyEg?= =?us-ascii?Q?XFn2UhnuuCvTQWOSbtodzpEuCfoaVq29wTJXvxoIx1I9uVMsgwf/HlYisiy8?= =?us-ascii?Q?VpIs0/x3xavX9xtK00nhFS5RtcSPrVU+rOPwxSFfYB6fk/0lqpmi2I6xMpGU?= =?us-ascii?Q?b+uaAzFSImmLAe7zXaXk0/jN9rR3+unkCm7yyM07jdnDhY9vJ14x9RpfQuNL?= =?us-ascii?Q?rDkESnBJxaUan1S4p1tSJo2ErhX5jVOtYwQJUsoVkeMrAV3SSLrCEvp/XSEH?= =?us-ascii?Q?2hv6x/NqqVgcubAPzrUA6ThHPDdnrkNJKTG8hrLZ/Zq5QB/OELmOugiDhfkg?= =?us-ascii?Q?FexVklFuKqWHmWM+LZ5Deile1U+q0Nk2x+7/8G476gK6JpE4Yuh4Q3BE17tq?= =?us-ascii?Q?zG7KqTYXh5xDj/32AKXTQpBrlY39ByseTQd1GOZOxunWUf3LJBiNeiOPT/JO?= =?us-ascii?Q?7YWlaE9+hZyZOOABcxilXqrvvEh+lIjXhRcqlyxmcQgb0jppabdMH9OFSgCg?= =?us-ascii?Q?NTo/orUFycUKWyTimunSYY8Bls3OTw+cvrhld2UZxLVXVsse8YyJ5yNchCJ2?= =?us-ascii?Q?fAiibtzxoaVwof43Tmhua1asLXxlqcf85Kf/hVYgE9I6fwIakc7Nl/LWB1b4?= =?us-ascii?Q?Czcz1L/4ZJ9Jv/PiouKb37MU?= X-OriginatorOrg: virtuozzo.com X-MS-Exchange-CrossTenant-Network-Message-Id: d85b52c0-6fc6-4726-0814-08d8f9b27a4f X-MS-Exchange-CrossTenant-AuthSource: AM7PR08MB5494.eurprd08.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 07 Apr 2021 10:47:02.7098 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 0bc7f26d-0264-416e-a6fc-8352af79c58f X-MS-Exchange-CrossTenant-MailboxType: HOSTED X-MS-Exchange-CrossTenant-UserPrincipalName: GUB0kVfEpIH/zWe+UxubhIECeiApCBJaMeSCqNnsCMLdvry7sB1o2hXBFHJtWYS3wRzhWI7azIoGdxDioTWcnoWUbs8GIgnPmA6YPi1vUkM= X-MS-Exchange-Transport-CrossTenantHeadersStamped: AS8PR08MB6805 Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=40.107.0.91; envelope-from=vsementsov@virtuozzo.com; helo=EUR02-AM5-obe.outbound.protection.outlook.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, MSGID_FROM_MTA_HEADER=0.001, RCVD_IN_DNSWL_NONE=-0.0001, RCVD_IN_MSPIKE_H2=-0.001, SPF_HELO_PASS=-0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: pass (identity @virtuozzo.com) Content-Type: text/plain; charset="utf-8" We are going to split connect-thread to separate file. Start from splitting the callback. Signed-off-by: Vladimir Sementsov-Ogievskiy --- 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); } =20 -static void *connect_thread_func(void *opaque) +static void connect_thread_cb(int ret, void *opaque) { NBDConnectThread *thr =3D opaque; - int ret; bool do_free =3D false; =20 - thr->sioc =3D qio_channel_socket_new(); - - ret =3D qio_channel_socket_connect_sync(thr->sioc, thr->saddr, NULL); - if (ret < 0) { - object_unref(OBJECT(thr->sioc)); - thr->sioc =3D NULL; - } - qemu_mutex_lock(&thr->mutex); =20 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 =3D opaque; + int ret; + + thr->sioc =3D qio_channel_socket_new(); + + ret =3D qio_channel_socket_connect_sync(thr->sioc, thr->saddr, NULL); + if (ret < 0) { + object_unref(OBJECT(thr->sioc)); + thr->sioc =3D NULL; + } + + connect_thread_cb(ret, thr); =20 return NULL; } --=20 2.29.2 From nobody Fri Mar 29 14:24:56 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; arc=pass (i=1dmarc=pass fromdomain=virtuozzo.com); dmarc=pass(p=quarantine dis=none) header.from=virtuozzo.com ARC-Seal: i=2; a=rsa-sha256; t=1617792765; cv=pass; d=zohomail.com; s=zohoarc; b=PQEk8zTVgA40czYL/NCr32HSPck+vCoUGlhXxQjo7d1hQJX58PV1cwPg4kfPUk4S5MDp69ti+KLXGHm7kIniAJSLhJR1CtaP6bPN5CRhY86aOeRXLKYS8wLcrYruqULCNrlhP8XpoNVhwJ/5hNePs0PYSQdE2sY3VKYM7i9keGU= ARC-Message-Signature: i=2; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1617792765; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=OJSFxJxJPbfmsdNNggLgBynQLZ2NM3EOHt0pde1V97M=; b=New8NoWbBCHQWJNITMb9IkDOU7fQAoImMblDJeEBH9r8rmI6EmUKezs31a36LWpYRdiM410eVjq20LDBAgBjPFe6JWP2VIPyb99gidinNg3euvcAXko8jD+GYc+j4EvLkIKU7H1ziJmw2TspEEbtyjKkgjdG1lhx6XxH3V8lVyQ= ARC-Authentication-Results: i=2; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; arc=pass (i=1dmarc=pass fromdomain=virtuozzo.com); dmarc=pass header.from= (p=quarantine dis=none) header.from= Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 161779276558847.06643421440708; Wed, 7 Apr 2021 03:52:45 -0700 (PDT) Received: from localhost ([::1]:33940 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1lU5ng-0002ci-IG for importer@patchew.org; Wed, 07 Apr 2021 06:52:44 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:58484) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lU5iK-0005XD-10; Wed, 07 Apr 2021 06:47:12 -0400 Received: from mail-eopbgr00091.outbound.protection.outlook.com ([40.107.0.91]:45540 helo=EUR02-AM5-obe.outbound.protection.outlook.com) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lU5iH-0001P2-KG; Wed, 07 Apr 2021 06:47:11 -0400 Received: from AM7PR08MB5494.eurprd08.prod.outlook.com (2603:10a6:20b:dc::15) by AS8PR08MB6805.eurprd08.prod.outlook.com (2603:10a6:20b:396::14) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4020.18; Wed, 7 Apr 2021 10:47:04 +0000 Received: from AM7PR08MB5494.eurprd08.prod.outlook.com ([fe80::b403:c1a9:6bb7:133]) by AM7PR08MB5494.eurprd08.prod.outlook.com ([fe80::b403:c1a9:6bb7:133%7]) with mapi id 15.20.4020.017; Wed, 7 Apr 2021 10:47:04 +0000 Received: from localhost.localdomain (185.215.60.206) by HE1PR0902CA0021.eurprd09.prod.outlook.com (2603:10a6:3:e5::31) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4020.17 via Frontend Transport; Wed, 7 Apr 2021 10:47:03 +0000 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=PqNvwN2UCxfwEo8J11uuseU+wYy6hj32779W/NQPs/t5GKBlS9awk/6K6D4aggEf+HDIdEjyiJ8Zhcxh8Cf9ucwdVdGojP5PRomRzOue3mr63mGAbTJEP9oh0mEy4rooWvot5lvRhPRg8VemMtFFHF0U4Nr2ZUih65Ez8y+ZnDMX3jzsZfuj/BQIogQtZJGmWbTwrFk/GRgAh9/EZe+VlyC+RJmZtAGEs1cifxDeruwQxg7xoV6QcfNSxFtPvf48T7P5MySVA+a2T1zciYHafdPWp/XX8RHrZyVSgumBzvEZBIs1sSukfX/e5/rV2o3jwOVRdnxwb9lpu2W+7u+3Ug== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=OJSFxJxJPbfmsdNNggLgBynQLZ2NM3EOHt0pde1V97M=; b=ALpv8UYqfEWaFhnaynhL8MewwjF926OQ23sNfa4rFvlbyXbpP3fY/YVnFbhZzF9X4Fq87qxMGLSTqWckdoQJzK27fBZR6yIIXNNOlbOoLvL6B+qRmpyXvvwMHy026hO5BGafrZHpUK0JkroPjJ3JsRpVgCfb+mKmUekItIvtjj0Xn3I06u0hbEvyKaJuQTwLPnZK+Px9xj8PhRG3s3V5BL8eiGTcYf4GICQkdH6l/gawAlK1qhV201m2ui+MHiDmbUIaWwUO3veGKGX/mOQDua+JG53ZEoRnl1lSdrmP97f1Q0THf4FHkvciEPL8aWJHix/IyHVjeivIK5A/21Dqtg== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=virtuozzo.com; dmarc=pass action=none header.from=virtuozzo.com; dkim=pass header.d=virtuozzo.com; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=virtuozzo.com; s=selector2; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=OJSFxJxJPbfmsdNNggLgBynQLZ2NM3EOHt0pde1V97M=; b=bomhu5LpHRkRA/TJmLfp4nzK7/Pyw+lxdWIJfqgXLxnk0r0ESRKnNpUvLPcgCFFw7RLzs4uWz4u4LrNlcR1Fs792K+505jKzMO5heN2a+QNQ54/zvxMssBA9RQ+dmh9nzvip0pgiqqIbqWP+0wuYjA9dWPsJysTXQK+tAoIq1b4= Authentication-Results: nongnu.org; dkim=none (message not signed) header.d=none;nongnu.org; dmarc=none action=none header.from=virtuozzo.com; From: Vladimir Sementsov-Ogievskiy 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 05/14] block/nbd: rename NBDConnectThread to NBDConnectCB Date: Wed, 7 Apr 2021 13:46:28 +0300 Message-Id: <20210407104637.36033-6-vsementsov@virtuozzo.com> X-Mailer: git-send-email 2.29.2 In-Reply-To: <20210407104637.36033-1-vsementsov@virtuozzo.com> References: <20210407104637.36033-1-vsementsov@virtuozzo.com> Content-Transfer-Encoding: quoted-printable X-Originating-IP: [185.215.60.206] X-ClientProxiedBy: HE1PR0902CA0021.eurprd09.prod.outlook.com (2603:10a6:3:e5::31) To AM7PR08MB5494.eurprd08.prod.outlook.com (2603:10a6:20b:dc::15) MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 7783067f-ea95-4196-0101-08d8f9b27b32 X-MS-TrafficTypeDiagnostic: AS8PR08MB6805: X-MS-Exchange-Transport-Forked: True X-Microsoft-Antispam-PRVS: X-MS-Oob-TLC-OOBClassifiers: OLM:363; X-MS-Exchange-SenderADCheck: 1 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: ngTMo0t/L2HlDqGIN9cJE0GM71bKsAkQB95UmFF+nWWjaxwL7hn5WnwEk0gy2flsvP8uxDACtSHcnHc5cyaveiZJqMSGaxs+L2BURnMfwkGwc1+Fg7lOFI52KekGbRzmE4JFA9HxBw5tXIl8DXLsgun85SwodZTdiPxQ/gEX/O6Hw5HSsHKe5h1b4Oj+wn++FY060guU6F4Q9MYcfvb2xg7fM2CTXPgkilnh7Z+DWIazLkirMXkYixQGNCJ7/sC6IQPD7TLKARzQZ218U7047w8LsUeFjKL3r2uEmlQUAsD6pkxu9275USExFdlHcuB4X9W8rSVKI/bLFw/+pEQZic4pvmiWmmGo4RFoY9nRM4/KNyo7FlxcmMU6IoW8jh2bpKIywJ3W4FX4mvkW6j5u4HIIHJ4JbRpb7MzVfCHJUCAK2A/oOSbUAyLQNwR+dAj6TqmroFUNrP/oPu/0vrKM5Q0e+pxHBvjFyrw2u3eYti/cacRBSRdABM+PIIFLrnRL+onhJBV6I77erPSyxNmMJuLjLIxQF13mhEW6rupd8rrxDkJ+eSqo7DD2hHMq1s+561FL56I2xJnVYQLFOPl49XcPLbVZmvKl6vjM2z9oBfCoT03FHf9JZ0xkSkwNGwck3d5PgyI9Ntk9vhG+Dpg+sYbMQklT0hFkAwBJKy4RnknEz0TfFLUlQK7MCkB/AB3z1vTdC7HsFNLV2t7h2r3scQ== X-Forefront-Antispam-Report: CIP:255.255.255.255; CTRY:; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:AM7PR08MB5494.eurprd08.prod.outlook.com; PTR:; CAT:NONE; SFS:(4636009)(136003)(376002)(366004)(396003)(346002)(39840400004)(8936002)(6506007)(6916009)(8676002)(52116002)(478600001)(6486002)(38100700001)(956004)(2616005)(69590400012)(316002)(16526019)(186003)(83380400001)(4326008)(107886003)(26005)(6666004)(38350700001)(86362001)(2906002)(36756003)(5660300002)(6512007)(66476007)(66556008)(66946007)(1076003); DIR:OUT; SFP:1102; X-MS-Exchange-AntiSpam-MessageData: =?us-ascii?Q?V7dREjDsvTP2RAzG74QivrP7p3JmMzX+0SZ69EEABBv7tRRJHOR5hFW+q88d?= =?us-ascii?Q?kdWjqrmFxOyVcne+qadG5RMmt2S+X7vvqvL/Hrq7lemvIA8YVpZqWxgcPQLC?= =?us-ascii?Q?8JKU+5QtiXWIKxZ+UKbrRLoTuPZKyH/rOwjaMJ8/M6yyDGSaPd3LK/aPNc4Z?= =?us-ascii?Q?S5Nziv6xwAZe7kY3XFFVAR8u8awoTV4TkJjT0x4rhNK3nGmoeiJ7qTORz0U0?= =?us-ascii?Q?11pJDeXCydHts+bRdpsRqTiXqiTZUKng1ICO4FrJDxIpDGzVelPlXICDkAOl?= =?us-ascii?Q?7PN0zKnebdTX6zxwmq8APyfypnOU4eWI5Q2bS2m4P2iwxszR+CrBzHe1LwRj?= =?us-ascii?Q?KfQYByIMC5SyaeBgdI8Ab1zt9mbpgngpy/JG/FwfPDEeig1CLAfnWnV7QiQY?= =?us-ascii?Q?HnqdzNyrII5rJ3DDTITTIn/tv6C+ngnLW6BrP02WG3LysVuKu0Dou/rpuGIQ?= =?us-ascii?Q?JDlvZU0rZhXTLec8sfT3ZF6f9zZOxfwR1dKwNwm0vZ/g4zgbRY27XWQlwPFu?= =?us-ascii?Q?V82Zvc8JwejJ5fF3BEo2g7aoBihr1iCfoeSGLmZ5jz8PQyBzQJ72RZtOWXO2?= =?us-ascii?Q?O45e9Kf1WLNOwwPZU+39KjqPz2QMXRWASb7V/Gxon5mxnZxZpJ2NStVPZddN?= =?us-ascii?Q?wiGRLzyOHzPK1aSnldKM/YtOh0WO3f9oyeGAC3qLe7kUW85/H/bck0Gc45cs?= =?us-ascii?Q?u7OfQAcRluQovOW2GXxmEVDC683ekV98q33Uu8mU+lKA6HioCppfkonmiOos?= =?us-ascii?Q?OYgi1zcCCI09Glh9itcmbn7J0n4yuxIWyR9XnpuaDY/5yv88SeZbvlFK6KaH?= =?us-ascii?Q?o66hwr88kNicuzvluFLLj2i5a52LCYgIYmCRI1TNp4EF0PP2FPZwMrDRo84F?= =?us-ascii?Q?pjFvwj35APQKVanda7de7jQtnf9mi5RhLryIAxTvUT+4oFYBpNa3HA4zvbcU?= =?us-ascii?Q?WQcPoNP/2/KEY0nW80utEuMwcqmhMwdXf7b0p7QlhdsOkwCfvokoUCs+AZyo?= =?us-ascii?Q?Ah57PmokFHDaZVTDXAqjrkuYqEcyrnYQqJ2jW3xnNpiUWf+T9Jf4supnlUD8?= =?us-ascii?Q?8BLq2Y7wjG9BLGl8vcI8gEd8iC5tgZO4H8SK7/o9pjIvvl3nBZZdpGxWkgfe?= =?us-ascii?Q?6w89uTWxH2H1fzRL/9XM1zvXf9N65Q+SoTOrmX2/pW3APf8L31mI8GNvSvEr?= =?us-ascii?Q?z/LBr3BWldxuDulM07IcY5867vGgalyQBWAQ4QYggj99RkMLzkxwOPi4sdQ+?= =?us-ascii?Q?f+gWRuw73kXKq6F8UtK7ylZDKijIHSlduzRz9/Cyx++FhQDKCNoU0F8S7Nl+?= =?us-ascii?Q?6ZVtbCTVgn1/kRwjFgFPGsbL?= X-OriginatorOrg: virtuozzo.com X-MS-Exchange-CrossTenant-Network-Message-Id: 7783067f-ea95-4196-0101-08d8f9b27b32 X-MS-Exchange-CrossTenant-AuthSource: AM7PR08MB5494.eurprd08.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 07 Apr 2021 10:47:04.1833 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 0bc7f26d-0264-416e-a6fc-8352af79c58f X-MS-Exchange-CrossTenant-MailboxType: HOSTED X-MS-Exchange-CrossTenant-UserPrincipalName: acTRENOCQGTg4/izLzwa7FKyYqSogV5UPBmlMxjZpR7fmazLth63YFqcphNsM0z8pIDqsC2kwHAhNgSNqamOhgSw9uCJbT8rvR2kb9aVzEg= X-MS-Exchange-Transport-CrossTenantHeadersStamped: AS8PR08MB6805 Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=40.107.0.91; envelope-from=vsementsov@virtuozzo.com; helo=EUR02-AM5-obe.outbound.protection.outlook.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, MSGID_FROM_MTA_HEADER=0.001, RCVD_IN_DNSWL_NONE=-0.0001, RCVD_IN_MSPIKE_H2=-0.001, SPF_HELO_PASS=-0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: pass (identity @virtuozzo.com) Content-Type: text/plain; charset="utf-8" Now it's mostly a state of call-back, so rename the structure, cleaning the way for new small NBDConnectThread. Signed-off-by: Vladimir Sementsov-Ogievskiy --- block/nbd.c | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/block/nbd.c b/block/nbd.c index a9d351cbbc..e16c6d636a 100644 --- a/block/nbd.c +++ b/block/nbd.c @@ -84,7 +84,7 @@ typedef enum NBDConnectThreadState { CONNECT_THREAD_SUCCESS } NBDConnectThreadState; =20 -typedef struct NBDConnectThread { +typedef struct NBDConnectCB { /* Initialization constants */ SocketAddress *saddr; /* address to connect to */ /* @@ -101,7 +101,7 @@ typedef struct NBDConnectThread { QemuMutex mutex; NBDConnectThreadState state; /* current state of the thread */ AioContext *bh_ctx; /* where to schedule bh (NULL means don't schedule= ) */ -} NBDConnectThread; +} NBDConnectCB; =20 typedef struct BDRVNBDState { QIOChannelSocket *sioc; /* The master data channel */ @@ -136,7 +136,7 @@ typedef struct BDRVNBDState { bool alloc_depth; =20 bool wait_connect; - NBDConnectThread *connect_thread; + NBDConnectCB *connect_thread; } BDRVNBDState; =20 static int nbd_establish_connection(BlockDriverState *bs, SocketAddress *s= addr, @@ -364,9 +364,9 @@ static void connect_bh(void *opaque) =20 static void nbd_init_connect_thread(BDRVNBDState *s) { - s->connect_thread =3D g_new(NBDConnectThread, 1); + s->connect_thread =3D g_new(NBDConnectCB, 1); =20 - *s->connect_thread =3D (NBDConnectThread) { + *s->connect_thread =3D (NBDConnectCB) { .saddr =3D QAPI_CLONE(SocketAddress, s->saddr), .state =3D CONNECT_THREAD_NONE, .bh_func =3D connect_bh, @@ -376,7 +376,7 @@ static void nbd_init_connect_thread(BDRVNBDState *s) qemu_mutex_init(&s->connect_thread->mutex); } =20 -static void nbd_free_connect_thread(NBDConnectThread *thr) +static void nbd_free_connect_thread(NBDConnectCB *thr) { if (thr->sioc) { qio_channel_close(QIO_CHANNEL(thr->sioc), NULL); @@ -387,7 +387,7 @@ static void nbd_free_connect_thread(NBDConnectThread *t= hr) =20 static void connect_thread_cb(int ret, void *opaque) { - NBDConnectThread *thr =3D opaque; + NBDConnectCB *thr =3D opaque; bool do_free =3D false; =20 qemu_mutex_lock(&thr->mutex); @@ -418,7 +418,7 @@ static void connect_thread_cb(int ret, void *opaque) =20 static void *connect_thread_func(void *opaque) { - NBDConnectThread *thr =3D opaque; + NBDConnectCB *thr =3D opaque; int ret; =20 thr->sioc =3D qio_channel_socket_new(); @@ -440,7 +440,7 @@ nbd_co_establish_connection(BlockDriverState *bs) int ret; QemuThread thread; BDRVNBDState *s =3D bs->opaque; - NBDConnectThread *thr =3D s->connect_thread; + NBDConnectCB *thr =3D s->connect_thread; =20 qemu_mutex_lock(&thr->mutex); =20 @@ -536,7 +536,7 @@ static void nbd_co_establish_connection_cancel(BlockDri= verState *bs, bool detach) { BDRVNBDState *s =3D bs->opaque; - NBDConnectThread *thr =3D s->connect_thread; + NBDConnectCB *thr =3D s->connect_thread; bool wake =3D false; bool do_free =3D false; =20 --=20 2.29.2 From nobody Fri Mar 29 14:24:56 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; arc=pass (i=1dmarc=pass fromdomain=virtuozzo.com); dmarc=pass(p=quarantine dis=none) header.from=virtuozzo.com ARC-Seal: i=2; a=rsa-sha256; t=1617792924; cv=pass; d=zohomail.com; s=zohoarc; b=dSkfziOXlSu7PRMvCaHaNhNWVk8qS9fUHy2EdiEW4XiNJI93pwuj8VtK5daSRsCkLr829E20r9zndJUEkUgcuP0R9knJR1OYkHvjzjxX+oa5UBBNYNvhYaPtNxLjPOz+NPmfRkv8/09Rm7ObwTk3xDOnajI+Ryl3nf5XMxUxOB4= ARC-Message-Signature: i=2; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1617792924; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=Tg4zmQbBdvV07Kt1cflatKyI+Ctz0/rC0WBKl5mbPQY=; b=YRYB4S/t3QUG/Gjruz1/EPaJhT0TQRguBA4MRK8JNzCC+51V5X1py1zXo20Le6Z8IqhgjkbQm7qERsSiF8C9qUIM/0scPHjDydTgKNMLa7hjAWTiKMj8Ceb69tTjoXySyski0joBEm8nCAvUYCYdZ9HB3C9OidVRhXnfuROpBaU= ARC-Authentication-Results: i=2; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; arc=pass (i=1dmarc=pass fromdomain=virtuozzo.com); dmarc=pass header.from= (p=quarantine dis=none) header.from= Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1617792924031556.1364186666996; Wed, 7 Apr 2021 03:55:24 -0700 (PDT) Received: from localhost ([::1]:42612 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1lU5qE-00066o-UH for importer@patchew.org; Wed, 07 Apr 2021 06:55:22 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:58474) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lU5iJ-0005Uj-4K; Wed, 07 Apr 2021 06:47:11 -0400 Received: from mail-eopbgr70129.outbound.protection.outlook.com ([40.107.7.129]:30572 helo=EUR04-HE1-obe.outbound.protection.outlook.com) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lU5iG-0001S5-QA; Wed, 07 Apr 2021 06:47:10 -0400 Received: from AM7PR08MB5494.eurprd08.prod.outlook.com (2603:10a6:20b:dc::15) by AM7PR08MB5446.eurprd08.prod.outlook.com (2603:10a6:20b:107::11) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.3999.28; Wed, 7 Apr 2021 10:47:05 +0000 Received: from AM7PR08MB5494.eurprd08.prod.outlook.com ([fe80::b403:c1a9:6bb7:133]) by AM7PR08MB5494.eurprd08.prod.outlook.com ([fe80::b403:c1a9:6bb7:133%7]) with mapi id 15.20.4020.017; Wed, 7 Apr 2021 10:47:05 +0000 Received: from localhost.localdomain (185.215.60.206) by HE1PR0902CA0021.eurprd09.prod.outlook.com (2603:10a6:3:e5::31) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4020.17 via Frontend Transport; Wed, 7 Apr 2021 10:47:04 +0000 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=mjMoWxS+Zxrijr+R4Jellx+AmlQrL3vsyR3ftLzETQjvLdUgRYzvqwuzOCJqgEVMKe8uaEiY3hPXQautClkoLbijr5Qblyy8DzdX4FDGK2c4DZYlx5WYmHgDlhGWZJo9f6XokOkWgDjSvQzEgIQHpL6C+npNQJTIuWUPfYAkK95/GyrHh4qUYpYNcja6Y9DV1Me1Y8RIVGwItAQ517AYhFZcq7V1AOdruXJPHR2xxM/tT4yNVxJjYVUkDGQAuexV2gNsw/0N92yq8ybclk/ONYygUiHMOH2zWQ33vgCu0VtC+8Bhb8D/vLdW65fgcWo62+ixUV/+bLof2N5CEYXUPA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=Tg4zmQbBdvV07Kt1cflatKyI+Ctz0/rC0WBKl5mbPQY=; b=cY5H+F11SSuI591WgvOtcdfGcSpbz4hEHNyidRPzhxvrGGdU9J3LDFndBuUnxx2YjvmKC3rKLxkV0NLQzDGfHF+cC60p8WD3KYOhbZI7x9A7wj8gV+bybIX1Fk+/Vp6oPwr+VsIyXu2iKallPT20c5+b0nWFpitptAiWYc1hzLnwhM7r41HJwpXN7BGfu+OPMtNrgyo/41FigO2ib34bbjysJHPMAPn3Vz9Teqkze2ZtLopR33nm1jQGq+FqGfSRlDjTJXSj1iUBCgW++upmNAd7ztYs5Uxge2GZAeY3QHAcAHtCRMITAMs2PFYuDKMndvwu+vp0jiGQP/ZGkiwFTw== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=virtuozzo.com; dmarc=pass action=none header.from=virtuozzo.com; dkim=pass header.d=virtuozzo.com; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=virtuozzo.com; s=selector2; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=Tg4zmQbBdvV07Kt1cflatKyI+Ctz0/rC0WBKl5mbPQY=; b=qgBsSv2gK2nomYg/AKK/rmmgBUyrjpvG6KpsMkZLNBxtFJ153trvkbktY4Fq1OiqOn8X91MocDPnha5/zNPVXJrE5XndSVL0glsyHXTg0eEvwF2oIzuOEdmsDHU71UmWZfDpExK3oiVqnSaxsUUazcMvisLhAsqgm5Gdsdotjcs= Authentication-Results: nongnu.org; dkim=none (message not signed) header.d=none;nongnu.org; dmarc=none action=none header.from=virtuozzo.com; From: Vladimir Sementsov-Ogievskiy 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 06/14] block/nbd: further segregation of connect-thread Date: Wed, 7 Apr 2021 13:46:29 +0300 Message-Id: <20210407104637.36033-7-vsementsov@virtuozzo.com> X-Mailer: git-send-email 2.29.2 In-Reply-To: <20210407104637.36033-1-vsementsov@virtuozzo.com> References: <20210407104637.36033-1-vsementsov@virtuozzo.com> Content-Transfer-Encoding: quoted-printable X-Originating-IP: [185.215.60.206] X-ClientProxiedBy: HE1PR0902CA0021.eurprd09.prod.outlook.com (2603:10a6:3:e5::31) To AM7PR08MB5494.eurprd08.prod.outlook.com (2603:10a6:20b:dc::15) MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: eb45210a-58be-4bce-f9f6-08d8f9b27c14 X-MS-TrafficTypeDiagnostic: AM7PR08MB5446: X-MS-Exchange-Transport-Forked: True X-Microsoft-Antispam-PRVS: X-MS-Oob-TLC-OOBClassifiers: OLM:883; X-MS-Exchange-SenderADCheck: 1 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: ZW65onchZUsweubvBUNZOmkqSb7EW/ro0w2KFVEMVSPmvZQvGT1bD/YrPGXZMShch+WYC4zheyvOHj6SEoAGpcGS4qK3hBFPGdmc7OgLfRZXG+RdluCN9GDlB/WxUl8Fva/NpsY53Ic0BfxC487/86o2RBt728i3+BUNv9XxZLmdXXkRgnzCWmWOr1vBuOZczRoIVjuQCspLWT6RqvTEvddfmIL8pT5lD+y7qZc6o6Vj/o+VXZ8gyqt7VYvLrJClfcDp3KqGYg5GsAI7bM3JYGMdH7EaAsrrJbFw0KfT5hSwI6ELCsrmMMS6F9O0JsiEVXxnADnko61bk996H0YiaxKdtpOAmbBJAmP0EliQa0LrI8I9G0xlftvHJJHIMhGTyn7oWCFgajz7Mk/sqleXV9B0j+7U6kB6USp1CyWxevd8nrO0v1Ul6Ui2q/8UgH0ZoUD56/PfzcbsrF8qyx/FhyGAuPMBvascSuOgvSXT6izA76a45fZzVVmDXBOPGWXPQW3dXWMrPwxxeO1X/aGeJibMR9WgOK4qxKtagTTmjSThLWG0Pdwkyz3nY4kidCqsiIHelhH8EeMdWwi7Ld/tssH6j+XsEbUZvvrDwwyaCER5tjInkgpX5IftcuLXmCcLfsU7C/tY/Q+Yx1PN5ShDkfEZUvBcpHHSWC7fUQf97t/HReytJ2wgI8ZRbzYwI1Ll0NTLAr9+b24K7fZNvMZX+5HWFAouqtYrrJ1YN81Ct98= X-Forefront-Antispam-Report: CIP:255.255.255.255; CTRY:; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:AM7PR08MB5494.eurprd08.prod.outlook.com; PTR:; CAT:NONE; SFS:(4636009)(39840400004)(346002)(136003)(376002)(366004)(396003)(69590400012)(36756003)(8676002)(66556008)(4326008)(8936002)(6916009)(38350700001)(186003)(16526019)(6506007)(26005)(107886003)(83380400001)(38100700001)(956004)(478600001)(66946007)(86362001)(6666004)(52116002)(6512007)(316002)(66476007)(6486002)(2906002)(5660300002)(1076003)(2616005); DIR:OUT; SFP:1102; X-MS-Exchange-AntiSpam-MessageData: =?us-ascii?Q?6JfNE/cCM4IsLjYuAcDls5gjbXELeHTthexrg5W6erwtfVr0WiAHb2C/YhRA?= =?us-ascii?Q?97mtAT8xDAyRIA2D8MMc+uZ/4uVOPZEF2hq8345o9aPxRYbeoDXkLajc/Ytb?= =?us-ascii?Q?B/6yxsb1pscpunWp8yb9EspleOe6DqUVZ9B8SCYa6shSDZtSABnNA0ubnkjc?= =?us-ascii?Q?OgGDEmv3fL+kxC24rEU9ffiRzVoiGyFxm4/c/2fh3DiuDAU1cLCzaXKB9pAy?= =?us-ascii?Q?IRTPkkB09+i9i588yy6y+qiZP+tkdU1JlqeRz55PNSWg4mUBeaXuHFoEiTje?= =?us-ascii?Q?YnGeXcX2onSM/jHzOCQ8iyMh64AO7+xdxgufK8W4KWmNmLpS1iCKoP9533A4?= =?us-ascii?Q?pG3o5MwVPVrZUPqDvG+cCTbV//1yJUb0QVBpZp/VVwuWVX/OlzUI3MaTr8id?= =?us-ascii?Q?LI9RO8lCM/C+ndjjSslBhL+suL8r0byJw/6L/K+84t8tLDl9qcEeigyYL5a7?= =?us-ascii?Q?Jq4smE7h6CoIOb1BWOzASnlYA+IOh2xBkDr3pMc82MZsNrLUt94wqqceTZ0X?= =?us-ascii?Q?Z2aeC82q0IDjlF8CypcN+CnjHI7MYnJbJblUfAm6yh7QsNF8EQ2Vow+f2jnx?= =?us-ascii?Q?y3/e+lo5nGQfrLi3bNn4FBi6JbG5fG1QAAZGitD1xKk8tETLxnix9OJyzOok?= =?us-ascii?Q?wmTK906gOeSqBuip6CloEnUfub+nWgaihW+Z+qZmhWhmd2jP+QL+s+/mPUG+?= =?us-ascii?Q?RMihXlq4ROflwz4uRsWgsAwn4Q5N7JKJ0MmHhxqMNLSMs/eVWEZVJI3CJZUh?= =?us-ascii?Q?hi9YApJO1nkjDFWN1pvvTorx2D4pfjuUP3jv2OoIQGVTxqTcfb1HivNRGZmo?= =?us-ascii?Q?8rWzCt2udKenb9WbDZDrxfhXi99rCJ+wOb/F+GziF/7Egi4tjs+WnAuyMqM2?= =?us-ascii?Q?IGNdsYYr8kjHMQpKu8c36+vecxQI2uzEXtCgh+1wIHg2dA3ySc34GifSqcLk?= =?us-ascii?Q?Av+3KAf/e4xzy1B6JO2Qt8qEIv3fJufmDKT/xP54G+7uAmMs4A+lqwJJIVwq?= =?us-ascii?Q?XnEUAci3JFk1/Hvypr2ghDmCZCCfURnEU26K8nz8jAy7oMOuXSEsZr1RWZh7?= =?us-ascii?Q?HDShWrbJ1jZ9ABBXXB/gZ6IOqmOA35GUjFf/M2UQeEAYLN+0MAix0kGxEtgJ?= =?us-ascii?Q?kHBX3I++rSU5JuoAoZbdcEDNGFmDSwEJOJZps4kKq+PRMkzPPt4JjRfiVJwO?= =?us-ascii?Q?NDrNIajVz5Ms22ZINtCLStQcGFNKORC4SRplApYRpgobmMxkGfVSttOs+Y8Q?= =?us-ascii?Q?HkXbDpyuPEH8Rl5g2bDIL325AOtLGL/oHQdpEYldFTmx36cjCTRji6Zwefbs?= =?us-ascii?Q?UkMnoyD4OAe4j8OebDPAvXgj?= X-OriginatorOrg: virtuozzo.com X-MS-Exchange-CrossTenant-Network-Message-Id: eb45210a-58be-4bce-f9f6-08d8f9b27c14 X-MS-Exchange-CrossTenant-AuthSource: AM7PR08MB5494.eurprd08.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 07 Apr 2021 10:47:05.6917 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 0bc7f26d-0264-416e-a6fc-8352af79c58f X-MS-Exchange-CrossTenant-MailboxType: HOSTED X-MS-Exchange-CrossTenant-UserPrincipalName: paunS7hwAQ0dF0KyA9cWorICrQ5v2BN61WcexrmG7LKaDgs8E0oaQmwP7gxgV/HEHDDP/f7nHVvfd1wjOSkzLJ/CWnVlB6qxVaCtAd43UGI= X-MS-Exchange-Transport-CrossTenantHeadersStamped: AM7PR08MB5446 Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=40.107.7.129; envelope-from=vsementsov@virtuozzo.com; helo=EUR04-HE1-obe.outbound.protection.outlook.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, MSGID_FROM_MTA_HEADER=0.001, RCVD_IN_DNSWL_NONE=-0.0001, RCVD_IN_MSPIKE_H2=-0.001, SPF_HELO_PASS=-0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: pass (identity @virtuozzo.com) Content-Type: text/plain; charset="utf-8" Add personal state NBDConnectThread for connect-thread and nbd_connect_thread_start() function. Next step would be moving connect-thread to a separate file. Note that we stop publishing thr->sioc during qio_channel_socket_connect_sync(). Which probably means that we can't early-cancel qio_channel_socket_connect_sync() call in nbd_free_connect_thread(). Still, when thread is detached it doesn't make big sense, and we have no guarantee anyway. Signed-off-by: Vladimir Sementsov-Ogievskiy --- block/nbd.c | 57 ++++++++++++++++++++++++++++++++++++----------------- 1 file changed, 39 insertions(+), 18 deletions(-) diff --git a/block/nbd.c b/block/nbd.c index e16c6d636a..23eb8adab1 100644 --- a/block/nbd.c +++ b/block/nbd.c @@ -85,8 +85,6 @@ typedef enum NBDConnectThreadState { } NBDConnectThreadState; =20 typedef struct NBDConnectCB { - /* Initialization constants */ - SocketAddress *saddr; /* address to connect to */ /* * Bottom half to schedule on completion. Scheduled only if bh_ctx is = not * NULL @@ -103,6 +101,15 @@ typedef struct NBDConnectCB { AioContext *bh_ctx; /* where to schedule bh (NULL means don't schedule= ) */ } NBDConnectCB; =20 +typedef void (*NBDConnectThreadCallback)(QIOChannelSocket *sioc, int ret, + void *opaque); + +typedef struct NBDConnectThread { + SocketAddress *saddr; /* address to connect to */ + NBDConnectThreadCallback cb; + void *cb_opaque; +} NBDConnectThread; + typedef struct BDRVNBDState { QIOChannelSocket *sioc; /* The master data channel */ QIOChannel *ioc; /* The current I/O channel which may differ (eg TLS) = */ @@ -367,7 +374,6 @@ static void nbd_init_connect_thread(BDRVNBDState *s) s->connect_thread =3D g_new(NBDConnectCB, 1); =20 *s->connect_thread =3D (NBDConnectCB) { - .saddr =3D QAPI_CLONE(SocketAddress, s->saddr), .state =3D CONNECT_THREAD_NONE, .bh_func =3D connect_bh, .bh_opaque =3D s, @@ -378,20 +384,18 @@ static void nbd_init_connect_thread(BDRVNBDState *s) =20 static void nbd_free_connect_thread(NBDConnectCB *thr) { - if (thr->sioc) { - qio_channel_close(QIO_CHANNEL(thr->sioc), NULL); - } - qapi_free_SocketAddress(thr->saddr); g_free(thr); } =20 -static void connect_thread_cb(int ret, void *opaque) +static void connect_thread_cb(QIOChannelSocket *sioc, int ret, void *opaqu= e) { NBDConnectCB *thr =3D opaque; bool do_free =3D false; =20 qemu_mutex_lock(&thr->mutex); =20 + thr->sioc =3D sioc; + switch (thr->state) { case CONNECT_THREAD_RUNNING: thr->state =3D ret < 0 ? CONNECT_THREAD_FAIL : CONNECT_THREAD_SUCC= ESS; @@ -418,27 +422,45 @@ static void connect_thread_cb(int ret, void *opaque) =20 static void *connect_thread_func(void *opaque) { - NBDConnectCB *thr =3D opaque; + NBDConnectThread *thr =3D opaque; int ret; + QIOChannelSocket *sioc =3D qio_channel_socket_new(); =20 - thr->sioc =3D qio_channel_socket_new(); - - ret =3D qio_channel_socket_connect_sync(thr->sioc, thr->saddr, NULL); + ret =3D qio_channel_socket_connect_sync(sioc, thr->saddr, NULL); if (ret < 0) { - object_unref(OBJECT(thr->sioc)); - thr->sioc =3D NULL; + object_unref(OBJECT(sioc)); + sioc =3D NULL; } =20 - connect_thread_cb(ret, thr); + thr->cb(sioc, ret, thr->cb_opaque); + + qapi_free_SocketAddress(thr->saddr); + g_free(thr); =20 return NULL; } =20 +static void nbd_connect_thread_start(const SocketAddress *saddr, + NBDConnectThreadCallback cb, + void *cb_opaque) +{ + QemuThread thread; + NBDConnectThread *thr =3D g_new(NBDConnectThread, 1); + + *thr =3D (NBDConnectThread) { + .saddr =3D QAPI_CLONE(SocketAddress, saddr), + .cb =3D cb, + .cb_opaque =3D cb_opaque, + }; + + qemu_thread_create(&thread, "nbd-connect", + connect_thread_func, thr, QEMU_THREAD_DETACHED); +} + static int coroutine_fn nbd_co_establish_connection(BlockDriverState *bs) { int ret; - QemuThread thread; BDRVNBDState *s =3D bs->opaque; NBDConnectCB *thr =3D s->connect_thread; =20 @@ -448,8 +470,7 @@ nbd_co_establish_connection(BlockDriverState *bs) case CONNECT_THREAD_FAIL: case CONNECT_THREAD_NONE: thr->state =3D CONNECT_THREAD_RUNNING; - qemu_thread_create(&thread, "nbd-connect", - connect_thread_func, thr, QEMU_THREAD_DETACHED); + nbd_connect_thread_start(s->saddr, connect_thread_cb, thr); break; case CONNECT_THREAD_SUCCESS: /* Previous attempt finally succeeded in background */ --=20 2.29.2 From nobody Fri Mar 29 14:24:56 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; arc=pass (i=1dmarc=pass fromdomain=virtuozzo.com); dmarc=pass(p=quarantine dis=none) header.from=virtuozzo.com ARC-Seal: i=2; a=rsa-sha256; t=1617793038; cv=pass; d=zohomail.com; s=zohoarc; b=Bwv6MmqKmGNKOxkwTDA6+v+/SG/REcrPw3WvT3GgyvmHrGDGKHqAz2852KZOu3y4SSTJJkdIZkXq1lnCtmYVGuVYv9/slPtLJ4YvFES769Kzd+VUNYyC2dYItg/1+jWAZqz2P4T2/FdT1gYRBIuKN2j09czooCI1zO4uALK6TpQ= ARC-Message-Signature: i=2; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1617793038; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=IutMC+V3Hg685D8bTTHel48vtRgleZt7rCfLjz6LtUY=; b=Zh/tzyM61RwVH6chpdHFQm8Fd1aR2OpQnb7ljjBxasU66sU9GUn6AqiBxidG5Zl8LLjYqwv76emua9SKCwHFK3wRbL5JSqUeNbeUTzxWNwVs1NQM/aJQ2v30GBx2SHP8QqJlz+dPWr2yheEcMzxQPqXLxj9KQV+OtavFP2FvWqs= ARC-Authentication-Results: i=2; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; arc=pass (i=1dmarc=pass fromdomain=virtuozzo.com); dmarc=pass header.from= (p=quarantine dis=none) header.from= Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1617793038951800.4780249921881; Wed, 7 Apr 2021 03:57:18 -0700 (PDT) Received: from localhost ([::1]:50010 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1lU5s5-0000mm-B7 for importer@patchew.org; Wed, 07 Apr 2021 06:57:17 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:58518) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lU5iM-0005dK-IC; Wed, 07 Apr 2021 06:47:14 -0400 Received: from mail-eopbgr00091.outbound.protection.outlook.com ([40.107.0.91]:45540 helo=EUR02-AM5-obe.outbound.protection.outlook.com) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lU5iK-0001P2-P2; Wed, 07 Apr 2021 06:47:14 -0400 Received: from AM7PR08MB5494.eurprd08.prod.outlook.com (2603:10a6:20b:dc::15) by AS8PR08MB6805.eurprd08.prod.outlook.com (2603:10a6:20b:396::14) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4020.18; Wed, 7 Apr 2021 10:47:07 +0000 Received: from AM7PR08MB5494.eurprd08.prod.outlook.com ([fe80::b403:c1a9:6bb7:133]) by AM7PR08MB5494.eurprd08.prod.outlook.com ([fe80::b403:c1a9:6bb7:133%7]) with mapi id 15.20.4020.017; Wed, 7 Apr 2021 10:47:07 +0000 Received: from localhost.localdomain (185.215.60.206) by HE1PR0902CA0021.eurprd09.prod.outlook.com (2603:10a6:3:e5::31) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4020.17 via Frontend Transport; Wed, 7 Apr 2021 10:47:06 +0000 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=ofY7QETR6nMgd1n9sQW0Fjls3oiCxYsNsPwsK6L5PKKebVDYkYgs/r2X5j8PXkYEsz2iwhE49E/wNtIx2oxRM8z0EJiFD8hqa8mAkeBTQZtCc7qhj6LRc1b0KewpWwPIN9rQ5MUyHZpuzsDCUzsu6P2MmBh5aVugXGdncSm0d40BLe0ZI/qInD6K2RGS1ARn4McGwxe8odi+JKBjrdlsPf6gPdPDzhejKwIhLKnKVqHnqKiasiV0ProAFbSxqt7WMBXjDMxfPQuLxFKHTg9bo80a2IpLKk5UPdJNip1mqULhj2R+9PlxK3cL+e06Tqn0/siMwxlEnTdluyLJKiPIkQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=IutMC+V3Hg685D8bTTHel48vtRgleZt7rCfLjz6LtUY=; b=lBeSRFp+gtxvKfnYIcVDzKyCnyF78waj2mRdbiw20VgwHsbdRlP9Yuu4Q0VU3rvwsWc2UtDM7CAUa0nA4DEAknDW5AsTomY9ZfBN9e0MNeNwE+Bzl3FrsP6pphgJjkkR9J8oHB/RXu4YqlU2hKNSyE3+gQ9iO2zNa5HrQarIhDkgrAc8xm0xRTr+VglIK5kBqXIAO3qV/jebMb0tLYVr0hbTp838acVxzPphUw/8BF4h+fBZ5UVlpLRiZlucDgnFwO3M5zo5SAns2iYwkYbg20eFNy9Ffx+dgptIm+PgL+haE3XZ0Wl9uQwpkf2Ah+C6gCwA6JqA70hlKhIlVYhyzA== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=virtuozzo.com; dmarc=pass action=none header.from=virtuozzo.com; dkim=pass header.d=virtuozzo.com; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=virtuozzo.com; s=selector2; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=IutMC+V3Hg685D8bTTHel48vtRgleZt7rCfLjz6LtUY=; b=nWEF9n/tbouKR0BW/R0EEFfXKg3d6q0gSo+4k72MwjpNC921amJzs0wtQOJZ9TE+jyjs2fDIGEO8gYKBPRJcntLyyVPorJx32Tg6CegyShRhvNtxxLY54sIG/ed6+b32Pl2U58MeuzqAPLzwBKEY6TI70uu0fQwy0SB2PLdxRcY= Authentication-Results: nongnu.org; dkim=none (message not signed) header.d=none;nongnu.org; dmarc=none action=none header.from=virtuozzo.com; From: Vladimir Sementsov-Ogievskiy 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 07/14] block/nbd: drop nbd_free_connect_thread() Date: Wed, 7 Apr 2021 13:46:30 +0300 Message-Id: <20210407104637.36033-8-vsementsov@virtuozzo.com> X-Mailer: git-send-email 2.29.2 In-Reply-To: <20210407104637.36033-1-vsementsov@virtuozzo.com> References: <20210407104637.36033-1-vsementsov@virtuozzo.com> Content-Transfer-Encoding: quoted-printable X-Originating-IP: [185.215.60.206] X-ClientProxiedBy: HE1PR0902CA0021.eurprd09.prod.outlook.com (2603:10a6:3:e5::31) To AM7PR08MB5494.eurprd08.prod.outlook.com (2603:10a6:20b:dc::15) MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 7fda6920-3178-4d3a-7b50-08d8f9b27cfe X-MS-TrafficTypeDiagnostic: AS8PR08MB6805: X-MS-Exchange-Transport-Forked: True X-Microsoft-Antispam-PRVS: X-MS-Oob-TLC-OOBClassifiers: OLM:207; X-MS-Exchange-SenderADCheck: 1 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: VHsXLb+LUO8SMG2Ld1wXJy6PHV2D3wTqAWToT7hVPwW2k5JQMr3RhxFMV+X/fSnDkXU7LzLjLelHGimTyMXSlKlJ18YDt+pmF4i/PJnhLM7+s1qzuNv1wkK9LjFrbFmC4wR33zsq96wXom9KqDEdp2OpYE2SdlqtHYrjysRvjzwKJrFIr2JHM1EZkLJbTjdtUws8EhHaLSr7ztogWXD50M8z+ehssO3CfDA2S97hZnexlnKDTI2thJK2Wz4SjgWG7jYjAP2eqL5FzEBxMAV9/Rh39ZTKRDHkDc0IbV1Tct0dmHH1j9HrxHAMLwpc5TMyczFumfY6BNHYi2qSuWsxrXkCE7oU85xOmslx9hzplZ08pu3P8ZoZSX7JSlAAu8STbsEXu6ze11do+eMQ/1koXbo02Nf77s7Z41oAbbymn6X3GqaMrtlwcrQKEob7+WveSkWuEwVI9PlcBnHvQ9No9d/cTBY4CtLF3bxWjDv3ckc1yDqlpte/ed1j/utTh6C0rd/smbJ/QL5C16DeDkI0eMPM9s3byl94CcLX/+FwMXrLeosMZbu+o3Pkkqk+KlfRCo7q/UPd91ed/8vgWVW2EvV1tvqQDgJ3/EhQKv//eLRewigfe/Vl30VzVWv8wROnUfUcrdWgsMdgC3RHOSplKsp4ie3/45v7I+SYqvpsIMNB8BdHyILwmr14zfC/9CNqtjE5hhqrIxCY0XfRxpXylP//FwD27KOUwJvCzLw4nKQ= X-Forefront-Antispam-Report: CIP:255.255.255.255; CTRY:; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:AM7PR08MB5494.eurprd08.prod.outlook.com; PTR:; CAT:NONE; SFS:(4636009)(136003)(376002)(366004)(396003)(346002)(39840400004)(8936002)(6506007)(6916009)(8676002)(52116002)(478600001)(6486002)(38100700001)(956004)(2616005)(69590400012)(316002)(16526019)(186003)(83380400001)(4326008)(107886003)(26005)(6666004)(38350700001)(86362001)(2906002)(36756003)(5660300002)(6512007)(66476007)(66556008)(66946007)(1076003); DIR:OUT; SFP:1102; X-MS-Exchange-AntiSpam-MessageData: =?us-ascii?Q?JFmsCkWJwF3iaM5UjesDdcBYvSPs97iVhH/LS2z/naQdplGhOCFrie7/jdLq?= =?us-ascii?Q?QNI2M6uqpjuAvBhQw/LZRYLdNQ3ks+eEhvnnZHXpG/cJQ9SBdMM4YVruLQjf?= =?us-ascii?Q?KgHdO/ol7P6CUqg6K0Rj3p4HLii5XbuaXxuCLKl503/B99GFA4df/NPDm7I5?= =?us-ascii?Q?zMEgFHYtBJPpR2Hk9YcgyU+4VW3bEdcrvTbXNcSf6tuDEBxsolPQe0qYco/N?= =?us-ascii?Q?UnFHFqwkHSd7LGYVJtwDT3tNDmBIKVjP15LsUBMn5k/sUDz7866t07H5oJbA?= =?us-ascii?Q?K17Fkk8dOhieI2xjAvFeQH4E3WivJ3xcP1BY7yomHuaVwi32E5EZNbUvtHJY?= =?us-ascii?Q?jSpH8vdJyt/qtg8q0i/rudxcxCj8/8DJkUni0T1C/vqKdIcAw5I2DwmAR27Z?= =?us-ascii?Q?UUyaBHDbI1HTqRIYwwOp2HZ1awkHNwrdkw/oV03BGtS4TOdaLr1wxbBenD0D?= =?us-ascii?Q?AGza2nl16isMvQOU52zfZ7axVkDuLu5gZawFLIvm4QoHAJ8YMGAvG+MQ+zIz?= =?us-ascii?Q?flV4pxkZHGjvaZD5u0JKEoIL3xYGbn79anLgvM9RqN6YY40RYkb3qCuIIGVO?= =?us-ascii?Q?ZHpN424jU7tX8FAt+iaifXZ0aIXiPG8JO2IpIjLFnwoaOGWPN4AoyGTYEHrb?= =?us-ascii?Q?2dg4rhLajav4J3kOuzshAZmBhpCpA4nyyhX8ZxDm9Bsyh7W1pi1rvJFIcU7a?= =?us-ascii?Q?cumgFmWBvz149SZE9O0XtO/saBWKpxrTA/0ikAx1NA4XrdrYnaba0h2sTfG8?= =?us-ascii?Q?boWZnDA/z5+otyPfbAIB5gZNXPnh9Q32DeMddAiRV8QT12BQfXeWSETmgWms?= =?us-ascii?Q?12YtVB7D1C5R81FImqLKA1GrTe8StJESvkY+qWqqsQPaIdczUEv9WdBiB99Q?= =?us-ascii?Q?VNbFa41BKmoI7tv/gokyHv7u6TBU1C5nhcIsZSI3I9fWPiHOz7Gj3uXHqkUw?= =?us-ascii?Q?O7r5Tf33+eYtKbWb9D0JWv1R1OyloBXOhXsiMIOmaeWOuHiCLUH103HzFQyl?= =?us-ascii?Q?5FChSCW0n4YxxVbt2spAfBydcmtUc0K+AGiDYiytQa2a7vOOi5DcMtFtMp9o?= =?us-ascii?Q?Px/gh/Mc6jnJf2ONFW7njQ3YMkTS7fFaeAAmUon0PBJ3PzBqwpPUdxxUo5rp?= =?us-ascii?Q?b4rYBaaln91LgQ1EIQzAhdNYIiUdxgz08mdyPCgIyb09UucPFwUOSiT/VVLo?= =?us-ascii?Q?C2TFLh/6JjsZ6ENACCitP19hdnb4jW16cJR1K2mlh/i1x5E1qgI7LFEmee37?= =?us-ascii?Q?hQekV9+TgLrI8A1JJW7VnZDUrUxo+z69uZbKgMatNZxCbsFxjmiN1+DYP6o2?= =?us-ascii?Q?4SGDsKJ1SY0CBlwHTmOoIWNq?= X-OriginatorOrg: virtuozzo.com X-MS-Exchange-CrossTenant-Network-Message-Id: 7fda6920-3178-4d3a-7b50-08d8f9b27cfe X-MS-Exchange-CrossTenant-AuthSource: AM7PR08MB5494.eurprd08.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 07 Apr 2021 10:47:07.1244 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 0bc7f26d-0264-416e-a6fc-8352af79c58f X-MS-Exchange-CrossTenant-MailboxType: HOSTED X-MS-Exchange-CrossTenant-UserPrincipalName: QvugcTSFZCs6tc4qv/7mepyUPopjIPBMJA9u9BKl4IV4iz/lyeNno0XDADiybEemxl7GjpCPOC2cM0hpebjz/3jnrt0lcAFa51/UjYWA/i4= X-MS-Exchange-Transport-CrossTenantHeadersStamped: AS8PR08MB6805 Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=40.107.0.91; envelope-from=vsementsov@virtuozzo.com; helo=EUR02-AM5-obe.outbound.protection.outlook.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, MSGID_FROM_MTA_HEADER=0.001, RCVD_IN_DNSWL_NONE=-0.0001, RCVD_IN_MSPIKE_H2=-0.001, SPF_HELO_PASS=-0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: pass (identity @virtuozzo.com) Content-Type: text/plain; charset="utf-8" Now it's only a wrapper on g_free, we don't need it. Also, it's clearing the state of nbd connect thread callback, not thread itself, so name is not very good. Drop it. Signed-off-by: Vladimir Sementsov-Ogievskiy --- block/nbd.c | 9 ++------- 1 file changed, 2 insertions(+), 7 deletions(-) diff --git a/block/nbd.c b/block/nbd.c index 23eb8adab1..4e669d762a 100644 --- a/block/nbd.c +++ b/block/nbd.c @@ -382,11 +382,6 @@ static void nbd_init_connect_thread(BDRVNBDState *s) qemu_mutex_init(&s->connect_thread->mutex); } =20 -static void nbd_free_connect_thread(NBDConnectCB *thr) -{ - g_free(thr); -} - static void connect_thread_cb(QIOChannelSocket *sioc, int ret, void *opaqu= e) { NBDConnectCB *thr =3D opaque; @@ -416,7 +411,7 @@ static void connect_thread_cb(QIOChannelSocket *sioc, i= nt ret, void *opaque) qemu_mutex_unlock(&thr->mutex); =20 if (do_free) { - nbd_free_connect_thread(thr); + g_free(thr); } } =20 @@ -581,7 +576,7 @@ static void nbd_co_establish_connection_cancel(BlockDri= verState *bs, qemu_mutex_unlock(&thr->mutex); =20 if (do_free) { - nbd_free_connect_thread(thr); + g_free(thr); s->connect_thread =3D NULL; } =20 --=20 2.29.2 From nobody Fri Mar 29 14:24:56 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; arc=pass (i=1dmarc=pass fromdomain=virtuozzo.com); dmarc=pass(p=quarantine dis=none) header.from=virtuozzo.com ARC-Seal: i=2; a=rsa-sha256; t=1617792894; cv=pass; d=zohomail.com; s=zohoarc; b=KT38n81n4rFMqYIiO/CYd/8/pHoDPk5Y6VtaJ+WSvMN4wCSg32FdrVdANkzUfuC5Dl9pfcvsKhWAJ1DihI5XWUKQXi+4xA2lhdbBnYmuaSOwmu/hSWgs20Wd4GdB/Z6PvkTMtJbTWm4w81QDsuUUqya/OeS4nlMpqJBgrGoRsO0= ARC-Message-Signature: i=2; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1617792894; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=9yt6dXcBbHGdZLhSlAgJxmYwqpMspavq7CGWEn5m0rQ=; b=KxDbKfloxm3tObLAI2ZlYEqcHBJ3N1TcizzxRe3shCj8StbxgxMAIBeUAk5eef+us4NNUp5sIJ2FeYMsdI3yytZLXQR1IOGXkJ4CDZrY23GcJ4hWOWBRORPMwv8ykw4pxj9TE1yyCS58TVI/m29GTgIM51lk8gDZAS2xPBhc1aE= ARC-Authentication-Results: i=2; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; arc=pass (i=1dmarc=pass fromdomain=virtuozzo.com); dmarc=pass header.from= (p=quarantine dis=none) header.from= Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1617792894408876.5373151682728; Wed, 7 Apr 2021 03:54:54 -0700 (PDT) Received: from localhost ([::1]:41644 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1lU5pl-0005iS-5p for importer@patchew.org; Wed, 07 Apr 2021 06:54:53 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:58506) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lU5iL-0005bV-Qb; Wed, 07 Apr 2021 06:47:13 -0400 Received: from mail-vi1eur05on2113.outbound.protection.outlook.com ([40.107.21.113]:20888 helo=EUR05-VI1-obe.outbound.protection.outlook.com) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lU5iJ-0001Tc-JY; Wed, 07 Apr 2021 06:47:13 -0400 Received: from AM7PR08MB5494.eurprd08.prod.outlook.com (2603:10a6:20b:dc::15) by AM5PR0802MB2452.eurprd08.prod.outlook.com (2603:10a6:203:9f::21) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.3999.32; Wed, 7 Apr 2021 10:47:08 +0000 Received: from AM7PR08MB5494.eurprd08.prod.outlook.com ([fe80::b403:c1a9:6bb7:133]) by AM7PR08MB5494.eurprd08.prod.outlook.com ([fe80::b403:c1a9:6bb7:133%7]) with mapi id 15.20.4020.017; Wed, 7 Apr 2021 10:47:08 +0000 Received: from localhost.localdomain (185.215.60.206) by HE1PR0902CA0021.eurprd09.prod.outlook.com (2603:10a6:3:e5::31) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4020.17 via Frontend Transport; Wed, 7 Apr 2021 10:47:07 +0000 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=SVj+mUfVPNVT90SvGxTCoYJlS/LQwIm74vMEa/d6QQLcU1MUT7yB9v1DrLsP7qc4+F1yquNjw44xMdQyhyQeN20dgNNhB/85lGkcyn8C8tLG/1X4pZ5FVzokYQD3duhPtNjZcwIREI+/DdpVbsHhSsDyhifXt/dIqxW3mfvW1oDhWoWc/S++KOIYNhl0xL9umQr2JPiFnknAk/UXLJrcYNfrvyVJMl9+MJpo1WZHz9AsfknGiof6CIlLy8a8lPP6Ms852ZNeBkXSiSyfFZiLku689uh4PRlG8qlOsoTQLndD5rsooCHcPKumE0Wy8MHR63ZRTWUiUywugzLJi/jpGg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=9yt6dXcBbHGdZLhSlAgJxmYwqpMspavq7CGWEn5m0rQ=; b=kFnh3M/PaI1IZSG9crElOpqaECle2Wif3J1n8Uj73K5O5toWWAkT22ionKsEFUQFw3UGMgs0ePqFfu9KrDaiPmrxg+mef8/d7A7KQjFM4DwmbHE1LQ9MCvjQqjuA/MffpkzNo7TLorI+4KUNcbA9l+MZ5WXZhcsFVErC8e6LuEZL3/Zv8aMKrrZoSf1nm+UmY2kcDBJ0EvIqr4BjAprc0+M4PybM4lTgngiMOTluTQUp430k5er9hW8fUEsiY/yAwV6aBEExC7HUyrgT4tszrkLY5yOHK8azUPGGMOpb3y74buMt3G4l67QQ9rd+Ks/XSHr3ofGfUsc1gbzcQG0S8g== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=virtuozzo.com; dmarc=pass action=none header.from=virtuozzo.com; dkim=pass header.d=virtuozzo.com; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=virtuozzo.com; s=selector2; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=9yt6dXcBbHGdZLhSlAgJxmYwqpMspavq7CGWEn5m0rQ=; b=PIbUT1r6LfTS2wOzIM6GPtbfUr1q59LNznZ7IP9u1leFL3MKBsXuvwVRZMqH+0V+BjdZSAwn7MBq6fDtAiQHsjsYGCp9mfWg/VOYizlzhmZV4D9AjZrbniUoX+0Ttad0O5gNO3IoXJiDQLF7w1xPme2btmPQOxV70uuu6Z0/7To= Authentication-Results: nongnu.org; dkim=none (message not signed) header.d=none;nongnu.org; dmarc=none action=none header.from=virtuozzo.com; From: Vladimir Sementsov-Ogievskiy 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 08/14] block/nbd: move nbd connect-thread to nbd/client-connect.c Date: Wed, 7 Apr 2021 13:46:31 +0300 Message-Id: <20210407104637.36033-9-vsementsov@virtuozzo.com> X-Mailer: git-send-email 2.29.2 In-Reply-To: <20210407104637.36033-1-vsementsov@virtuozzo.com> References: <20210407104637.36033-1-vsementsov@virtuozzo.com> Content-Transfer-Encoding: quoted-printable X-Originating-IP: [185.215.60.206] X-ClientProxiedBy: HE1PR0902CA0021.eurprd09.prod.outlook.com (2603:10a6:3:e5::31) To AM7PR08MB5494.eurprd08.prod.outlook.com (2603:10a6:20b:dc::15) MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 39090222-d0b7-4e90-3c2b-08d8f9b27dc8 X-MS-TrafficTypeDiagnostic: AM5PR0802MB2452: X-MS-Exchange-Transport-Forked: True X-Microsoft-Antispam-PRVS: X-MS-Oob-TLC-OOBClassifiers: OLM:8882; X-MS-Exchange-SenderADCheck: 1 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: VeKyvazT9CcolKBhyekmzgGyAndcMGPSlT+GbImXYvjs5sYDf2904A581LrvInDtiXWsMXMXlQTeYi9HzUwNfPuTmwWNURDrw7TuMtCzO2Dp1hepGbdkvAm8tUrfXP+i7PxYWZM0tVKS5dUj5Zy9zdNgT2Hj1/tv9ypp+YyTiNCeh0hRQAsnb5ktc/mLDS8J5+u+y5d0gYU3rLjbuKOnWubhfhvZSq+kCP/nLdyHLJ0VC/wSxNeBbvnSA3a/nSkvyPRPteTOqpysiwoiP3DcKhfJ6b200ajZ3PA1w7wcQrz+14vPyxIEdewetV75aMBg2Ca5diI4iZAm/lpyk5jY4V49jPKnxHQFGkg75ykOx5HNbVimgWwqqpzxw3P9R++0qg1tvkAAPj19zdMehCFKxMmwLjayGyOCQwplky0NR+5cjVHZB9VWOrJMd3ZjYOkh+WCq8iXkcRtegGUaZAldeYKM14/PBbKRGEfD50O/4CBPV9FUh+ofNV1+/ZPC6d3znfnEwEAbEEAv5jZE4noI6+GCZ2jLYkzw0KcDG3da/r0DbeM+bRctndHVQ7/sUbAEdfHchlI75pf8LmCbm9ZSuaKnqSF2DY63nJexcN3DyiqHdDK6nv+dWlJ7CkNudh9uZGPWyAPQXapqDaQzesU4x5SOxaJkBZR2u6Z/A5chQhHe8YiPJSO5sni6N+96od3goZ4QhktT5DL1LAreowZvnoPNhBmc497ktNwVkK4IhY4= X-Forefront-Antispam-Report: CIP:255.255.255.255; CTRY:; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:AM7PR08MB5494.eurprd08.prod.outlook.com; PTR:; CAT:NONE; SFS:(4636009)(136003)(366004)(39840400004)(396003)(346002)(376002)(8936002)(66476007)(38350700001)(36756003)(5660300002)(6506007)(4326008)(69590400012)(956004)(66556008)(2616005)(478600001)(83380400001)(8676002)(316002)(6512007)(1076003)(186003)(66946007)(16526019)(107886003)(38100700001)(6486002)(6916009)(52116002)(86362001)(2906002)(6666004)(26005); DIR:OUT; SFP:1102; X-MS-Exchange-AntiSpam-MessageData: =?us-ascii?Q?JE59ZeWkzR8pk/+LMQxE/QuAzhdl3boJHOnEi+icEaOU+Cgo2WonLqxpo2rq?= =?us-ascii?Q?whdc/Z9hJaRya9CrhzbUYnld9TlwYUJRT5VpfLG7+5dHHMW753eS1jsUlozT?= =?us-ascii?Q?ZbG4qQaG2YHLAB414PM27yumIysCxws8nFuCqsWuhZcZpNisQb8cxpAH3XVZ?= =?us-ascii?Q?3hFo2FQshfE3Ys8uO3i8Jg51nHInoCITCm+LhJT68wy577sl2nrzNPQKDzc0?= =?us-ascii?Q?su63mlWLomLheBicAuK0U/N+q76jARUq5lgvXifg8IuRuPdOlfYpUvfCMI+5?= =?us-ascii?Q?m+RQrStJNN8hn1MwAhLfs84/q4RLfcuMbI6u2eKT+xTs8d6Jgtguk5/rhMpR?= =?us-ascii?Q?VEdmMlTA/W0UgIb5aoPNdClu1uCx69C/PaBI/W6zCku2glXZz2pMHGYtgIL3?= =?us-ascii?Q?IWUWByJfDv17rNUy+Oddm67WRBN4UUbU2ZjBU1YCUQ/u8a1e7RLu7gmnlKDP?= =?us-ascii?Q?d6K2g4XfcNW1YHOpooqd6Gxq1Glod042F5X1SFjGAT10rR0x9rGmBV6Bwsn/?= =?us-ascii?Q?Ra5JwRIrKC0x2niq+8FJw7zoWZQc7m9AKHrdxlxt6HU/jKFGjBoG9Mm/ozzH?= =?us-ascii?Q?e/GhrgkObx7PFlo3obZw+bYTN/krhqQlF5Hv1Ej7Jzrs6YwMlQu7HJ6KcG1X?= =?us-ascii?Q?9qNoa5M2bbv7Xiu+1JOiPSGzZzoBoUKpbpQFvv0jxR/rWbRw4XS46SnaJPW1?= =?us-ascii?Q?pqrRkd7f6qVoJrk6/1HBu0OwULuI3jIpFsr1hg4LSdalf4okQGgN2Fsr3bsc?= =?us-ascii?Q?fvtBrnC7Nt5o9M2j21iBjG1xvvxz7YBSnGu6BnHDUWYd6TBO9GVUQiGXm9nB?= =?us-ascii?Q?i1OJjlceZDtYvqca3lWWBWdQIf4bNNJ/lkiASgBpelYEZZ9j50jcswBBq2cV?= =?us-ascii?Q?jYuW90M19FW8ETGCkboNZ6XuVuIELIZ26lJPoBS5PjDHtpDF5tvn+jSbaC77?= =?us-ascii?Q?1d9OsnZX2LMFesTB6aC9lyFoHTI6cQi1tWgdToTThsN6dNTw4EqJGbLP3S1v?= =?us-ascii?Q?pCvzSrSpgBtThgAcvw3xbE+YM+4RewjuMqdrlEVZAU5LyCFYY92jWh6nctRA?= =?us-ascii?Q?EtylNF32zZoVUCvgmzQU4G4lSMwJ3APOQxneBJFjNChvw7X3/DE8/c2z696o?= =?us-ascii?Q?FpTLzxj7/bvjRX38Ol48+iZDov+v52wOrYWH2iJ79i4aU88K3FlvvrfQV6jr?= =?us-ascii?Q?y8+kE/P3mWugnhBihVeDQZXSeH7qLqSR0HCiX6r3pLeDxY79g9fwny9RAM00?= =?us-ascii?Q?uK+8SQ72YGwTAw9XGxfVADv7n8EtKNDl/aE9Pxvl55GoPpCNofi8Dho2e4Rz?= =?us-ascii?Q?pirSjjfLv8KypXS68FKnep40?= X-OriginatorOrg: virtuozzo.com X-MS-Exchange-CrossTenant-Network-Message-Id: 39090222-d0b7-4e90-3c2b-08d8f9b27dc8 X-MS-Exchange-CrossTenant-AuthSource: AM7PR08MB5494.eurprd08.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 07 Apr 2021 10:47:08.4208 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 0bc7f26d-0264-416e-a6fc-8352af79c58f X-MS-Exchange-CrossTenant-MailboxType: HOSTED X-MS-Exchange-CrossTenant-UserPrincipalName: 9BpDHT1wztOKXV258ILOOqsmmqVjCtgoDFI+SoaUiFdA5UFaXggRcARKiwtOMT8Le732S2BjS0g4fsDvv1opWVEcKA9DNGvUTX27vC8kX4g= X-MS-Exchange-Transport-CrossTenantHeadersStamped: AM5PR0802MB2452 Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=40.107.21.113; envelope-from=vsementsov@virtuozzo.com; helo=EUR05-VI1-obe.outbound.protection.outlook.com X-Spam_score_int: -27 X-Spam_score: -2.8 X-Spam_bar: -- X-Spam_report: (-2.8 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, MSGID_FROM_MTA_HEADER=0.001, RCVD_IN_DNSWL_LOW=-0.7, RCVD_IN_MSPIKE_H2=-0.001, SPF_HELO_PASS=-0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: pass (identity @virtuozzo.com) Content-Type: text/plain; charset="utf-8" connect-thread part is not directly connected to block-layer. Good place for it is nbd/ directory. Signed-off-by: Vladimir Sementsov-Ogievskiy --- include/block/nbd.h | 6 ++++ block/nbd.c | 46 ---------------------------- nbd/client-connect.c | 72 ++++++++++++++++++++++++++++++++++++++++++++ nbd/meson.build | 1 + 4 files changed, 79 insertions(+), 46 deletions(-) create mode 100644 nbd/client-connect.c diff --git a/include/block/nbd.h b/include/block/nbd.h index 5f34d23bb0..660ab4c266 100644 --- a/include/block/nbd.h +++ b/include/block/nbd.h @@ -406,4 +406,10 @@ const char *nbd_info_lookup(uint16_t info); const char *nbd_cmd_lookup(uint16_t info); const char *nbd_err_lookup(int err); =20 + +typedef void (*NBDConnectThreadCallback)(QIOChannelSocket *sioc, int ret, + void *opaque); +void nbd_connect_thread_start(const SocketAddress *saddr, + NBDConnectThreadCallback cb, void *cb_opaque= ); + #endif diff --git a/block/nbd.c b/block/nbd.c index 4e669d762a..ba281e2d5a 100644 --- a/block/nbd.c +++ b/block/nbd.c @@ -101,15 +101,6 @@ typedef struct NBDConnectCB { AioContext *bh_ctx; /* where to schedule bh (NULL means don't schedule= ) */ } NBDConnectCB; =20 -typedef void (*NBDConnectThreadCallback)(QIOChannelSocket *sioc, int ret, - void *opaque); - -typedef struct NBDConnectThread { - SocketAddress *saddr; /* address to connect to */ - NBDConnectThreadCallback cb; - void *cb_opaque; -} NBDConnectThread; - typedef struct BDRVNBDState { QIOChannelSocket *sioc; /* The master data channel */ QIOChannel *ioc; /* The current I/O channel which may differ (eg TLS) = */ @@ -415,43 +406,6 @@ static void connect_thread_cb(QIOChannelSocket *sioc, = int ret, void *opaque) } } =20 -static void *connect_thread_func(void *opaque) -{ - NBDConnectThread *thr =3D opaque; - int ret; - QIOChannelSocket *sioc =3D qio_channel_socket_new(); - - ret =3D qio_channel_socket_connect_sync(sioc, thr->saddr, NULL); - if (ret < 0) { - object_unref(OBJECT(sioc)); - sioc =3D NULL; - } - - thr->cb(sioc, ret, thr->cb_opaque); - - qapi_free_SocketAddress(thr->saddr); - g_free(thr); - - return NULL; -} - -static void nbd_connect_thread_start(const SocketAddress *saddr, - NBDConnectThreadCallback cb, - void *cb_opaque) -{ - QemuThread thread; - NBDConnectThread *thr =3D g_new(NBDConnectThread, 1); - - *thr =3D (NBDConnectThread) { - .saddr =3D QAPI_CLONE(SocketAddress, saddr), - .cb =3D cb, - .cb_opaque =3D cb_opaque, - }; - - qemu_thread_create(&thread, "nbd-connect", - connect_thread_func, thr, QEMU_THREAD_DETACHED); -} - static int coroutine_fn nbd_co_establish_connection(BlockDriverState *bs) { diff --git a/nbd/client-connect.c b/nbd/client-connect.c new file mode 100644 index 0000000000..9f22c41a34 --- /dev/null +++ b/nbd/client-connect.c @@ -0,0 +1,72 @@ +/* + * QEMU Block driver for NBD + * + * Copyright (c) 2020 Virtuozzo International GmbH. + * + * Permission is hereby granted, free of charge, to any person obtaining a= copy + * of this software and associated documentation files (the "Software"), t= o deal + * in the Software without restriction, including without limitation the r= ights + * to use, copy, modify, merge, publish, distribute, sublicense, and/or se= ll + * copies of the Software, and to permit persons to whom the Software is + * furnished to do so, subject to the following conditions: + * + * The above copyright notice and this permission notice shall be included= in + * all copies or substantial portions of the Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS= OR + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, + * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL + * THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OT= HER + * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING= FROM, + * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS = IN + * THE SOFTWARE. + */ + +#include "qemu/osdep.h" + +#include "qapi/qapi-visit-sockets.h" +#include "qapi/clone-visitor.h" + +#include "block/nbd.h" + +typedef struct NBDConnectThread { + SocketAddress *saddr; /* address to connect to */ + NBDConnectThreadCallback cb; + void *cb_opaque; +} NBDConnectThread; + +static void *connect_thread_func(void *opaque) +{ + NBDConnectThread *thr =3D opaque; + int ret; + QIOChannelSocket *sioc =3D qio_channel_socket_new(); + + ret =3D qio_channel_socket_connect_sync(sioc, thr->saddr, NULL); + if (ret < 0) { + object_unref(OBJECT(sioc)); + sioc =3D NULL; + } + + thr->cb(sioc, ret, thr->cb_opaque); + + qapi_free_SocketAddress(thr->saddr); + g_free(thr); + + return NULL; +} + +void nbd_connect_thread_start(const SocketAddress *saddr, + NBDConnectThreadCallback cb, void *cb_opaque) +{ + QemuThread thread; + NBDConnectThread *thr =3D g_new(NBDConnectThread, 1); + + *thr =3D (NBDConnectThread) { + .saddr =3D QAPI_CLONE(SocketAddress, saddr), + .cb =3D cb, + .cb_opaque =3D cb_opaque, + }; + + qemu_thread_create(&thread, "nbd-connect", + connect_thread_func, thr, QEMU_THREAD_DETACHED); +} diff --git a/nbd/meson.build b/nbd/meson.build index 2baaa36948..da8c65ae59 100644 --- a/nbd/meson.build +++ b/nbd/meson.build @@ -1,5 +1,6 @@ block_ss.add(files( 'client.c', + 'client-connect.c', 'common.c', )) blockdev_ss.add(files( --=20 2.29.2 From nobody Fri Mar 29 14:24:56 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; arc=pass (i=1dmarc=pass fromdomain=virtuozzo.com); dmarc=pass(p=quarantine dis=none) header.from=virtuozzo.com ARC-Seal: i=2; a=rsa-sha256; t=1617793083; cv=pass; d=zohomail.com; s=zohoarc; b=AGAkmQezFPKFXZ/QYMdoYvGx8XeTrLabrxWdmtW2R3ka+c6BOm2HG7mpm+Md5dkPpWSkrfoe2u32b3sfB5EaLFlGD7fLgBZ8WpzGcvUMRVwiDMAeH3TbmVPULnkRppsIck7f6566Oy/CfSnbQ0Mqeapigk8FhIHr1kZVGfS4i24= ARC-Message-Signature: i=2; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1617793083; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=hISBE4SOcW9KH3Zsxv/CF6wkk6WeQItoKD8C3GVjYEY=; b=mXAVZLeWgOelS3JqgyooDVh4c4yxLXRbcZIwP4Nkzhfg1i2ZrZyV9PHHJKcU1a0Ftv8cA2Yextgnt7JT/EHgZZhY8dnVqtt0iLz+OzsTYqVuIVREocjoiRUBfYvgjzPfLNBX7IST03w17aIgeWLdLnJgBgbOXsMEH4zhFdOz9yI= ARC-Authentication-Results: i=2; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; arc=pass (i=1dmarc=pass fromdomain=virtuozzo.com); dmarc=pass header.from= (p=quarantine dis=none) header.from= Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 16177930830361015.3747541853055; Wed, 7 Apr 2021 03:58:03 -0700 (PDT) Received: from localhost ([::1]:50904 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1lU5sn-000190-QP for importer@patchew.org; Wed, 07 Apr 2021 06:58:01 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:58548) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lU5iO-0005jB-Qf; Wed, 07 Apr 2021 06:47:16 -0400 Received: from mail-vi1eur05on2113.outbound.protection.outlook.com ([40.107.21.113]:20888 helo=EUR05-VI1-obe.outbound.protection.outlook.com) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lU5iM-0001Tc-P6; Wed, 07 Apr 2021 06:47:16 -0400 Received: from AM7PR08MB5494.eurprd08.prod.outlook.com (2603:10a6:20b:dc::15) by AM5PR0802MB2452.eurprd08.prod.outlook.com (2603:10a6:203:9f::21) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.3999.32; Wed, 7 Apr 2021 10:47:09 +0000 Received: from AM7PR08MB5494.eurprd08.prod.outlook.com ([fe80::b403:c1a9:6bb7:133]) by AM7PR08MB5494.eurprd08.prod.outlook.com ([fe80::b403:c1a9:6bb7:133%7]) with mapi id 15.20.4020.017; Wed, 7 Apr 2021 10:47:09 +0000 Received: from localhost.localdomain (185.215.60.206) by HE1PR0902CA0021.eurprd09.prod.outlook.com (2603:10a6:3:e5::31) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4020.17 via Frontend Transport; Wed, 7 Apr 2021 10:47:08 +0000 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=lHWxl2RA43SnwYV3E0bKNkFEs2NOUcgOrarakVQdaIvVnbVaywUBS97q+vfP41NsPRJszykzx+rLcQqzl1p8/pP+b6/sUWEiTjs6yddLIx4UGIozOo8iofjNaEcn8Wczjp9rdWAY7hMNLhVxbU07ARp4+yK1U84kYnYlPCmTzTRLU/nlZJrfCy1cdUtcfJRleyxWdh5Udapkt3zK5C4gLmY3d9t38c66GlNpP7sbrwdpoM+oQVIjcNlDnn99Np8jO0msYiUCqYdLr2chZMUzns2j5CTkcdgx5OrbCKJW5EkLlGoqqQgzJQwyhZQMqNEwwIgXGuqcouGLTcRdAhByRw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=hISBE4SOcW9KH3Zsxv/CF6wkk6WeQItoKD8C3GVjYEY=; b=Bwc7dQ1ufzUH2tnOhcFKzh33b2wng16swX9bCly4VWBh559PvjYAHguDzL9+pJxvxEpmPal55l5CVm6D5mmbdyVHXTmXCjkq4J0GZSD2jitwuJQFN2tEgr5bCZDuXPgSSS3aN7BUOlStXQjRgzOPzqypBLfagkqnOwSTcycJMvTV0EgssQI9+gPSzQv2QIcn4TM9lbtWwRFVgPLZ45YrWe9ALcBZaHnpJv389Vy/uyOQBqkSYGDd0ikYYu/DscgLISWJOgMl6WcyKs65ncaDv7SqkRMMvnR+VT8O+2EdFmhODXjlWqtLVcxYvZ6Os/YpcjbtLCw8QrRpEt1do9se4w== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=virtuozzo.com; dmarc=pass action=none header.from=virtuozzo.com; dkim=pass header.d=virtuozzo.com; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=virtuozzo.com; s=selector2; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=hISBE4SOcW9KH3Zsxv/CF6wkk6WeQItoKD8C3GVjYEY=; b=C9en88uOfZJQidm6xiPQQOzSdinr+0CpEdSl9gx+WUCFbTQB3//VZNLPaslOx6EJLrSG1rxIa7nFUx9hs+xKj4oW6vpeCmVqX/XTD836jvjG3/CPmCmQ/Bx5LWO7jHuBUPWvUmViuU+ZgDzrflRxi5GKzWqv495g0jA4IbwLcM4= Authentication-Results: nongnu.org; dkim=none (message not signed) header.d=none;nongnu.org; dmarc=none action=none header.from=virtuozzo.com; From: Vladimir Sementsov-Ogievskiy 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 09/14] block/nbd: NBDConnectCB: drop bh_* fields Date: Wed, 7 Apr 2021 13:46:32 +0300 Message-Id: <20210407104637.36033-10-vsementsov@virtuozzo.com> X-Mailer: git-send-email 2.29.2 In-Reply-To: <20210407104637.36033-1-vsementsov@virtuozzo.com> References: <20210407104637.36033-1-vsementsov@virtuozzo.com> Content-Transfer-Encoding: quoted-printable X-Originating-IP: [185.215.60.206] X-ClientProxiedBy: HE1PR0902CA0021.eurprd09.prod.outlook.com (2603:10a6:3:e5::31) To AM7PR08MB5494.eurprd08.prod.outlook.com (2603:10a6:20b:dc::15) MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: c4c8b8f0-7e4d-42e2-5b08-08d8f9b27e93 X-MS-TrafficTypeDiagnostic: AM5PR0802MB2452: X-MS-Exchange-Transport-Forked: True X-Microsoft-Antispam-PRVS: X-MS-Oob-TLC-OOBClassifiers: OLM:1107; X-MS-Exchange-SenderADCheck: 1 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: R/eXgrA4ddeItliJXQaLPk6Mr/AuK5rf48bBTSQw6skRPSk71uVsndk5Dvt/bhYG8Dv8GWQeEHVkjfxkjHS4Uh6all/QKxyGkEXj/WU7VYAj4vJ4lVd8x/PtAPTxxHDveBQfU8qOCe6rk7qkswoX577Xn2JAfXbK/6D9kmiEn3eRGIn/VvpmC2zFgO44/WkOYIwIUmKitegE0nvNaA8GTywYohBjovQdt8vCSxr0w1Gnq6m8uJ2F4h35dDCks45bR8eeA8ICleOSHBmMVHsqwMlo2N1tKYzUPpv8fmWLxn0EmxOCDje4YtGgHU0QlJ28iqH7kfzRWpgpmVlNt7QXaHzKY77Qc1OLv7jzeESK2uTVvFiuVrqLuPI1oIKj1u9/QBWRJEhekAgGNQXxJg3lFSS+n3uBTOLdiLzQWrWJkeN/JHkKEsf9R62F1Z+wklRP6QSZVfV4MKOUo//js2wGLMtMWBExaZrx3j0gc9cyYjAZ429qVVTfvylaAMMqBUG4hPEm0lalSAQsV6juFrRWA6KS000gyjsnmm9yIyuK3rFm2fx8+U2rAeIwGERidKlvRlVkGhH4DPrrVMCRUisXb9TYX96NFxxgJwa+BA8hBYG/KWcKoORFaEU0T+8SHa9TepVooyaJt6WOmtOKal74qpd4RX0Pf48LomckpzvC0gJu5eCXgWjWSDblKX26X6ixScaGiU+Geo1SFWFH9niztPgH6UDBdlIj8cy7sRhgeAI= X-Forefront-Antispam-Report: CIP:255.255.255.255; CTRY:; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:AM7PR08MB5494.eurprd08.prod.outlook.com; PTR:; CAT:NONE; SFS:(4636009)(136003)(366004)(39840400004)(396003)(346002)(376002)(8936002)(66476007)(38350700001)(36756003)(5660300002)(6506007)(4326008)(69590400012)(956004)(66556008)(2616005)(478600001)(83380400001)(8676002)(316002)(6512007)(1076003)(186003)(66946007)(16526019)(107886003)(38100700001)(6486002)(6916009)(52116002)(86362001)(2906002)(6666004)(26005); DIR:OUT; SFP:1102; X-MS-Exchange-AntiSpam-MessageData: =?us-ascii?Q?YTN/kMBnTmWpb6I0W5thkklJ18z9Rq74SML8UapNk2Zko3H+wvictCNjBY6P?= =?us-ascii?Q?PlLWcpPVx5lmsOq0gT8k1JWi3avg5EBAVoS9WYmIPw9M0rjpPlPv+sd525hU?= =?us-ascii?Q?kiIYzrW0LfOHCboImYUW43xWprNNY+rxUIsUlLLLxSDkSO/B030izj6jPn6p?= =?us-ascii?Q?aBDN1FsxSe4j1ctiAAr5H6o8WaqUNzjL/ghl9DQ1oP7kEUqsECmxkHJcJHzZ?= =?us-ascii?Q?qZAebpHao+jAozOGuvyLgvTBpe25lwqzuKKD092bwu1pG/lm9D85Q/dwk4lG?= =?us-ascii?Q?qMcRhM/sOOTu8DcJmx6W0RUSrRI8PVyJHWwVghpelrI5wSrTQDoOGMNLAQrA?= =?us-ascii?Q?AwWyI+fORvh9FYhPmvu0s1qpGiP8o/e0Oezu/nTsQWk5/9x61MVY3IF383yM?= =?us-ascii?Q?AxEXuJDsIriDK+A576sokAP6LOU1mlfm+o8bvINjl4XvE0LjivkbV6dVf/0o?= =?us-ascii?Q?C3Xc+IQwrY+FAsYHBW7yy6f+N9OI5JYWWN61DBqRi/tcqQ6boxBOjbfqQp/o?= =?us-ascii?Q?wFG22yfnSOPq0HfKRZM2/sqhsE9s5EpA0bJ9pAHe/nREH7pZ1//PoheJJzEm?= =?us-ascii?Q?9M0ZGwdOAZ51PjgAqvGwD8agY1uBuMwlQpJh510TMKSwJB328gtv8eDSXatO?= =?us-ascii?Q?2hEYEXlEdM+gAe0YcNTKqoNr7akxJfUXXZVyRXz88nd/G47ca18YhgjlNeNv?= =?us-ascii?Q?8KaqJGeFdVkelR9tYMkdtv4ymtwqMFsBa8BsrnjLDiQYRceBQICnQLq9QtiR?= =?us-ascii?Q?zcKk2nBTTDO2xnKkB8jamS3DKO2TY8dfkZPIWl+G5uvzd7Dks7rySK0A0p6Y?= =?us-ascii?Q?qYoSY0BASpRd74wx2YeXvtX25hNFZhdil+LAo1X1145yoXZgou/cHewX6bg+?= =?us-ascii?Q?Etvm+e2Ps/rRPj/Jm3nWYH/6gCqYEl1KsW51Q/FLTuOcMGQuMlJU3OTT35zb?= =?us-ascii?Q?Jv+Lnp2DQb2NWE9MfJiA8ewkMG6pvHe9gk4oDmDQD9nEx1mfdLSY5TGtsmsN?= =?us-ascii?Q?fKb/x3U/7O8M2IX/+Wi4L8y0YM3paK2bONSFJ8AwQUts9avz/VifE0fxfGrC?= =?us-ascii?Q?oDJP8rSOCVW1X8klnfsXI6aAmnraozLv2ARBgI9r3rubzBpyANR7//ZAa3pY?= =?us-ascii?Q?djY7lcUiTOaL7n3LX1l3B3C8XGSbtcTkgOT4pEeY/TJrD3zX9CtseMXW/AiH?= =?us-ascii?Q?0riZ74g2QYg2xFJ5Rpd5x4UnxVGMhfn5dMF/UGSCgnGOJDi6ll1z0rHr2kMB?= =?us-ascii?Q?BOGeM5+2SO6PrhkKk5qKqiYWVxyxpotjhbwnYdHPnjP2N8ydZim1mlgixX1d?= =?us-ascii?Q?usNw9vDjXEQ2ksb1Xd+kK/v1?= X-OriginatorOrg: virtuozzo.com X-MS-Exchange-CrossTenant-Network-Message-Id: c4c8b8f0-7e4d-42e2-5b08-08d8f9b27e93 X-MS-Exchange-CrossTenant-AuthSource: AM7PR08MB5494.eurprd08.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 07 Apr 2021 10:47:09.8087 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 0bc7f26d-0264-416e-a6fc-8352af79c58f X-MS-Exchange-CrossTenant-MailboxType: HOSTED X-MS-Exchange-CrossTenant-UserPrincipalName: SVGAUocAYdR3ioIP3f1vo8S5h60O+/NNweDgv+KEJiWfK32eL83cpgCUjrdNpsCfXOXJ16PQ+rfVeXY5t/n52e9NSoKUrDdf1IGPP+Ib93Q= X-MS-Exchange-Transport-CrossTenantHeadersStamped: AM5PR0802MB2452 Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=40.107.21.113; envelope-from=vsementsov@virtuozzo.com; helo=EUR05-VI1-obe.outbound.protection.outlook.com X-Spam_score_int: -27 X-Spam_score: -2.8 X-Spam_bar: -- X-Spam_report: (-2.8 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, MSGID_FROM_MTA_HEADER=0.001, RCVD_IN_DNSWL_LOW=-0.7, RCVD_IN_MSPIKE_H2=-0.001, SPF_HELO_PASS=-0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: pass (identity @virtuozzo.com) Content-Type: text/plain; charset="utf-8" Drop bh_* fields and add back link to bs instead. We are on the way of simplifying reconnect logic in nbd driver, so look forward to further commits based on that one. Signed-off-by: Vladimir Sementsov-Ogievskiy --- block/nbd.c | 39 +++++++++++++++++++-------------------- 1 file changed, 19 insertions(+), 20 deletions(-) diff --git a/block/nbd.c b/block/nbd.c index ba281e2d5a..8bd52884c8 100644 --- a/block/nbd.c +++ b/block/nbd.c @@ -85,13 +85,6 @@ typedef enum NBDConnectThreadState { } NBDConnectThreadState; =20 typedef struct NBDConnectCB { - /* - * Bottom half to schedule on completion. Scheduled only if bh_ctx is = not - * NULL - */ - QEMUBHFunc *bh_func; - void *bh_opaque; - /* Result of last attempt. Valid in FAIL and SUCCESS states. */ QIOChannelSocket *sioc; =20 @@ -99,6 +92,9 @@ typedef struct NBDConnectCB { QemuMutex mutex; NBDConnectThreadState state; /* current state of the thread */ AioContext *bh_ctx; /* where to schedule bh (NULL means don't schedule= ) */ + + /* Link to NBD BDS. If NULL thread is detached, BDS is probably closed= . */ + BlockDriverState *bs; } NBDConnectCB; =20 typedef struct BDRVNBDState { @@ -351,32 +347,34 @@ static bool nbd_client_connecting_wait(BDRVNBDState *= s) return qatomic_load_acquire(&s->state) =3D=3D NBD_CLIENT_CONNECTING_WA= IT; } =20 -static void connect_bh(void *opaque) +static void nbd_init_connect_thread(BlockDriverState *bs) { - BDRVNBDState *state =3D opaque; - - assert(state->wait_connect); - state->wait_connect =3D false; - aio_co_wake(state->connection_co); -} + BDRVNBDState *s =3D bs->opaque; =20 -static void nbd_init_connect_thread(BDRVNBDState *s) -{ s->connect_thread =3D g_new(NBDConnectCB, 1); =20 *s->connect_thread =3D (NBDConnectCB) { .state =3D CONNECT_THREAD_NONE, - .bh_func =3D connect_bh, - .bh_opaque =3D s, + .bs =3D bs, }; =20 qemu_mutex_init(&s->connect_thread->mutex); } =20 +static void connect_bh(void *opaque) +{ + BDRVNBDState *state =3D opaque; + + assert(state->wait_connect); + state->wait_connect =3D false; + aio_co_wake(state->connection_co); +} + static void connect_thread_cb(QIOChannelSocket *sioc, int ret, void *opaqu= e) { NBDConnectCB *thr =3D opaque; bool do_free =3D false; + BDRVNBDState *s =3D thr->bs ? thr->bs->opaque : NULL; =20 qemu_mutex_lock(&thr->mutex); =20 @@ -386,7 +384,7 @@ static void connect_thread_cb(QIOChannelSocket *sioc, i= nt ret, void *opaque) case CONNECT_THREAD_RUNNING: thr->state =3D ret < 0 ? CONNECT_THREAD_FAIL : CONNECT_THREAD_SUCC= ESS; if (thr->bh_ctx) { - aio_bh_schedule_oneshot(thr->bh_ctx, thr->bh_func, thr->bh_opa= que); + aio_bh_schedule_oneshot(thr->bh_ctx, connect_bh, s); =20 /* play safe, don't reuse bh_ctx on further connection attempt= s */ thr->bh_ctx =3D NULL; @@ -520,6 +518,7 @@ static void nbd_co_establish_connection_cancel(BlockDri= verState *bs, wake =3D true; } if (detach) { + thr->bs =3D NULL; thr->state =3D CONNECT_THREAD_RUNNING_DETACHED; s->connect_thread =3D NULL; } @@ -2271,7 +2270,7 @@ static int nbd_open(BlockDriverState *bs, QDict *opti= ons, int flags, /* successfully connected */ s->state =3D NBD_CLIENT_CONNECTED; =20 - nbd_init_connect_thread(s); + nbd_init_connect_thread(bs); =20 s->connection_co =3D qemu_coroutine_create(nbd_connection_entry, s); bdrv_inc_in_flight(bs); --=20 2.29.2 From nobody Fri Mar 29 14:24:56 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; arc=pass (i=1dmarc=pass fromdomain=virtuozzo.com); dmarc=pass(p=quarantine dis=none) header.from=virtuozzo.com ARC-Seal: i=2; a=rsa-sha256; t=1617793177; cv=pass; d=zohomail.com; s=zohoarc; b=WwcCqLuYAAPUR4m6HaRlkNM/5Y3gqcwbgxLcST3o7B8X75S14j0GmTtsoCzHoBD1dr/2PpG+zhoN1oihdbjUEuajF6b74fahr6iANT6ZEt0Lr8LCsfAsZrUo1ay4AJLXqfO+8D31B0R0GLpi7oBAk+4TZizCEN8PYCgDX/wzYWs= ARC-Message-Signature: i=2; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1617793177; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=1f0s0fatcTUiyzTjLlBF94M7o3eaXLQI/jTsHxrFDSs=; b=AqWHrhSdCw55N3Rh/bCfpL2aqj1aTmYMvPVurjLWWFl8/FtV4Ud/y96624ZRoql5yIFC3YrUQvKGi3zW0ngpxIONUTfw9VXhrH5tZOik8iyy6dce/13GrFlpNNOiPhAFOqzJzrd2etGwZis4P/ZyWhDjsGeH6JGc3hxrP2wZO94= ARC-Authentication-Results: i=2; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; arc=pass (i=1dmarc=pass fromdomain=virtuozzo.com); dmarc=pass header.from= (p=quarantine dis=none) header.from= Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1617793177525690.0249587539587; Wed, 7 Apr 2021 03:59:37 -0700 (PDT) Received: from localhost ([::1]:54464 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1lU5uK-0002ds-DL for importer@patchew.org; Wed, 07 Apr 2021 06:59:36 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:58582) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lU5iR-0005px-Hw; Wed, 07 Apr 2021 06:47:19 -0400 Received: from mail-vi1eur05on2113.outbound.protection.outlook.com ([40.107.21.113]:20888 helo=EUR05-VI1-obe.outbound.protection.outlook.com) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lU5iP-0001Tc-H1; Wed, 07 Apr 2021 06:47:19 -0400 Received: from AM7PR08MB5494.eurprd08.prod.outlook.com (2603:10a6:20b:dc::15) by AM5PR0802MB2452.eurprd08.prod.outlook.com (2603:10a6:203:9f::21) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.3999.32; Wed, 7 Apr 2021 10:47:11 +0000 Received: from AM7PR08MB5494.eurprd08.prod.outlook.com ([fe80::b403:c1a9:6bb7:133]) by AM7PR08MB5494.eurprd08.prod.outlook.com ([fe80::b403:c1a9:6bb7:133%7]) with mapi id 15.20.4020.017; Wed, 7 Apr 2021 10:47:11 +0000 Received: from localhost.localdomain (185.215.60.206) by HE1PR0902CA0021.eurprd09.prod.outlook.com (2603:10a6:3:e5::31) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4020.17 via Frontend Transport; Wed, 7 Apr 2021 10:47:10 +0000 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=QHeuGJDC+BA2hW4NRcTkZa5fHowJ6UjEz3BTxWY4Uo2JJYz8U7qtH7/r4H2z1go/JoAn6Cyv/ypyZ9lno//GnUb9PPG8zsBS6FjfSzgAUSUPqHB33kVjo53+3a7wLD8yXwIs17j1zuS1vipH1eEupEYJpskEHqo/Q8BuRAA/xCbvASY9iAw6A20MzGNHfTXU3RihiNFzlUfTUISI7mlyxIoYnB1bRoLm/N5w+YQ/kjD8vaR8lUQdnCRvItmtbstPJa+p/Nayj9dUJ6dP/9xhvQkkdi+EmYE9INg9+HB0wioVqFX8QLW7PoE7B2/qM+6w07tJ4eX3SZwedMGb3pY8jQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=1f0s0fatcTUiyzTjLlBF94M7o3eaXLQI/jTsHxrFDSs=; b=cWdCNBktksVqs5OTng0ulo//+kX0KzjiaTZ0zBdwPHP9qvV8Am5zBrpHYyvKBknDTaIokSH/t5lJ2hSZvj648Q53lvr9RrhJN7pv/TnYCJblEQPh3m4Bvwz85ZR6m6V6nQVvQ3GuvrGRjL9XrhiY7npICIwC6Y2tvv2uOhc/irzwezjJFTTFKzvG46QabuIidF2pcMqjA2vzc6oIJLLy95ktJH+Jp7XLOu8CF2lEBSLq16v9Bm5OwarP0B0Nz3Vln6ebpKAl5nPZKAgaoGAA8M87DexdIb/6IJODR1uaa93RRZ8ZOBD0Kr8ZZ4i7gfluM+tXZqBvbvgvk10jZWL8Tw== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=virtuozzo.com; dmarc=pass action=none header.from=virtuozzo.com; dkim=pass header.d=virtuozzo.com; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=virtuozzo.com; s=selector2; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=1f0s0fatcTUiyzTjLlBF94M7o3eaXLQI/jTsHxrFDSs=; b=joaAuc5Kgo8+rFTQ6FTUWN4ecUaWISuH5OxAqXCL+7+TvfMdcg6ZXay0aGLK4k0egwJ1ByuaUJXAyE/nhPRBCDptGc1jVYDv5BhWt9H9TFDklexMeAcp0Ymz2RzbkuXLFaILney35QcmZ4mVcSOAu9Dzi+Q+ScJBqmFkRuY/uyk= Authentication-Results: nongnu.org; dkim=none (message not signed) header.d=none;nongnu.org; dmarc=none action=none header.from=virtuozzo.com; From: Vladimir Sementsov-Ogievskiy 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 10/14] block/nbd: move wait_connect field under mutex protection Date: Wed, 7 Apr 2021 13:46:33 +0300 Message-Id: <20210407104637.36033-11-vsementsov@virtuozzo.com> X-Mailer: git-send-email 2.29.2 In-Reply-To: <20210407104637.36033-1-vsementsov@virtuozzo.com> References: <20210407104637.36033-1-vsementsov@virtuozzo.com> Content-Transfer-Encoding: quoted-printable X-Originating-IP: [185.215.60.206] X-ClientProxiedBy: HE1PR0902CA0021.eurprd09.prod.outlook.com (2603:10a6:3:e5::31) To AM7PR08MB5494.eurprd08.prod.outlook.com (2603:10a6:20b:dc::15) MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 942cfb39-0c12-4d4f-80c9-08d8f9b27f68 X-MS-TrafficTypeDiagnostic: AM5PR0802MB2452: X-MS-Exchange-Transport-Forked: True X-Microsoft-Antispam-PRVS: X-MS-Oob-TLC-OOBClassifiers: OLM:1751; X-MS-Exchange-SenderADCheck: 1 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: 2TviBLIy4unDZHJvbWuZ+lR8vtWshTv6TY+38gJdmHapOpw/4KpnAMZJEtJr8Ul+qnm6hZEkqRFK9G3jD6rD58FT8A7e9oUF8oeRlaNiCij6NTUeE8FwJbT9Pi/yCe3DEgtGjYRyuNo6gxm9BqK7zhchvZ2E6PoPRHnJHkzuFzaktXGOl4TBgdBqsTCU37HVYfh3UQyviBX4ej5g50u0MDp9/jSjPpm+OUL0C2NXKyJzj5vVLryZyEY/pG0TO1SutbPmbj3dqf7W8F/abuxkb/RBgXP4Xaq5aNmiddhUmKQvnIXiXfzQ6JAIi+FWZdQ2+Wk1ypX6NuxJuRfggaDAC2BpQWJDHdTt6skivy4zbZh4Q7LRnJBiTHSjNAFGoz2boSybGDG5TU2MsIWJnSwSTJu+cWw29cdHYXkBeR/g60yiTyXzmmmnQ8U9tnmX2EhKNU7T1UOjRwiK7aAx/LFkBR1zA1FJbn2JVc3/0YEZ9cW11YlfZo5IZmhH2peC0vbVioByRaUtPcQQXcnwy3tIOEt2FyKS7WKlbed3hOtAWiFkakZIQ/AUiXY7OFXeU0I1L/m3DyoDsZHnM9VU6cJE2l79l6G7UtZlFB2Ik88MT1XNi/EjtkH2Krpw7bV69MBZt5FqgZN2CXrDFE6g85ABcG2huATS4v/qYLwIXyWZB0s5nqzpNHrEQUcD1w1HqM09eocywNxMFMkrDxu/VpYqUjqbep3ki2/5mBr+1pmGMT8= X-Forefront-Antispam-Report: CIP:255.255.255.255; CTRY:; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:AM7PR08MB5494.eurprd08.prod.outlook.com; PTR:; CAT:NONE; SFS:(4636009)(136003)(366004)(39840400004)(396003)(346002)(376002)(8936002)(66476007)(38350700001)(36756003)(5660300002)(6506007)(4326008)(69590400012)(956004)(66556008)(2616005)(478600001)(83380400001)(8676002)(316002)(6512007)(1076003)(186003)(66946007)(16526019)(107886003)(38100700001)(6486002)(6916009)(52116002)(86362001)(2906002)(6666004)(26005); DIR:OUT; SFP:1102; X-MS-Exchange-AntiSpam-MessageData: =?us-ascii?Q?haElwzNzWt2rW37NTAz12jV3Yo0UzlNNHZH+ZMAqtpHWz0ELhhwDFQfpvShY?= =?us-ascii?Q?vmUW6qxr21WsFRM8cHEnXIeEJk58186xPMyEpCKFSzNEK9C7fmvx7GF+up7w?= =?us-ascii?Q?N4COchRaA/XVQO3IHjmKKoSCnIBq+Zw7uQohZNOR2J646c1PAF1BJ4XbShBK?= =?us-ascii?Q?PTV6g+pID4uvkidxITjuxvoWl46hsYDh07H5Ks7WyFOoOzotmO3NJSfcVhLl?= =?us-ascii?Q?6j4YbZQ8tto+BfyCXVhkgTsRBp81fiIGjq0rQp+nvjNgl+VfrfW67RpCLJnQ?= =?us-ascii?Q?belUeghfI++5/vclswpQ99KruXy7v2F2oIlOBEJd12ZhVcoBTARiUWDEoWI6?= =?us-ascii?Q?C/puqzZ+omGuS5eE0o39877X+lfWX72H5ZV/VAABAwr9g6JOGWamKE32lg6N?= =?us-ascii?Q?a9wKzqHZnDZXwfiAGJPaHfQVfXqxlJaoydjLLXSnb0mkDpg9AaaUHZ7bp8VO?= =?us-ascii?Q?3T6FHx2T5HcROJO57CW33uW8ypSbrZdyrQny290sgrWSRHGFeNMuGJo7jP/T?= =?us-ascii?Q?BwAxtuIk7xfKuXn719OcMvBRkQytL8u0/P0GDHZPYss0qOa4mwe4BIotSYXG?= =?us-ascii?Q?/UXGskt0ELrgbePoB0U6/Gyh0D8wSEbMB8+uB0OLJ2Ofx2KfBSX4Id13B/Og?= =?us-ascii?Q?JqK02ySV1eCsLLZM1xTiChCJB8VfRzRFVCW8FHSGv9HY+NPDGF2m4IDz8nBu?= =?us-ascii?Q?CEWmqxOhUMbSc4KksLuG5aXgU+ymSEECrsE02XZvZ/ONkGS/SjZ//WCiRvz9?= =?us-ascii?Q?1r257ophzDzKA5ZIyMqSXV5lAqmshfiFYUOGskIW5ZITfYxjCnBP5iYkb1pz?= =?us-ascii?Q?Vn7/QqzpXpf4dm0kxEDKHs1cu5SooNOWtGKTyiYgI+htS87NXd1Upy6j6+3+?= =?us-ascii?Q?SLEbeTZydONPvw9a+fGWwrejpY+QJ+Qt60KRbGu93KW+7aaxyqR2wiM3N83g?= =?us-ascii?Q?WOA839UqZmoIIt/BuiMcCgItoY+PokEmqmX0Zelj344jQX/zVxbf1Jzz4Zaz?= =?us-ascii?Q?tJ6MNTd+7Ze8XgBdaO6es772ye9+H5bkxYOzOkHuTNHJkWabKpBuxMXUL2yv?= =?us-ascii?Q?fqPrq2RlVpmj+IOp518or9YEVncNtdYEjR9xselwV6K8LrkSHXPaI+ueD9Sb?= =?us-ascii?Q?X/Asu4J5tpsorzXyxDQIdVcie0S4QSb3znzqqt0oP5X6+XAoXtYWGXB9AyRG?= =?us-ascii?Q?91Dq4M/qZXgf62UFO6FfzU35sMeKPsoEYvRmxWkHvw+oBAMfWDC5OhqrFexT?= =?us-ascii?Q?R0TwQHJbESG4nGbSg2POmfHQ8d5t4TrDatJs94rDZ9p6KIlXjdd49pa2a2IC?= =?us-ascii?Q?YOS2iGvCCx7h2TDyBISJtCSH?= X-OriginatorOrg: virtuozzo.com X-MS-Exchange-CrossTenant-Network-Message-Id: 942cfb39-0c12-4d4f-80c9-08d8f9b27f68 X-MS-Exchange-CrossTenant-AuthSource: AM7PR08MB5494.eurprd08.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 07 Apr 2021 10:47:11.1886 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 0bc7f26d-0264-416e-a6fc-8352af79c58f X-MS-Exchange-CrossTenant-MailboxType: HOSTED X-MS-Exchange-CrossTenant-UserPrincipalName: X27xW9wAw1ddtwgnPt0vw1ByKxF2wxDWy2VRHrQ/gJ5iDiKuAFv5ieNPaAXEI4WRvxuQY9SsC33VxUxDH881hy7GuakhLEbPtTdev/BMejs= X-MS-Exchange-Transport-CrossTenantHeadersStamped: AM5PR0802MB2452 Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=40.107.21.113; envelope-from=vsementsov@virtuozzo.com; helo=EUR05-VI1-obe.outbound.protection.outlook.com X-Spam_score_int: -27 X-Spam_score: -2.8 X-Spam_bar: -- X-Spam_report: (-2.8 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, MSGID_FROM_MTA_HEADER=0.001, RCVD_IN_DNSWL_LOW=-0.7, RCVD_IN_MSPIKE_H2=-0.001, SPF_HELO_PASS=-0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: pass (identity @virtuozzo.com) Content-Type: text/plain; charset="utf-8" Move wait_connect to NBDConnectCB and protect it by mutex. It provides simpler logic than bothering with bh_ctx (which we can drop now). Signed-off-by: Vladimir Sementsov-Ogievskiy --- block/nbd.c | 42 +++++++++++++++++++++--------------------- 1 file changed, 21 insertions(+), 21 deletions(-) diff --git a/block/nbd.c b/block/nbd.c index 8bd52884c8..29bdbd38b6 100644 --- a/block/nbd.c +++ b/block/nbd.c @@ -88,13 +88,15 @@ typedef struct NBDConnectCB { /* Result of last attempt. Valid in FAIL and SUCCESS states. */ QIOChannelSocket *sioc; =20 - /* state and bh_ctx are protected by mutex */ QemuMutex mutex; + /* All further fields are protected by mutex */ NBDConnectThreadState state; /* current state of the thread */ - AioContext *bh_ctx; /* where to schedule bh (NULL means don't schedule= ) */ =20 /* Link to NBD BDS. If NULL thread is detached, BDS is probably closed= . */ BlockDriverState *bs; + + /* connection_co is waiting in yield() */ + bool wait_connect; } NBDConnectCB; =20 typedef struct BDRVNBDState { @@ -129,7 +131,6 @@ typedef struct BDRVNBDState { char *x_dirty_bitmap; bool alloc_depth; =20 - bool wait_connect; NBDConnectCB *connect_thread; } BDRVNBDState; =20 @@ -365,8 +366,6 @@ static void connect_bh(void *opaque) { BDRVNBDState *state =3D opaque; =20 - assert(state->wait_connect); - state->wait_connect =3D false; aio_co_wake(state->connection_co); } =20 @@ -374,6 +373,7 @@ static void connect_thread_cb(QIOChannelSocket *sioc, i= nt ret, void *opaque) { NBDConnectCB *thr =3D opaque; bool do_free =3D false; + bool do_wake =3D false; BDRVNBDState *s =3D thr->bs ? thr->bs->opaque : NULL; =20 qemu_mutex_lock(&thr->mutex); @@ -383,12 +383,8 @@ static void connect_thread_cb(QIOChannelSocket *sioc, = int ret, void *opaque) switch (thr->state) { case CONNECT_THREAD_RUNNING: thr->state =3D ret < 0 ? CONNECT_THREAD_FAIL : CONNECT_THREAD_SUCC= ESS; - if (thr->bh_ctx) { - aio_bh_schedule_oneshot(thr->bh_ctx, connect_bh, s); - - /* play safe, don't reuse bh_ctx on further connection attempt= s */ - thr->bh_ctx =3D NULL; - } + do_wake =3D thr->wait_connect; + thr->wait_connect =3D false; break; case CONNECT_THREAD_RUNNING_DETACHED: do_free =3D true; @@ -399,6 +395,17 @@ static void connect_thread_cb(QIOChannelSocket *sioc, = int ret, void *opaque) =20 qemu_mutex_unlock(&thr->mutex); =20 + if (do_wake) { + /* + * At this point we are sure that connection_co sleeps in the + * corresponding yield point and we here have an exclusive right + * (and obligations) to wake it. + * Direct call to aio_co_wake() from thread context works bad. So = use + * aio_bh_schedule_oneshot() as a mediator. + */ + aio_bh_schedule_oneshot(bdrv_get_aio_context(thr->bs), connect_bh,= s); + } + if (do_free) { g_free(thr); } @@ -435,20 +442,14 @@ nbd_co_establish_connection(BlockDriverState *bs) abort(); } =20 - thr->bh_ctx =3D qemu_get_current_aio_context(); + thr->wait_connect =3D true; =20 qemu_mutex_unlock(&thr->mutex); =20 - /* * We are going to wait for connect-thread finish, but * nbd_client_co_drain_begin() can interrupt. - * - * Note that wait_connect variable is not visible for connect-thread. = It - * doesn't need mutex protection, it used only inside home aio context= of - * bs. */ - s->wait_connect =3D true; qemu_coroutine_yield(); =20 qemu_mutex_lock(&thr->mutex); @@ -512,9 +513,8 @@ static void nbd_co_establish_connection_cancel(BlockDri= verState *bs, =20 if (thr->state =3D=3D CONNECT_THREAD_RUNNING) { /* We can cancel only in running state, when bh is not yet schedul= ed */ - thr->bh_ctx =3D NULL; - if (s->wait_connect) { - s->wait_connect =3D false; + if (thr->wait_connect) { + thr->wait_connect =3D false; wake =3D true; } if (detach) { --=20 2.29.2 From nobody Fri Mar 29 14:24:56 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; arc=pass (i=1dmarc=pass fromdomain=virtuozzo.com); dmarc=pass(p=quarantine dis=none) header.from=virtuozzo.com ARC-Seal: i=2; a=rsa-sha256; t=1617792691; cv=pass; d=zohomail.com; s=zohoarc; b=h2otIgwXu8YZCejHCm3OSe2CcPfvsJZUtiqo0clNM84muLqRX94gdXqfYu0Vi5aixTexdgAi3foxFKupikHwrD0RVT7RrRmyrlRKsLSau0iAVD2+mcoFI5ivkejP9ihpIurzxjloB+jw7oj5znRI3zp+grvU5QItikFeeBRkBD4= ARC-Message-Signature: i=2; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1617792691; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=eU/P9Zj5zvgSHWtZWTSvtBIZ+PMmL7Rq/NUQRvVDfxs=; b=meX4Lhx7+DFKJFifOZgGUnzGEgVkMrmAWxXNJwBIZ88lztRedTi1qr7vJZyMTl2dq5qI8KFvtzWA0+uFwVWBJTWz419BpU2eckrgeUpBRDRlOxbmmJ7PfDDQJflVPr6ECB902rChzDjVSGd8raMQXffqIu0LFXUXoJX6fMM/8sg= ARC-Authentication-Results: i=2; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; arc=pass (i=1dmarc=pass fromdomain=virtuozzo.com); dmarc=pass header.from= (p=quarantine dis=none) header.from= Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1617792691609264.8884324152631; Wed, 7 Apr 2021 03:51:31 -0700 (PDT) Received: from localhost ([::1]:58754 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1lU5mU-00018y-7I for importer@patchew.org; Wed, 07 Apr 2021 06:51:30 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:58594) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lU5iT-0005wK-Ua; Wed, 07 Apr 2021 06:47:21 -0400 Received: from mail-vi1eur05on2113.outbound.protection.outlook.com ([40.107.21.113]:20888 helo=EUR05-VI1-obe.outbound.protection.outlook.com) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lU5iS-0001Tc-8n; Wed, 07 Apr 2021 06:47:21 -0400 Received: from AM7PR08MB5494.eurprd08.prod.outlook.com (2603:10a6:20b:dc::15) by AM5PR0802MB2452.eurprd08.prod.outlook.com (2603:10a6:203:9f::21) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.3999.32; Wed, 7 Apr 2021 10:47:12 +0000 Received: from AM7PR08MB5494.eurprd08.prod.outlook.com ([fe80::b403:c1a9:6bb7:133]) by AM7PR08MB5494.eurprd08.prod.outlook.com ([fe80::b403:c1a9:6bb7:133%7]) with mapi id 15.20.4020.017; Wed, 7 Apr 2021 10:47:12 +0000 Received: from localhost.localdomain (185.215.60.206) by HE1PR0902CA0021.eurprd09.prod.outlook.com (2603:10a6:3:e5::31) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4020.17 via Frontend Transport; Wed, 7 Apr 2021 10:47:11 +0000 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=VDd2X3C0+YoNXH0sH6sXF8Qkqmyt/j9f1GO07xNX2z3P6a9qXi8vXrhlrudt6ScqJjfrEIHEvB3Pd8jmhByeTNHxqoBG4A2Qq3DBGa7zXvVIXmApo3FU2POuYX77A4M1L2rncgd3f3r+xUIgHdJGE+PtjXKZXvzhCZXeH9YAVHbNIPUm0EQXc3YDB8uAYYfRLTnMDXHS0XSjtIbqPS0yMT+Sy8jqGkws/+1/HWFxYrFeu2C0bl4xw+VqtGuW12ZBPms0NZuZeDqECjTdtOehcRq8Ybmsc9wL3sd7S6Lznuel2LEGNOdb5h01lJLATjL3LAuzwbzAqVC7qE5qI1MvOA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=eU/P9Zj5zvgSHWtZWTSvtBIZ+PMmL7Rq/NUQRvVDfxs=; b=d6BYQTKz7cXPZftHo11M55m4w2hj2KJBLIxc6+42nGv+Q4SqS+sv6GRQU1k3fr+f/Hea44HqszzPDyggHe3GtnPrHzXz2eS2NeT2V/XdgPWlKx4/OpOACATmwfjCv0iGkaw46QhFQvRTdDMOID4YEqXwC0W+2yrf7jiBvvtd5ZEVh+tPtwZprWgFqu132ohOyk7GDEvwGypNYUBTmufMHsRolTC2IgQroqcfJtq2HVmtPUfzGzfeA4GtYMRCJ3QbRwkXE9UyOJLQ6ahgdVgBZJNFHnhviRX2J/ykUFMGW4GwX+OUA77zW9ceMFNHs/69CRVnP3AjQUkKVxzSIYSJDQ== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=virtuozzo.com; dmarc=pass action=none header.from=virtuozzo.com; dkim=pass header.d=virtuozzo.com; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=virtuozzo.com; s=selector2; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=eU/P9Zj5zvgSHWtZWTSvtBIZ+PMmL7Rq/NUQRvVDfxs=; b=EOpwpJ3ZyhmQWV9WM6bkBCdFsU790FOK8eNborZYAOw2rlgTEmM1OUqUqEbpDzxB2yPyIpNFjQimhAHfi1uOUPQ3Y//Rs8HS/a1t2lU8dk0u6R1T7eLx9UJYSS8rf8f4qtK5w4B5rdgYqAut44lqNMI33Q3tZD4jaUX2MWR0AZo= Authentication-Results: nongnu.org; dkim=none (message not signed) header.d=none;nongnu.org; dmarc=none action=none header.from=virtuozzo.com; From: Vladimir Sementsov-Ogievskiy 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 11/14] block/nbd: refactor connect_bh() Date: Wed, 7 Apr 2021 13:46:34 +0300 Message-Id: <20210407104637.36033-12-vsementsov@virtuozzo.com> X-Mailer: git-send-email 2.29.2 In-Reply-To: <20210407104637.36033-1-vsementsov@virtuozzo.com> References: <20210407104637.36033-1-vsementsov@virtuozzo.com> Content-Transfer-Encoding: quoted-printable X-Originating-IP: [185.215.60.206] X-ClientProxiedBy: HE1PR0902CA0021.eurprd09.prod.outlook.com (2603:10a6:3:e5::31) To AM7PR08MB5494.eurprd08.prod.outlook.com (2603:10a6:20b:dc::15) MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 4c07b696-4227-4a63-687b-08d8f9b28032 X-MS-TrafficTypeDiagnostic: AM5PR0802MB2452: X-MS-Exchange-Transport-Forked: True X-Microsoft-Antispam-PRVS: X-MS-Oob-TLC-OOBClassifiers: OLM:229; X-MS-Exchange-SenderADCheck: 1 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: Uv2hoAMTOa8gqHT0kvqeI5E2Vnc6H0Voiu38x99cPD6YXxIvKJtMa9twkRoFt01blVKMt4/kaQXgkq9+r8FThZCRqwCjDAcSBdTLy1Ie6ePYs57cJWPhIqIybTb76CvqEW4stawH67UY3JIK8CFo7RkQ7G9nYGU63X/0la3CRoA/CQhTXIrHnNpTLa2vA17N2ZIcwPzvCbQ9ZJ4ms6hxtPz6FX88CnZXLpvsaRMB+Kb+SCiZv+Av8s/9z+aE3gVqAIAXOLMz6b1gI7VEdZ6gXFm2Qs0vXaYAfxATvq22C0M9akzDSOzTpwPimVj0wZbdJV7LdgPKBwsUgprSgtE298eg8sYevRW9D5uW9NwpTrT+89C6I4tqUupkG/BvpVk4xjb01Xu6HwF3zObh0PbHAyzcI109ebUkxE3EjI4qaDTMkhG6hRKw4IDzelvkrOxzUhy/WDzYeSZ9/tw6eFTKehoRoj/YdTQs6C6t5WiSMdAau0hQYE4ZQvPIJvBNmnFrOg0WuwmbNRqcxnQqaqY+WdiekYsHzFQkzAiUWENKz37FsDW8MnJ9lc5Y7p58CHBXHHeM1/3v3l5R4n7XtPBbjPTvU+1kOttTfjenFj6drHnuJjWh0WC//OQvNLYDb3K5744mZjOXCDhlSUY0+2V1/NQUbuJRk7d6KTB6wBb7pwghrIRf4exswv857pchyTKlvDnbM6qLm/akR25Z6AVZ3D4yf9LsYVRc+yVWFQCCleM= X-Forefront-Antispam-Report: CIP:255.255.255.255; CTRY:; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:AM7PR08MB5494.eurprd08.prod.outlook.com; PTR:; CAT:NONE; SFS:(4636009)(136003)(366004)(39840400004)(396003)(346002)(376002)(8936002)(66476007)(38350700001)(36756003)(5660300002)(6506007)(4326008)(69590400012)(956004)(66556008)(2616005)(478600001)(83380400001)(8676002)(316002)(6512007)(1076003)(186003)(66946007)(16526019)(107886003)(38100700001)(6486002)(6916009)(52116002)(86362001)(2906002)(6666004)(26005); DIR:OUT; SFP:1102; X-MS-Exchange-AntiSpam-MessageData: =?us-ascii?Q?WlQtfTli0GPaS9ai66Tl96g2O6IIyg503T1Glz62+CmGEubvf+loRxt3JUJi?= =?us-ascii?Q?0rg11k72p3kN8WUrHu+XbSrKFNh/R0ESqRbSU8LqsGgO4vgrH1IrlgTaLNXq?= =?us-ascii?Q?bUpAtpjCB0f6DW037s7CyyFkINsciwyCnBtVDMz2F60u+a43XRpVnwkEeQyT?= =?us-ascii?Q?wFxdNqu5YcN6u+/XXRGMJKWw+gxoI6A1HUwkkP8Tj3co+TzJHrEQvrdGH5fJ?= =?us-ascii?Q?L3mxpq2zXG3UhX3Jlqyi4Vll4U6VuI+1DvnYHIuuwctQBOBqwZtkML1W7uJI?= =?us-ascii?Q?XayJeBglyME6Q6dFGX5LIwtMtEu1/Xyb4tVVUGNYYs5l7QIIuWqacgmUlTip?= =?us-ascii?Q?KFQrjpdRzf2TErLvyWj/89KTTU4zmteuR563H/92KaQVMw5X5RYqeorG2RaZ?= =?us-ascii?Q?7KKAWykqpzgLB5zxayrO+So2CHsr835ygeKjhcv95o6wBqCKdirx3Nud+vC6?= =?us-ascii?Q?NJWYLUTGa8M45wEelVj9gxdsSnHvAAW5uWg+hDL2LlQO7jfKKmLRNDuMKMCc?= =?us-ascii?Q?JdqpKlU/fWADbQAf90gzjys1EC+HNWsDXg1vEjXCvZrGZRDPhkr7A4gnhIeF?= =?us-ascii?Q?mKoxMJ4o4q5J6i5vSEO0x49H6xrizXv0crRkB1A2cSaEj9HF3AM5Vd6yF/vT?= =?us-ascii?Q?vuFpStzhI7XXx6diI597aIQVyFmR6OUQFJMLRXdQmDb+CbSrC5ZVpBeirWUI?= =?us-ascii?Q?RKM/nCl7daLYnBTRwgeDxHoDWawrCzwJ4+e/0w2osZlH6RuRZTq3zu+yC8fu?= =?us-ascii?Q?/CmA1d8dYBVUJ/uuMrm+WXtY93DfIpsU6TT5MWC71yt1/r7To5YBvpiWNor8?= =?us-ascii?Q?jNG/PV5Qj/F3sFHr1BBLNp9hYu2p4MA/zkcXLHsSNes9y6b4g2gGd0aihoUL?= =?us-ascii?Q?0gjzX7i/ksBmWKpAik7JbB3cFul5kRVofagrbHq0clbZRs9r2zjJnmm498Ch?= =?us-ascii?Q?JbUQMuTlyna/ICLW7auXkqy+mMwArT1YgtspCzvA1UexqzJjCdaQdq2BCJJO?= =?us-ascii?Q?lErArSn9QYoNunpJ4/ucB2nc5QLbK4o4ud3cCAn0R29+tCxaETzk1su/wn7E?= =?us-ascii?Q?hHHkLs48de3SnlyCywdj4o5vZQNiCgBWx/Kt2/xopxgS8yX51kjLiLWrfPnH?= =?us-ascii?Q?hCVpaJIUryZ307Q6iWOZDcX9dynfWf2qwRJ8FVHsh2aBQGSCaO+KCuKlUuPS?= =?us-ascii?Q?N3cZV60kMpmzUcspToHDLZf/s5AdTnIlEPYQ563tAIhhIRcEcACG8BIUvyRr?= =?us-ascii?Q?1wN5GeN+tpbjpzQxhStt2VsOIivmhd32ku5+lPfUzALR1Q4SkCZoqCD9MGx+?= =?us-ascii?Q?1gAsb8mUVEYs525xgp+aIapy?= X-OriginatorOrg: virtuozzo.com X-MS-Exchange-CrossTenant-Network-Message-Id: 4c07b696-4227-4a63-687b-08d8f9b28032 X-MS-Exchange-CrossTenant-AuthSource: AM7PR08MB5494.eurprd08.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 07 Apr 2021 10:47:12.5397 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 0bc7f26d-0264-416e-a6fc-8352af79c58f X-MS-Exchange-CrossTenant-MailboxType: HOSTED X-MS-Exchange-CrossTenant-UserPrincipalName: gCCPihBk7EfTb4ijpphmFS9G7PkycbLN+FBTNaY9jSyVdsFyzgHYD3dfe+L3xv9QWniWJLpj52hYK5C/VA1rXaq4EKdVuUpSs/uLq15r+3U= X-MS-Exchange-Transport-CrossTenantHeadersStamped: AM5PR0802MB2452 Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=40.107.21.113; envelope-from=vsementsov@virtuozzo.com; helo=EUR05-VI1-obe.outbound.protection.outlook.com X-Spam_score_int: -27 X-Spam_score: -2.8 X-Spam_bar: -- X-Spam_report: (-2.8 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, MSGID_FROM_MTA_HEADER=0.001, RCVD_IN_DNSWL_LOW=-0.7, RCVD_IN_MSPIKE_H2=-0.001, SPF_HELO_PASS=-0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: pass (identity @virtuozzo.com) Content-Type: text/plain; charset="utf-8" Now it's just a wrapper for aio_co_wake(). Make it more obvious. Signed-off-by: Vladimir Sementsov-Ogievskiy --- block/nbd.c | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/block/nbd.c b/block/nbd.c index 29bdbd38b6..6729561935 100644 --- a/block/nbd.c +++ b/block/nbd.c @@ -362,11 +362,9 @@ static void nbd_init_connect_thread(BlockDriverState *= bs) qemu_mutex_init(&s->connect_thread->mutex); } =20 -static void connect_bh(void *opaque) +static void coroutine_wake_bh(void *opaque) { - BDRVNBDState *state =3D opaque; - - aio_co_wake(state->connection_co); + aio_co_wake(opaque); } =20 static void connect_thread_cb(QIOChannelSocket *sioc, int ret, void *opaqu= e) @@ -403,7 +401,8 @@ static void connect_thread_cb(QIOChannelSocket *sioc, i= nt ret, void *opaque) * Direct call to aio_co_wake() from thread context works bad. So = use * aio_bh_schedule_oneshot() as a mediator. */ - aio_bh_schedule_oneshot(bdrv_get_aio_context(thr->bs), connect_bh,= s); + aio_bh_schedule_oneshot(bdrv_get_aio_context(thr->bs), + coroutine_wake_bh, s->connection_co); } =20 if (do_free) { --=20 2.29.2 From nobody Fri Mar 29 14:24:56 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; arc=pass (i=1dmarc=pass fromdomain=virtuozzo.com); dmarc=pass(p=quarantine dis=none) header.from=virtuozzo.com ARC-Seal: i=2; a=rsa-sha256; t=1617792947; cv=pass; d=zohomail.com; s=zohoarc; b=URQjqQ/4Ykaqz3O5irG7MWg8S6VB594sTOaQmDD4mI2TjIlHE+2iGEOw3NRW+VIqybDC1iZpMqy9Iza7yXh+xpAENXlwLDGRtyOKjU1R67xJq80X2IAFcI0paepqXpu21FphMv0rqXjWQRqv2cA7qfZNszGOiB4OmUiTfUZB4K4= ARC-Message-Signature: i=2; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1617792947; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=XEkwYAy1pVM9VZlOV/ULu/9JwYkmgh3KKjF9gvXO7ns=; b=GcTcYtZdao8HIc215PY5xeqtZOgcyrdJ6utcuLdlEbGqNQrwpZhqxQQqQAMPdi7Wn8yyjKULYH56kUMe0X0hclxt2NrxX1aKfIOKpJW/fD/96xsOnnFCOov2Vp1cL1RSuaS2ojm9drnTZuKKLNPJp46xhHPYw/Q9wPHLRTKAJtY= ARC-Authentication-Results: i=2; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; arc=pass (i=1dmarc=pass fromdomain=virtuozzo.com); dmarc=pass header.from= (p=quarantine dis=none) header.from= Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1617792947156237.36379476886407; Wed, 7 Apr 2021 03:55:47 -0700 (PDT) Received: from localhost ([::1]:43188 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1lU5qb-0006Mq-Uz for importer@patchew.org; Wed, 07 Apr 2021 06:55:46 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:58606) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lU5iW-000640-FQ; Wed, 07 Apr 2021 06:47:24 -0400 Received: from mail-vi1eur05on2113.outbound.protection.outlook.com ([40.107.21.113]:20888 helo=EUR05-VI1-obe.outbound.protection.outlook.com) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lU5iU-0001Tc-Mz; Wed, 07 Apr 2021 06:47:24 -0400 Received: from AM7PR08MB5494.eurprd08.prod.outlook.com (2603:10a6:20b:dc::15) by AM5PR0802MB2452.eurprd08.prod.outlook.com (2603:10a6:203:9f::21) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.3999.32; Wed, 7 Apr 2021 10:47:14 +0000 Received: from AM7PR08MB5494.eurprd08.prod.outlook.com ([fe80::b403:c1a9:6bb7:133]) by AM7PR08MB5494.eurprd08.prod.outlook.com ([fe80::b403:c1a9:6bb7:133%7]) with mapi id 15.20.4020.017; Wed, 7 Apr 2021 10:47:14 +0000 Received: from localhost.localdomain (185.215.60.206) by HE1PR0902CA0021.eurprd09.prod.outlook.com (2603:10a6:3:e5::31) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4020.17 via Frontend Transport; Wed, 7 Apr 2021 10:47:12 +0000 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=Pe+/eCfSJeqlBMhXc3E+rnrmcGyiR5+bW0xsrqYelvgB+NZ3GwaGbaHwF/ia7szeFGAS2GOkReSEQtVugwqEvu0HPfmuWbJc8HuJ6sDwWnDV7rtuG7x0hv5m1WTeOWnfntguR7Givf1gmjKjyMUMD5Q84HgSBRNuP/2tpZ5kATjdnRkgfVm2MC+1mLe040fsPNWQu5QEck6NVB8ALGtNdimw5jDSrKEegCncnXM6XOEY/TOkXaAid1Cg6NbLYJbq1XjxMlIO6u+/hEUwtqw3bvgVwM4oDPWlgJjnJ006m9vYSMP11g2rRSxI9smu55EE28v87pOzccxutNPpIHO3wg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=XEkwYAy1pVM9VZlOV/ULu/9JwYkmgh3KKjF9gvXO7ns=; b=irwAK7Tq8d2P7KPbaXdR9xOG8W8L5RID4Y2jAaJOzrYdGkr/bLx6hvheuCL++AHcixKqUVqg/Sd7abDAjsksp2Nu7QzH23YaQP9dUqIdHvnJNaqfM4u8tl9qzDGfktYplw4I6jQzTjQuNwlftnxk9ioVLxRi07HdlV1nfMmM0BF9Ng2j9vPjeCShi1tPQgntiGKuleI7HHuM3khMtvuZegPZWGnJN76KzTuYBrb+N9ZzYtM0PlfLkJax3r1p3/MXzVhnp5598MuUS/KjLPiljUVQ3EQt3h1eZ9u+cD7J/KRCpQ+OfSlGC+/msqEZP2fzqbq3ZNfJokyWVIu0ogojRw== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=virtuozzo.com; dmarc=pass action=none header.from=virtuozzo.com; dkim=pass header.d=virtuozzo.com; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=virtuozzo.com; s=selector2; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=XEkwYAy1pVM9VZlOV/ULu/9JwYkmgh3KKjF9gvXO7ns=; b=OL6AdAJ9n2MuuN5WfOA2U42IqScjJ/OJ/aa04eteatcPCqw5z8w45k70DF+NetWJMr74vZgR6tCTBKWQJ1tcr2M18M0ib058nirJT5xUaBbrsXh3ugWzd4+ohrGkIiFjs7urR51DpQ3ILYzkJ86pE9gNLgARRIdJ6gYf/38g4/M= Authentication-Results: nongnu.org; dkim=none (message not signed) header.d=none;nongnu.org; dmarc=none action=none header.from=virtuozzo.com; From: Vladimir Sementsov-Ogievskiy 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 12/14] block/nbd: refactor nbd_co_establish_connection Date: Wed, 7 Apr 2021 13:46:35 +0300 Message-Id: <20210407104637.36033-13-vsementsov@virtuozzo.com> X-Mailer: git-send-email 2.29.2 In-Reply-To: <20210407104637.36033-1-vsementsov@virtuozzo.com> References: <20210407104637.36033-1-vsementsov@virtuozzo.com> Content-Transfer-Encoding: quoted-printable X-Originating-IP: [185.215.60.206] X-ClientProxiedBy: HE1PR0902CA0021.eurprd09.prod.outlook.com (2603:10a6:3:e5::31) To AM7PR08MB5494.eurprd08.prod.outlook.com (2603:10a6:20b:dc::15) MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: efe8b582-eaba-43df-8b4c-08d8f9b2810e X-MS-TrafficTypeDiagnostic: AM5PR0802MB2452: X-MS-Exchange-Transport-Forked: True X-Microsoft-Antispam-PRVS: X-MS-Oob-TLC-OOBClassifiers: OLM:160; X-MS-Exchange-SenderADCheck: 1 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: xTVLWNv7UN6lB0ON/wY0fA1tpflw6UG6YwQk4AMjE3w72tS7NIHtGVjsZ7kfKLYLs8GP+MRLYPGb8uBMW64NqG/4ZMzXBxvPa7aOl4Ivna0AZvWZaovJA/Z1h/ITBM8FDmRr4UG03r7e4bJp3UcZQNGUAAdMxRHN8hg2LuqHAraHDPVEZMw4xUb1i5X67M1l1pKMvPZOiB8SNtLmZk1sijBODn2KaLxeAgq/pjuK1BFg1HGaMH/yygaIKpC3DG3VVWLssXg8FP7JmQ4fgXxyNMmMXtklOqXyOh19NtZ+1pwWjOjqUMxZES7dn62mwrFZkJJiX/VS5ueZSVpjmFHV5b8+iYQgeWap3RSQaVz3RjfhZYdDqBANyfsUw8ZMLpca44FUBPWrbgpIq1Dh/TWOlLuC3u7TZdmwmFUjdJyzohsj4xmJ/ukicuYQh7iCLZVOWwjQxvqtwQcDPkl8vJd2TsGBZTKCnCKWq9UV0U4+Z+3+fNMinv9VU7XkPWSczCJjkJYOoJt1gSoCT7N6+4f/KT1Rr2g8BzR0/uqdUYOPIIhHsqKI03qShTl3cV0X6JSZIaMM0gXQBRBGf4uAI3nIIfA9av/+PWMHA/dCdWpslNyHnjwLqA+oIBTWhcem5/b4ihgxbu7RK9ws/gI3aeHz7BLnuNVEiVIViyYyEdmDNHjWQyJYNY1N4Wj5sh9RyPa1jBXHPmTNKrWudBl8iZ2U2wmU5ZZjuqTOYnsOumSSb5E= X-Forefront-Antispam-Report: CIP:255.255.255.255; CTRY:; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:AM7PR08MB5494.eurprd08.prod.outlook.com; PTR:; CAT:NONE; SFS:(4636009)(136003)(366004)(39840400004)(396003)(346002)(376002)(8936002)(66476007)(38350700001)(36756003)(5660300002)(6506007)(4326008)(69590400012)(956004)(66556008)(2616005)(478600001)(83380400001)(8676002)(316002)(6512007)(1076003)(186003)(66946007)(16526019)(107886003)(38100700001)(6486002)(6916009)(52116002)(86362001)(2906002)(6666004)(26005); DIR:OUT; SFP:1102; X-MS-Exchange-AntiSpam-MessageData: =?us-ascii?Q?NpTCv+IDUDpnriS9aGZWzSiZlOfIKNUx2+w7hxHN+LDME6a9fvEI5E6GYT65?= =?us-ascii?Q?tmoIkCzDICb2cKdMnrJBX+fHuRJx+2GZyR2ZKRETkcNYI/WwyA5s7xf9Uqec?= =?us-ascii?Q?biJMq0FHMf9r/xflM7lL3VYI2VUNtNnrYgFtwEotzCxSPO4zmyRdqvi4xvSn?= =?us-ascii?Q?KwC9ZOg11fEHz/ahUuW15SLFPNlplEGHrwCAnJEHrf+FuAs6QjAFiknV7qgy?= =?us-ascii?Q?1ifCWAWAPTsEzn6b8dlltQlQYI78krE9F/JkHYzUVLAjTOEXqkXqjyHqJPiC?= =?us-ascii?Q?bY+pvNB1AT6MKp/3JADpMF1eHGPieWl4GkEW1bLxYaj/aQv5Je4cM5uykURQ?= =?us-ascii?Q?WOSHWhUB4egjxtHGUl3t/ELcijhiu47GKChOGFyvfyrZyEUIxdk5REO5AE0g?= =?us-ascii?Q?FF2Xp6J9vt3yVR6NVtGoTrVtm1VYyTntUhjOVXehTx7nYagyUHYlpTHTslX3?= =?us-ascii?Q?shZR3Tb00eV1+dGz28ZIx4y7pnX1dT/T/IE1P8HnyyInsW9+eVEqnSjjk3g4?= =?us-ascii?Q?yjJ9kJP4SuEsOoxe4GMh0a5mq00qnyRPX/9xOf5mlFoA3Afyp4h8huJ/wqrW?= =?us-ascii?Q?1u/SOtMZcnVrp24mvQmA1KfeFUocaG4ehbV/0ffFqzQd8dq4EYIIp0/L/EG0?= =?us-ascii?Q?/NjjYWgLDCGd72wSgkqOSrcTn+Yjw5bCN6fgGHeNB9/9yGvqM1mMWFEkb/Gy?= =?us-ascii?Q?U8Rmrwe2tbabqITJjk5GBo30kdhIfV8BxXtsEkAFaGAvX03QINJ5V+5cVauZ?= =?us-ascii?Q?7Hh+Yaj8Mz+gFq/vDTorPL44GaKYiEziMhKgXJJY0ULlyBai/T36cZgx4ihr?= =?us-ascii?Q?AVd7uBbhnisj2aYNydI1lv6uNmJN5JPfsQHpzez8+YSlUSfsPAtBYvpQLSmy?= =?us-ascii?Q?mUiCTAd2YubnlQfVWlyixrWnCsIwHsfLXoRUMB86lF+2p/vsybEuoWRx3wy8?= =?us-ascii?Q?J3OpCOB98qrAqR1OSL6inxntOSIhn5EqfveIxh/6jimV+jz5b4H1Rrg9BLVF?= =?us-ascii?Q?8+i5XYGLbq5Cd8UXDoFgHj5u1QpCi06MRVkkZFsX3lafirk79U+hheCAdflE?= =?us-ascii?Q?bCPt9QKd0sz83iWuOgAp4S+kWV3hj4npMKh4c42Q6rPlOsveSyKF7XpokBHA?= =?us-ascii?Q?xv5U+2DtxC5V2xcAx4q1jbH1D92HYZJITMyTT8ZMg2U7F5lKR5+uQ2ZtSjUH?= =?us-ascii?Q?YsEUnCiCCKUOrP7emeeVu/9jt6CpZ7joAdUqvTyWRRdUzf/rQ5dRgkTrwyUG?= =?us-ascii?Q?nr2Ich0J3RY72rduOhtVRyYBmiZ+gGyed9pnIGoM1KzpIla14BguUd4EQghB?= =?us-ascii?Q?CmNORxIvN4CMxT07CxfBBdob?= X-OriginatorOrg: virtuozzo.com X-MS-Exchange-CrossTenant-Network-Message-Id: efe8b582-eaba-43df-8b4c-08d8f9b2810e X-MS-Exchange-CrossTenant-AuthSource: AM7PR08MB5494.eurprd08.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 07 Apr 2021 10:47:14.1009 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 0bc7f26d-0264-416e-a6fc-8352af79c58f X-MS-Exchange-CrossTenant-MailboxType: HOSTED X-MS-Exchange-CrossTenant-UserPrincipalName: GUGn9vMYwI78MYxjsJstgpCdqIJz2TV5tDb8lQdDaiEp+Bp8UD1zcnxn0/vpk53UMIpAdzGTTjOXKefO8eZ22bTRiHgEyUHWmJRxn288Xf0= X-MS-Exchange-Transport-CrossTenantHeadersStamped: AM5PR0802MB2452 Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=40.107.21.113; envelope-from=vsementsov@virtuozzo.com; helo=EUR05-VI1-obe.outbound.protection.outlook.com X-Spam_score_int: -27 X-Spam_score: -2.8 X-Spam_bar: -- X-Spam_report: (-2.8 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, MSGID_FROM_MTA_HEADER=0.001, RCVD_IN_DNSWL_LOW=-0.7, RCVD_IN_MSPIKE_H2=-0.001, SPF_HELO_PASS=-0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: pass (identity @virtuozzo.com) Content-Type: text/plain; charset="utf-8" We are going to drop nbd connect thread states for simplicity. This is a step that makes further commit simpler. Note, that yank_* calls moved out of thr->mutex. They shouldn't be related and already called from other places in the file not under the mutex. Signed-off-by: Vladimir Sementsov-Ogievskiy --- block/nbd.c | 20 ++++++++------------ 1 file changed, 8 insertions(+), 12 deletions(-) diff --git a/block/nbd.c b/block/nbd.c index 6729561935..f0319d2256 100644 --- a/block/nbd.c +++ b/block/nbd.c @@ -413,7 +413,6 @@ static void connect_thread_cb(QIOChannelSocket *sioc, i= nt ret, void *opaque) static int coroutine_fn nbd_co_establish_connection(BlockDriverState *bs) { - int ret; BDRVNBDState *s =3D bs->opaque; NBDConnectCB *thr =3D s->connect_thread; =20 @@ -430,10 +429,7 @@ nbd_co_establish_connection(BlockDriverState *bs) thr->state =3D CONNECT_THREAD_NONE; s->sioc =3D thr->sioc; thr->sioc =3D NULL; - yank_register_function(BLOCKDEV_YANK_INSTANCE(bs->node_name), - nbd_yank, bs); - qemu_mutex_unlock(&thr->mutex); - return 0; + goto out; case CONNECT_THREAD_RUNNING: /* Already running, will wait */ break; @@ -459,11 +455,6 @@ nbd_co_establish_connection(BlockDriverState *bs) thr->state =3D CONNECT_THREAD_NONE; s->sioc =3D thr->sioc; thr->sioc =3D NULL; - if (s->sioc) { - yank_register_function(BLOCKDEV_YANK_INSTANCE(bs->node_name), - nbd_yank, bs); - } - ret =3D (s->sioc ? 0 : -1); break; case CONNECT_THREAD_RUNNING: case CONNECT_THREAD_RUNNING_DETACHED: @@ -472,7 +463,6 @@ nbd_co_establish_connection(BlockDriverState *bs) * failed. Still connect thread is executing in background, and its * result may be used for next connection attempt. */ - ret =3D -1; break; =20 case CONNECT_THREAD_NONE: @@ -486,9 +476,15 @@ nbd_co_establish_connection(BlockDriverState *bs) abort(); } =20 +out: qemu_mutex_unlock(&thr->mutex); =20 - return ret; + if (s->sioc) { + yank_register_function(BLOCKDEV_YANK_INSTANCE(bs->node_name), + nbd_yank, bs); + } + + return s->sioc ? 0 : -1; } =20 /* --=20 2.29.2 From nobody Fri Mar 29 14:24:56 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; arc=pass (i=1dmarc=pass fromdomain=virtuozzo.com); dmarc=pass(p=quarantine dis=none) header.from=virtuozzo.com ARC-Seal: i=2; a=rsa-sha256; t=1617793286; cv=pass; d=zohomail.com; s=zohoarc; b=PfV0Zq5U33i6GJGfKDeHGKu9LRuAsfa9MXSwO6XG3UJVdDt4suePCfvAnJNLy77pvQJSqGkQ1GiflEktjNy3DrFG5wFj/UKLrYPNgrKL9SmK92j8PEMxiWThLNf4JOwrtzYBNEqK38vYlpkzX1evyP66tBrdUOB3hWWUd9tNkWw= ARC-Message-Signature: i=2; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1617793286; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=b6SZZHqPsEPW9RvBHOdz4qCMzqv0gizgGhoHY22gZMQ=; b=T//HsH3cU8ckrftDrc7UjqVjnfSRInWOQ0K/bOV1RvbhvGIb0wt/PpIrylLl+WmvIACU0cxyovE315EROOuhM+I7d5I8i5eyk1BLNjjEldCxmk60Lx0hCd4lFclLtq/OVN8a8CGBxWgkq9U5uysNX4sSybY9Zbqf+SrbyoqaXqc= ARC-Authentication-Results: i=2; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; arc=pass (i=1dmarc=pass fromdomain=virtuozzo.com); dmarc=pass header.from= (p=quarantine dis=none) header.from= Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1617793286563795.092768709925; Wed, 7 Apr 2021 04:01:26 -0700 (PDT) Received: from localhost ([::1]:57582 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1lU5w4-00044P-Ks for importer@patchew.org; Wed, 07 Apr 2021 07:01:24 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:58626) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lU5iY-00069y-U9; Wed, 07 Apr 2021 06:47:27 -0400 Received: from mail-vi1eur05on2113.outbound.protection.outlook.com ([40.107.21.113]:20888 helo=EUR05-VI1-obe.outbound.protection.outlook.com) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lU5iX-0001Tc-6j; Wed, 07 Apr 2021 06:47:26 -0400 Received: from AM7PR08MB5494.eurprd08.prod.outlook.com (2603:10a6:20b:dc::15) by AM5PR0802MB2452.eurprd08.prod.outlook.com (2603:10a6:203:9f::21) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.3999.32; Wed, 7 Apr 2021 10:47:15 +0000 Received: from AM7PR08MB5494.eurprd08.prod.outlook.com ([fe80::b403:c1a9:6bb7:133]) by AM7PR08MB5494.eurprd08.prod.outlook.com ([fe80::b403:c1a9:6bb7:133%7]) with mapi id 15.20.4020.017; Wed, 7 Apr 2021 10:47:15 +0000 Received: from localhost.localdomain (185.215.60.206) by HE1PR0902CA0021.eurprd09.prod.outlook.com (2603:10a6:3:e5::31) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4020.17 via Frontend Transport; Wed, 7 Apr 2021 10:47:14 +0000 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=IUsW0Ol/VGj1E+lf+D8luuvP+wCVLq3h/JZZ+nQ1eLWgkhM+oH5TzO8MyX2x/kSKTDOouhlAlL6tY1EvafiiN1O7pH8P4QEEaPEKfL1cSidHIAWWiBnQt0vArmmP01EEznuhHStyrqL9xYp4xDug/uhv7shQlg3oHFRWlF79GpLqsMEfD6v3LWB/ktP7MOnC0LtxF7l+F1I/8CXxDHANJa6CS+zKz9Ng7soP1pYty6ELbdOJ9BwI6i+J+GhLpaY8kHlh6ZsyrpCzgsMqBMZGeMOo0TBKtTS5cUH5XtGUyrnSQ1+kqKShTZ2aOmKKW87sjU74m3h21fgx/eYr3o2XsA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=b6SZZHqPsEPW9RvBHOdz4qCMzqv0gizgGhoHY22gZMQ=; b=cvVcVndwSI5BPU1LINvHgpXbUtIpbkaK6ARPIUc5gp+z3EQLFGsQFpah5R74Be4bPc2cbnkP7QMHWMoE1z1Nk6Jy5RIvEAF+++IxiR0KCMw7j+sGf0mW5Dg/YCN1j4xyI5V+VHuzBjT3JKbrlf4EIA+nh9kZ7WFrDSoXYHU9xqo9ZfDfPEZ8yg3p0YMzoox0G4Mt6+O/g9ZtDKcpOrE5Hl71A/ij/k9qVlbgxQwV2qV1PQYoBh7k0zjh7SzdVWwFyP8mmvGi5Ihn50sRxsB3Egih45ZEtyoTjtjnM3MKGQZIFoyLVU1GXuJvC/JMl3/zFobDSC6ovTuuNSfmG83Tkg== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=virtuozzo.com; dmarc=pass action=none header.from=virtuozzo.com; dkim=pass header.d=virtuozzo.com; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=virtuozzo.com; s=selector2; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=b6SZZHqPsEPW9RvBHOdz4qCMzqv0gizgGhoHY22gZMQ=; b=aBCrJo9RWLxFZBUG2rU7th2FNi5nnN8v5rIXZliJGIrdjzTJNMepOmi3Ep0la5lQpgd0gqDx0XAUUlQuVTab6ASREwB1B/e64oBHSONAXwvMyg/hAQuDPjpQck003bAgv4v2OdNjL5Q0l0GqbCNaASy0CvBKmvaXLsIq0uwafJw= Authentication-Results: nongnu.org; dkim=none (message not signed) header.d=none;nongnu.org; dmarc=none action=none header.from=virtuozzo.com; From: Vladimir Sementsov-Ogievskiy 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 13/14] block/nbd: nbd_co_establish_connection_cancel(): rename wake to do_wake Date: Wed, 7 Apr 2021 13:46:36 +0300 Message-Id: <20210407104637.36033-14-vsementsov@virtuozzo.com> X-Mailer: git-send-email 2.29.2 In-Reply-To: <20210407104637.36033-1-vsementsov@virtuozzo.com> References: <20210407104637.36033-1-vsementsov@virtuozzo.com> Content-Transfer-Encoding: quoted-printable X-Originating-IP: [185.215.60.206] X-ClientProxiedBy: HE1PR0902CA0021.eurprd09.prod.outlook.com (2603:10a6:3:e5::31) To AM7PR08MB5494.eurprd08.prod.outlook.com (2603:10a6:20b:dc::15) MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: a2da6843-5507-44ed-b7e4-08d8f9b281ed X-MS-TrafficTypeDiagnostic: AM5PR0802MB2452: X-MS-Exchange-Transport-Forked: True X-Microsoft-Antispam-PRVS: X-MS-Oob-TLC-OOBClassifiers: OLM:422; X-MS-Exchange-SenderADCheck: 1 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: fAGjf7q+ehbAF28W2iICHVOneuXJc9fLRPNb/JYdbzL3pYOGG51LzyytDvG5mb6qNIPdi7+YP3Ih+eQ8M8SSZ7BaCGpMrDmZxCnnXBlgjKucXZ9N57iAEN8Un+W44iYZ8+CIaCh+VjQmKvOiXWfSE6HGn8HnvfCka8C/lByQwvHtXXLu5JtQT2/GcOoBcu/l6RP8sbUtkkx9jKMqUF0AsRh5X+9kn3GNx2QiBXGsI36qFI/7+QA/5czvkaU2G//1SvcOwLtPaBsT/9wWOmjJRiB0X9ORS8CmBdKRNgZ8K3Nh4+jyY1ZQwFlgo7QqH/ApjVsKS83FZL8C4DruREACfG3lhDWPlfwxMo7tEsGFn0P9LM61rV6jW2fn2aO1d+nkuG1+bRFkir74xt+ahX2Z4hTeePw9FFPOxPlzTE8VPHHsO/SfUNuRRjrK114F4w6LQ5GauydY6FCPqTqUjAHfUjvzub30AzkNYgmlODYdg8NU4AJx4QqlKU/yPua7nK/Vajfx2Usoj/xeGNkLs/iG16e8qdw1PsCnssoFiY6B71zs83nWzSJ9KO1C4VHwkM93gcwoIDY90QoXLuCPIjWcPu/X+/eO/RcCQmcjyfruyKWKQPFbFATTACmhS5frvs0bJhR5k4ERBR67CbSiIygSM86yt1jpQGeDpC9PDS4m6vP/5HUF130aByuHpguF1ke2kb5wnfG8qRqn0vHOrGJD/YizRQNh/tOPOhbbI9Cy/Jo= X-Forefront-Antispam-Report: CIP:255.255.255.255; CTRY:; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:AM7PR08MB5494.eurprd08.prod.outlook.com; PTR:; CAT:NONE; SFS:(4636009)(136003)(366004)(39840400004)(396003)(346002)(376002)(8936002)(66476007)(38350700001)(36756003)(5660300002)(6506007)(4326008)(69590400012)(956004)(66556008)(2616005)(478600001)(83380400001)(8676002)(316002)(6512007)(1076003)(186003)(66946007)(16526019)(107886003)(38100700001)(6486002)(6916009)(52116002)(86362001)(2906002)(6666004)(26005); DIR:OUT; SFP:1102; X-MS-Exchange-AntiSpam-MessageData: =?us-ascii?Q?aYKz/GW/sjVOp6YGAC9ISCS34stfmxTWWeBrrjEEt40YTp56TQs/EBMtvZhS?= =?us-ascii?Q?h5LjMj64soZ+0TZLtyDlVQ7E0AlZCpmIOYAKcxMqA8uka0307gFOoq/C7WjB?= =?us-ascii?Q?ic7Wio/WCVzLUFW4rtgGsa+pUKYnafyB7tesXLOcwP6qoC7Mi0U376xCWwYV?= =?us-ascii?Q?YH9shm2sYbkUUHYj9wPfk4+5Nc0hV11038xHy5wCet84bFywoQKjaury9SBd?= =?us-ascii?Q?y8FzwMg/yLDfREbP5AZbWj0f/QlIwnxBVbwd1QErkC77B+Z+18hrz3u8uT/p?= =?us-ascii?Q?gi3v+oEtrly85x3mlKj9xemphmScntQJsUrurDSAHVzSKi5lpl8/iYDYKNH6?= =?us-ascii?Q?cYD0AVPBveYzpeO/HkomtmTiKF7UCM3PeycpFH+dbH2TSSDvjKgOQvGbayoO?= =?us-ascii?Q?9dr15txHrG1R6OTcc39bv79czmu+nasN08U2WOf60B4vH2AjXbYZXs3pWAAW?= =?us-ascii?Q?/IPHVc3Pwwc0i/L4FB/Zquvxq87iLSHvd2R2DHYIGM+WEmLDezBtCPn0UPUN?= =?us-ascii?Q?Ocmsa0HvG41fMhtA8rHGfuxBXYvhLtRg0pj4QSj9c5tJ1TXtvwLQ2otVm5YZ?= =?us-ascii?Q?khUfltXcfDGfpLg3H3FzRdhukqnZb4sRizw9EX/6D34FBy2X0C81j4jjY+mz?= =?us-ascii?Q?KQcuhMormTVJbwuq5+mLKMIU08HFO5BlkD3EuFTMwIjm8MoeqXsAJB64tQTf?= =?us-ascii?Q?ffXOv44WI7RG30v1YRglqSwsts5qDs3IjtxwwEn8IPQvwNPQt9LiTykTdLeb?= =?us-ascii?Q?1sc8xNeeBq30o0UwX41lxYn0Ga83aHRnUJCm8BF298mno04Ze9BKB5lF3Vqb?= =?us-ascii?Q?jTZkpFhlada29P1rkyu//P3P1Ae/pltEkuTDeP+SIIv1WanMi+PI/L3ppFJX?= =?us-ascii?Q?huEC0tL00xiR/tMW+vQlS3V5++ISzM+5mI98ZKX4NTMhxV81ZBM6BrkZQa57?= =?us-ascii?Q?6YYXLJoMsi1TOyV9IRN0pqq4PtPFIOp/VGHKYAycwwS2zQB7jdhUFUHB2+dr?= =?us-ascii?Q?4A0YVTNCn3//iOPmW33jOFcorlXe8qlZ3+2ceViPsRrRnw47cr/+nsL6j+D0?= =?us-ascii?Q?p/qzL2LF1xw/Q5UWnEp+3OAoalccXis/vjo+OVQ5d+WFYPeAsFLC/+i3BZA9?= =?us-ascii?Q?BOpSvRQQXc4+nmhpOb1hih6A3qCTmnvJI/yqy1DqCz3LYpOoAGppgPK/6F/D?= =?us-ascii?Q?b5GkHeIqjW3o2T4Lnx6TvRM8Xc5PWVBB/S64qwzET2SYGo0GObPAgjndqQLy?= =?us-ascii?Q?xpriybmJKloPZnV2b3IwQ00yujfGzQteNnnYDmDN2UniFtxa0pBJL0sJYPSE?= =?us-ascii?Q?NmfsADdEyoC/ZV7AB+zhc7E8?= X-OriginatorOrg: virtuozzo.com X-MS-Exchange-CrossTenant-Network-Message-Id: a2da6843-5507-44ed-b7e4-08d8f9b281ed X-MS-Exchange-CrossTenant-AuthSource: AM7PR08MB5494.eurprd08.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 07 Apr 2021 10:47:15.4828 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 0bc7f26d-0264-416e-a6fc-8352af79c58f X-MS-Exchange-CrossTenant-MailboxType: HOSTED X-MS-Exchange-CrossTenant-UserPrincipalName: HDARqPbu4zSQVruJw+MpdCfP9gTxpQ7cNeqirSuVf5Zijpgdm6yBRpVTKPAuo14q/LpzH1pP6PYx+nl8VGwisU74P0tx89FnnSh9wzXb2aI= X-MS-Exchange-Transport-CrossTenantHeadersStamped: AM5PR0802MB2452 Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=40.107.21.113; envelope-from=vsementsov@virtuozzo.com; helo=EUR05-VI1-obe.outbound.protection.outlook.com X-Spam_score_int: -27 X-Spam_score: -2.8 X-Spam_bar: -- X-Spam_report: (-2.8 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, MSGID_FROM_MTA_HEADER=0.001, RCVD_IN_DNSWL_LOW=-0.7, RCVD_IN_MSPIKE_H2=-0.001, SPF_HELO_PASS=-0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: pass (identity @virtuozzo.com) Content-Type: text/plain; charset="utf-8" Rename local variable to look like do_free in same function and like do_wake and do_free in connect_thread_cb Signed-off-by: Vladimir Sementsov-Ogievskiy --- block/nbd.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/block/nbd.c b/block/nbd.c index f0319d2256..9cee5b6650 100644 --- a/block/nbd.c +++ b/block/nbd.c @@ -501,7 +501,7 @@ static void nbd_co_establish_connection_cancel(BlockDri= verState *bs, { BDRVNBDState *s =3D bs->opaque; NBDConnectCB *thr =3D s->connect_thread; - bool wake =3D false; + bool do_wake =3D false; bool do_free =3D false; =20 qemu_mutex_lock(&thr->mutex); @@ -510,7 +510,7 @@ static void nbd_co_establish_connection_cancel(BlockDri= verState *bs, /* We can cancel only in running state, when bh is not yet schedul= ed */ if (thr->wait_connect) { thr->wait_connect =3D false; - wake =3D true; + do_wake =3D true; } if (detach) { thr->bs =3D NULL; @@ -528,7 +528,7 @@ static void nbd_co_establish_connection_cancel(BlockDri= verState *bs, s->connect_thread =3D NULL; } =20 - if (wake) { + if (do_wake) { aio_co_wake(s->connection_co); } } --=20 2.29.2 From nobody Fri Mar 29 14:24:56 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; arc=pass (i=1dmarc=pass fromdomain=virtuozzo.com); dmarc=pass(p=quarantine dis=none) header.from=virtuozzo.com ARC-Seal: i=2; a=rsa-sha256; t=1617792849; cv=pass; d=zohomail.com; s=zohoarc; b=b3S+bwTIzmb6/12AuH2S1dxooUsLDHS+12VhqBhSp57q5MEcjfDDRDvGmLobvnvRYB+5D1hQYP1tnvTWFTJ5evfwQ/orwMzRjqT9VnBSQiaFH/5T4G+IX2AVpM/rgOp7o4EHJaBELtn/hpXf96U6POymcRy5jvrDKlUnSqbQZ3Q= ARC-Message-Signature: i=2; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1617792849; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=ItjXYDaY9p08z/8CScazztRd81aDICN76S4ODEnDPDk=; b=QMOUAWKIzKDqFNlVJQXkac/B+9J8JZt+HpQpzOi7CSSRRgv3u9FHWg1rVSeLAng7BASHU1CEeWDJiS4OhevMWmp7bpfDQabtVNxfUIHT7Zl/bGSnegRB9zpHAPQRy+8j2GMAuJ6lNLrUSePo1oTj2QWchskZJFByXsnNmD8A7yc= ARC-Authentication-Results: i=2; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; arc=pass (i=1dmarc=pass fromdomain=virtuozzo.com); dmarc=pass header.from= (p=quarantine dis=none) header.from= Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1617792849381431.7020700563784; Wed, 7 Apr 2021 03:54:09 -0700 (PDT) Received: from localhost ([::1]:39898 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1lU5p2-00051b-7f for importer@patchew.org; Wed, 07 Apr 2021 06:54:08 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:58658) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lU5if-0006CW-6o; Wed, 07 Apr 2021 06:47:39 -0400 Received: from mail-vi1eur05on2113.outbound.protection.outlook.com ([40.107.21.113]:20888 helo=EUR05-VI1-obe.outbound.protection.outlook.com) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lU5iZ-0001Tc-Jx; Wed, 07 Apr 2021 06:47:30 -0400 Received: from AM7PR08MB5494.eurprd08.prod.outlook.com (2603:10a6:20b:dc::15) by AM5PR0802MB2452.eurprd08.prod.outlook.com (2603:10a6:203:9f::21) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.3999.32; Wed, 7 Apr 2021 10:47:16 +0000 Received: from AM7PR08MB5494.eurprd08.prod.outlook.com ([fe80::b403:c1a9:6bb7:133]) by AM7PR08MB5494.eurprd08.prod.outlook.com ([fe80::b403:c1a9:6bb7:133%7]) with mapi id 15.20.4020.017; Wed, 7 Apr 2021 10:47:16 +0000 Received: from localhost.localdomain (185.215.60.206) by HE1PR0902CA0021.eurprd09.prod.outlook.com (2603:10a6:3:e5::31) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4020.17 via Frontend Transport; Wed, 7 Apr 2021 10:47:15 +0000 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=juPSPvTC2JvhMpkTiylewRed+pDUvu3w3mtkmsW7C6UcNFjZtrmqh5S68SFRKo8dyIgap7hmHPtBqluNTFhdlgDFYQNMQ5EJrL4YWTDAVYCi4NVe4hDlVSX1bJQYvJB52/ZOmOP2Lhflm71itn/2CB4HF0v5d7R+UlCkozA0XkCj0qv+rqkasZQcCUXRZcgHMHUiKMNWH8mRZEpv6g+kOlWxlG2plrXGSdp2nbbvmkkWuGA0SpWgxGm1WPsqCdps5td12n9/3w5G51KBdBY8tI5bS3+fexT4n+002P2ZDnWQPGqmxT+t52UhJSL27gYWQHmuZvXGUDZAOHaX25mhFg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=ItjXYDaY9p08z/8CScazztRd81aDICN76S4ODEnDPDk=; b=i3H6kakKqeFdPzwUCH4VMPk6e3PmDln+pRuobkkDPeKOgTBXsp2QGHb+JkygLLERvDUhrrVHOZuhkF8j0m5vk5qkUpxJbhQITyFRl+I9t5T/bsQTWTLhz0sBZHwuPHg5asy7VWuaa3Oyk4w9vYcarBl0mnfqo0qFnE1PyNDlNIZ+Pw1z7G0jXd0SRVEhGYo8ig5f0pAZDiHWmslrgEGaGUxLB/xc23qdtHMmHCzuSngulcqMh/5PEwRn1NyHziPCvLUoRXYjymeqhHHbL5bOy+ug50CNvyUIl0x519pcRxYblY9X1NUx5Zf218wEJPwIL+QequC1XBwjrOAuT2o1cg== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=virtuozzo.com; dmarc=pass action=none header.from=virtuozzo.com; dkim=pass header.d=virtuozzo.com; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=virtuozzo.com; s=selector2; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=ItjXYDaY9p08z/8CScazztRd81aDICN76S4ODEnDPDk=; b=Zg6o+9+Ktpynmw8VSRf0qB9IigB/Ko9Yxc42/GYXMRyRjzBZL20iyl2EYlEtBlNa1QWBkmUTVD9zsqiGlK3QNRcGIAMHh9yd8BbwdveegOGELBCNxAWJ/eE2BagHiUCVR7sWaNuWAUN8rjmUKuWetTszkCjy+Ah/1gPGdTb2EKc= Authentication-Results: nongnu.org; dkim=none (message not signed) header.d=none;nongnu.org; dmarc=none action=none header.from=virtuozzo.com; From: Vladimir Sementsov-Ogievskiy 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 14/14] block/nbd: drop thr->state Date: Wed, 7 Apr 2021 13:46:37 +0300 Message-Id: <20210407104637.36033-15-vsementsov@virtuozzo.com> X-Mailer: git-send-email 2.29.2 In-Reply-To: <20210407104637.36033-1-vsementsov@virtuozzo.com> References: <20210407104637.36033-1-vsementsov@virtuozzo.com> Content-Transfer-Encoding: quoted-printable X-Originating-IP: [185.215.60.206] X-ClientProxiedBy: HE1PR0902CA0021.eurprd09.prod.outlook.com (2603:10a6:3:e5::31) To AM7PR08MB5494.eurprd08.prod.outlook.com (2603:10a6:20b:dc::15) MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: f1c9113a-562f-4399-2191-08d8f9b282c0 X-MS-TrafficTypeDiagnostic: AM5PR0802MB2452: X-MS-Exchange-Transport-Forked: True X-Microsoft-Antispam-PRVS: X-MS-Oob-TLC-OOBClassifiers: OLM:6108; X-MS-Exchange-SenderADCheck: 1 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: w1ac+tXxNyqA01nkNfsSLj1WnzGh6d4e0uFXZ7fU1xj0M48Wvqferf5F7LJuQP2ww8EdZUMdiskbXqdKrGwRuPphRxYRWj3fxR6a2Gsi7tJdY1pvuxIVM8QiSrA6LHq0p51MWNPftzOBmASxm98+MeGxlW84xmbbl4v2cQRbKAQap9GiwAZsHnzHjUUnS0mJjVLxOUJVaYM9IUaKHyQLpgDkB1q9rt7WRu2vgi/oJKEc85jrzuwl+tTe3YeFwCS+NbaSDIhSR7sVW8TgZUbfkvmEBnLOD0pJym2c/zzPpNjxtaEUJejd3Nyp16oWIWHRtvqyAwuX2EsEd8vvk7mnb/W6dLhjMwkpENSLkQCFyipCp6zgeIFzEuyP80ARKB+0XdocxZ6pCsQSBoWll+kOxVLO1rWm4OeTdfPxwJ6w4HPhpKays3mv4YBQBDNe3MrV9IXLfCFx9IlF7K4lj8hcc6bD6k4bno2j1+95xGT0fFnHvGJRy6OT+PQyOB2Q2+9yYR1vaxYF/CiNnvu6DNfFM+S0qQEm6/pVuQXyu1CdGGNOcHs6c1t/+yo0hBHJAzsXWDbiI8eukiwFDxnSoeKHQBQQncRNYf7tI9Rz780O1gOO8OetPLY2iI0Uo6uvbgejAPCObylOkxExHHQHgdPFuvfP9/c9oAeQ/b+bugQqHxN5f4laAP3Adr062A2GTqczcvuSNfIUnWXG+k9+HoPSEw== X-Forefront-Antispam-Report: CIP:255.255.255.255; CTRY:; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:AM7PR08MB5494.eurprd08.prod.outlook.com; PTR:; CAT:NONE; SFS:(4636009)(136003)(366004)(39840400004)(396003)(346002)(376002)(8936002)(66476007)(38350700001)(36756003)(5660300002)(6506007)(4326008)(69590400012)(956004)(66556008)(2616005)(478600001)(83380400001)(8676002)(316002)(6512007)(1076003)(186003)(66946007)(16526019)(107886003)(38100700001)(6486002)(6916009)(52116002)(86362001)(2906002)(6666004)(26005); DIR:OUT; SFP:1102; X-MS-Exchange-AntiSpam-MessageData: =?us-ascii?Q?Ag8puDnjotGcL14155zcxDDbZNN+IHNsnsoCfCrjkpL1MSBmU4SxdgZa7yaU?= =?us-ascii?Q?G8JKtb/Q323bZ39EI/ubQz1zTxQbGfw3VShhJOrkvzSgIr9E708BMc120Ihv?= =?us-ascii?Q?gRaBs56LtUVIixlFVlhvyekwzZEhV71pfXHlSAF9pRUxavagnT9gbp2jsQGo?= =?us-ascii?Q?hPCQxSRUX6zAfk5pbc3K8eJEjBM4r+7ktVK9MkkiwHws4Cdo4/Izv3mMKV1X?= =?us-ascii?Q?ZOX7lq6czAqzBxTVI5v5s5aHCCwf2DyMoOgygJpK5NLpTno8cbHplT6hfumf?= =?us-ascii?Q?taG8zDNx7gD4VMo7qfe7YwcJ0zYTq1bLvQXVbCGvHtWNIP2zsE3i2VK/8FAd?= =?us-ascii?Q?gfTcx9NPkVKMNbWYuvDZjR+L9ThDOeQHSLgWzOa7zlWlZ68qN0FWz+QDIEHI?= =?us-ascii?Q?AB/5TzG7Su0lSqdFzxA6SndARWjU21vD0bU7jWYMrUI7VyHLQCNbAcqj61vN?= =?us-ascii?Q?4S4ms7lfCvy8umzd4mMG2xP/Xe3Rs7J/iSB5tgi7gAlQHimuqq1MaAlUOuE0?= =?us-ascii?Q?6aOA42a9bqqyxizOL2l1K1gJtp7gOPEwWXxCYoW+WI0dNoBUHR13HbkIELHa?= =?us-ascii?Q?EP0SGC1n2JiSJQG8oZPz451h1fr5X7pb/JYuOw7GXCbzwcaHDbLU0ImcsxwW?= =?us-ascii?Q?9ZShL6OJv00g9wE7D+z+f9dUSJg2YzGkMP//PBmzGC9+pgc3iHVu279ER13P?= =?us-ascii?Q?BicLCCTapfTvOaqFrix/nK9BZiG885BDZlXRMbqqmeLQ0n6PLONahFOZWkwQ?= =?us-ascii?Q?2wKO0aE4rqexKnD34EBQfjw32egDt8rFYir8HvGRo/KCbgcd9iBgM4c3W/EB?= =?us-ascii?Q?mnoidkmhlpOg1W16MVG1BkSPWsVIUlYw4rXVmldMijWRGvdV6M0hlfn78Jne?= =?us-ascii?Q?NWTWmQq8f6TJoQhvUgucn5a2RhfjLcyb1Q3U4uHmel6NEBJyVZlUMsI/j0JM?= =?us-ascii?Q?WCH0fmzzvMqp+vU1BToMloRwmi33Dqq6wuYWm82J8CDeHX30k1Mb3U/a6H3o?= =?us-ascii?Q?B5ZwOH9xg7pNfVfrqzgGIk64+TWndFbMj17Qlest0KRE42qE5JbQPIQKN+KH?= =?us-ascii?Q?wDendFkr0IpQ8I0yR/ORRkgL8D3xhoto/HWRQpI1dzo/wjGFfHH4tqBJAiSU?= =?us-ascii?Q?EIqg7Z181x0kv8ujO29pIMYgaUwxN5A+AlLJqmNe5Fet2BTzOV9QPrchWgDD?= =?us-ascii?Q?r7nzxU8Yzvollu8UCj4U7qNBsaXCSJS+tzr60jp77adrKyv4JUb79/NuEuim?= =?us-ascii?Q?adSM2OXBPXKpK1oOGptO8tojgz8ezK9oRCbP+MGDfkIXAw/qXhOilYbor7nx?= =?us-ascii?Q?krf9SHtZQZSNKRipoohBfZ5C?= X-OriginatorOrg: virtuozzo.com X-MS-Exchange-CrossTenant-Network-Message-Id: f1c9113a-562f-4399-2191-08d8f9b282c0 X-MS-Exchange-CrossTenant-AuthSource: AM7PR08MB5494.eurprd08.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 07 Apr 2021 10:47:16.8260 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 0bc7f26d-0264-416e-a6fc-8352af79c58f X-MS-Exchange-CrossTenant-MailboxType: HOSTED X-MS-Exchange-CrossTenant-UserPrincipalName: McEvIQPI/VXjFX0BXvOZYcjiXn96WD7zwq+awkrKuxc8KleJlh1eestUwc45Df16FKebc8SF1/KPfG9ogHWMxRrEXdl//qbeDW8RT0ltJB8= X-MS-Exchange-Transport-CrossTenantHeadersStamped: AM5PR0802MB2452 Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=40.107.21.113; envelope-from=vsementsov@virtuozzo.com; helo=EUR05-VI1-obe.outbound.protection.outlook.com X-Spam_score_int: -27 X-Spam_score: -2.8 X-Spam_bar: -- X-Spam_report: (-2.8 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, MSGID_FROM_MTA_HEADER=0.001, RCVD_IN_DNSWL_LOW=-0.7, RCVD_IN_MSPIKE_H2=-0.001, SPF_HELO_PASS=-0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: pass (identity @virtuozzo.com) Content-Type: text/plain; charset="utf-8" thr->state variable mostly duplicates information that is already obvious from the other fields: thr->bs=3DNULL means DETACHED, thr->sioc!=3DNULL means SUCCESS. The only bit of information we need is "is thread running now or not". So, drop state and add simple boolean instead. It simplifies the logic a lot. Signed-off-by: Vladimir Sementsov-Ogievskiy --- block/nbd.c | 122 +++++++++++++++------------------------------------- 1 file changed, 34 insertions(+), 88 deletions(-) diff --git a/block/nbd.c b/block/nbd.c index 9cee5b6650..5320a359f6 100644 --- a/block/nbd.c +++ b/block/nbd.c @@ -66,31 +66,16 @@ typedef enum NBDClientState { NBD_CLIENT_QUIT } NBDClientState; =20 -typedef enum NBDConnectThreadState { - /* No thread, no pending results */ - CONNECT_THREAD_NONE, - - /* Thread is running, no results for now */ - CONNECT_THREAD_RUNNING, - +typedef struct NBDConnectCB { /* - * Thread is running, but requestor exited. Thread should close - * the new socket and free the connect state on exit. + * Result of last attempt. Set in connect_thread_cb() on success. Sho= uld be + * set to NULL before starting the thread. */ - CONNECT_THREAD_RUNNING_DETACHED, - - /* Thread finished, results are stored in a state */ - CONNECT_THREAD_FAIL, - CONNECT_THREAD_SUCCESS -} NBDConnectThreadState; - -typedef struct NBDConnectCB { - /* Result of last attempt. Valid in FAIL and SUCCESS states. */ QIOChannelSocket *sioc; =20 QemuMutex mutex; /* All further fields are protected by mutex */ - NBDConnectThreadState state; /* current state of the thread */ + bool running; /* thread is running now */ =20 /* Link to NBD BDS. If NULL thread is detached, BDS is probably closed= . */ BlockDriverState *bs; @@ -354,10 +339,7 @@ static void nbd_init_connect_thread(BlockDriverState *= bs) =20 s->connect_thread =3D g_new(NBDConnectCB, 1); =20 - *s->connect_thread =3D (NBDConnectCB) { - .state =3D CONNECT_THREAD_NONE, - .bs =3D bs, - }; + *s->connect_thread =3D (NBDConnectCB) { .bs =3D bs }; =20 qemu_mutex_init(&s->connect_thread->mutex); } @@ -374,22 +356,21 @@ static void connect_thread_cb(QIOChannelSocket *sioc,= int ret, void *opaque) bool do_wake =3D false; BDRVNBDState *s =3D thr->bs ? thr->bs->opaque : NULL; =20 + /* We are in context of connect thread ! */ + qemu_mutex_lock(&thr->mutex); =20 + assert(thr->running); + assert(thr->sioc =3D=3D NULL); + assert(thr->bs || !thr->wait_connect); + + thr->running =3D false; thr->sioc =3D sioc; =20 - switch (thr->state) { - case CONNECT_THREAD_RUNNING: - thr->state =3D ret < 0 ? CONNECT_THREAD_FAIL : CONNECT_THREAD_SUCC= ESS; - do_wake =3D thr->wait_connect; - thr->wait_connect =3D false; - break; - case CONNECT_THREAD_RUNNING_DETACHED: - do_free =3D true; - break; - default: - abort(); - } + do_wake =3D thr->wait_connect; + thr->wait_connect =3D false; + + do_free =3D !thr->bs; /* detached */ =20 qemu_mutex_unlock(&thr->mutex); =20 @@ -416,25 +397,21 @@ nbd_co_establish_connection(BlockDriverState *bs) BDRVNBDState *s =3D bs->opaque; NBDConnectCB *thr =3D s->connect_thread; =20 + assert(!s->sioc); + qemu_mutex_lock(&thr->mutex); =20 - switch (thr->state) { - case CONNECT_THREAD_FAIL: - case CONNECT_THREAD_NONE: - thr->state =3D CONNECT_THREAD_RUNNING; - nbd_connect_thread_start(s->saddr, connect_thread_cb, thr); - break; - case CONNECT_THREAD_SUCCESS: + if (thr->sioc) { /* Previous attempt finally succeeded in background */ - thr->state =3D CONNECT_THREAD_NONE; + assert(!thr->running); s->sioc =3D thr->sioc; thr->sioc =3D NULL; goto out; - case CONNECT_THREAD_RUNNING: - /* Already running, will wait */ - break; - default: - abort(); + } + + if (!thr->running) { + thr->running =3D true; + nbd_connect_thread_start(s->saddr, connect_thread_cb, thr); } =20 thr->wait_connect =3D true; @@ -449,32 +426,8 @@ nbd_co_establish_connection(BlockDriverState *bs) =20 qemu_mutex_lock(&thr->mutex); =20 - switch (thr->state) { - case CONNECT_THREAD_SUCCESS: - case CONNECT_THREAD_FAIL: - thr->state =3D CONNECT_THREAD_NONE; - s->sioc =3D thr->sioc; - thr->sioc =3D NULL; - break; - case CONNECT_THREAD_RUNNING: - case CONNECT_THREAD_RUNNING_DETACHED: - /* - * Obviously, drained section wants to start. Report the attempt as - * failed. Still connect thread is executing in background, and its - * result may be used for next connection attempt. - */ - break; - - case CONNECT_THREAD_NONE: - /* - * Impossible. We've seen this thread running. So it should be - * running or at least give some results. - */ - abort(); - - default: - abort(); - } + s->sioc =3D thr->sioc; + thr->sioc =3D NULL; =20 out: qemu_mutex_unlock(&thr->mutex); @@ -506,26 +459,19 @@ static void nbd_co_establish_connection_cancel(BlockD= riverState *bs, =20 qemu_mutex_lock(&thr->mutex); =20 - if (thr->state =3D=3D CONNECT_THREAD_RUNNING) { - /* We can cancel only in running state, when bh is not yet schedul= ed */ - if (thr->wait_connect) { - thr->wait_connect =3D false; - do_wake =3D true; - } - if (detach) { - thr->bs =3D NULL; - thr->state =3D CONNECT_THREAD_RUNNING_DETACHED; - s->connect_thread =3D NULL; - } - } else if (detach) { - do_free =3D true; + do_wake =3D thr->wait_connect; + thr->wait_connect =3D false; + + if (detach) { + s->connect_thread =3D NULL; + thr->bs =3D NULL; + do_free =3D !thr->running; } =20 qemu_mutex_unlock(&thr->mutex); =20 if (do_free) { g_free(thr); - s->connect_thread =3D NULL; } =20 if (do_wake) { --=20 2.29.2