From nobody Tue Nov 18 07:47:45 2025 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=1608578716; cv=pass; d=zohomail.com; s=zohoarc; b=II/J5g0h8bOqZL9Brj4D0zTmgAcnYOYeYs0gR4zmJQLuMBs3fDO/M1Ir6QAQ3TZilJwBRnALqhqfe/jBAnJoz750r/CVehIUEN1OeSPn/QfWUwo7F5a6+Cv2LkctENujRm4+JfQKq2v+vGaBXkeMUmz6KG2NDCWOJoPRcl09jxI= ARC-Message-Signature: i=2; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1608578716; 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=rYnYK1rhKbb1nmCht/dH9JdBbD8apwG2lFWK908cppk=; b=IRGD9quHeMj2EGeNYhm0rkUWcNDN2bE8MCIPSvREnzP1wxxJhQGrrDwHYS1su9HDNHq4C5BwyytZZrO70howjz9glXzoneXFvXHVlf0i890wwZCkGj2hB4Nn0C63ZZGei/FL7cN7zKqPtBS/rn7Y9eRVUk4Jd0LD0x6EAufLgMs= 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 1608578716602555.9028959463494; Mon, 21 Dec 2020 11:25:16 -0800 (PST) Received: from localhost ([::1]:55508 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1krQbA-00065q-Hv for importer@patchew.org; Mon, 21 Dec 2020 14:12:00 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:50298) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1krQWD-0003Ew-7h for qemu-devel@nongnu.org; Mon, 21 Dec 2020 14:06:57 -0500 Received: from mail-eopbgr20090.outbound.protection.outlook.com ([40.107.2.90]:62614 helo=EUR02-VE1-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 1krQW4-0006a3-I5 for qemu-devel@nongnu.org; Mon, 21 Dec 2020 14:06:50 -0500 Received: from AM7PR08MB5494.eurprd08.prod.outlook.com (2603:10a6:20b:dc::15) by AM5PR0801MB1652.eurprd08.prod.outlook.com (2603:10a6:203:3c::21) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.3676.30; Mon, 21 Dec 2020 19:06:32 +0000 Received: from AM7PR08MB5494.eurprd08.prod.outlook.com ([fe80::d585:99a4:d7a4:d478]) by AM7PR08MB5494.eurprd08.prod.outlook.com ([fe80::d585:99a4:d7a4:d478%4]) with mapi id 15.20.3676.033; Mon, 21 Dec 2020 19:06:32 +0000 Received: from kvm.sw.ru (185.215.60.92) by AM0PR02CA0173.eurprd02.prod.outlook.com (2603:10a6:20b:28e::10) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.3676.28 via Frontend Transport; Mon, 21 Dec 2020 19:06:30 +0000 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=H3UyMRPB2gGaxDhELOHTjN8f32hm/VH8AXy3uAiYZBc0xVKMD6Aj0Q5IKAgEOSkMcGOYaOP7XSUtgocq616cbtF0Ne1Z7Oj5McsA3ru2RBNtPP2tVkctnXCRFVidN/KxCVlvfI5lgTu7CVFVbivc7c4mUNCctt18/pQdtTySiLO9I5JNEWtaQF3nyl4ULDeCXms/KfSOM4IeijOgsBoP80YiyVlH3hry65rzEch/oyRtJND1cMidIQSNP24rS99qf+SOpE/KzuPR1xVjO3dOoLZV6sHf2asZYvQHC04/hmLKcqwyLX49Y08ELKQV+z1+nYk6LdLXgXNF5bDKEGFEmw== 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=rYnYK1rhKbb1nmCht/dH9JdBbD8apwG2lFWK908cppk=; b=EfUa+8NyLFMH5vrbo9jL4UiAU2Pi9cC5y9+0XVgoBbUj43EMJa7yNvkKUI/OzogFda2o6d16myu4fpJfJ6peagBkF8tESnhgyLk6JAJtUmdSmoz0yqAcfa8nP5EyNM80/5U97E4iBh1HM/uZpk2EXsEP5WMgwUUD8Wkeg3R4cCXSLWLuuy+zDCM3ZLq19ZlExo/2ydx3BoKdTXpPS82FmU6FOiwstGqErTFKpzeS80be1CkrgBm8pP30M4LiJa7e9RwcJv8CKYBNKhnxwnW0KI754K9vLRDJFqDwNqqeBy22zAvijdEQTHosLPnnCK+5bmJnNzEMJC+H6sNhh2Zt7w== 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=rYnYK1rhKbb1nmCht/dH9JdBbD8apwG2lFWK908cppk=; b=pZflAj1o8ccGKZW+CexJ0QiWVc4lBCpqahb2z+PnQTOYBewdYV7ZE2a918sHAOh4OcU1uxUNvZsiJIrcU9/jMtTIOiRfGS4/Db6eC6AxVKNXasc5l7w0csDa9Xtr6l1X0KmOczns0Y4fkobEQEoTFn/sZHSSsMfJReWMcPVFg6k= 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-devel@nongnu.org Subject: [PATCH 1/5] net/tap: fix net_init_tap(): set ret on failure path Date: Mon, 21 Dec 2020 22:06:05 +0300 Message-Id: <20201221190609.93768-2-vsementsov@virtuozzo.com> X-Mailer: git-send-email 2.26.2 In-Reply-To: <20201221190609.93768-1-vsementsov@virtuozzo.com> References: <20201221190609.93768-1-vsementsov@virtuozzo.com> Content-Transfer-Encoding: quoted-printable X-Originating-IP: [185.215.60.92] X-ClientProxiedBy: AM0PR02CA0173.eurprd02.prod.outlook.com (2603:10a6:20b:28e::10) 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: 184a6583-f293-4973-a249-08d8a5e387cb X-MS-TrafficTypeDiagnostic: AM5PR0801MB1652: X-MS-Exchange-Transport-Forked: True X-Microsoft-Antispam-PRVS: X-MS-Oob-TLC-OOBClassifiers: OLM:381; X-MS-Exchange-SenderADCheck: 1 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: bH2PQrqcsEzE96cc77Dq93sI2yDIdi5b5IXpVGZjhZMoSWINnTrVAygI3RDklSeK4QIZKu/fUTdol6LA7zqhBZK1OHD5RhhCBZ3XA+6Ogd0qtYTEBzC3Ibj/a35V8nAk+fel75I61ZYB3zC8fT8akrhmHrIkTiF/YMtk40rc5i96PtlWU1nBbT+J1lK9DMfH/8hXvGUt+1kSyzKoNuAfrV+KFci5u4lf7ppCAhZfsxaYiiMIL0TDuMkxmVo/oF5lzDm7IMa3SvtTnOANDqw8bEMHiY/D4PwyOa7dFPUSK6VxIdXRMcX26zhnnoF1n8oGKxhSzFYJKyQY0pwy60MYb0SjUotaQnBPN25Se4oFfQZXIIVEVECXFNw3x1/YpSKfgc2dzmU6hNWltQBfUUkN1Q== 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)(346002)(39840400004)(396003)(136003)(366004)(376002)(478600001)(186003)(16526019)(6506007)(6486002)(8936002)(8676002)(4744005)(26005)(2616005)(956004)(1076003)(86362001)(5660300002)(4326008)(66476007)(66556008)(66946007)(107886003)(6512007)(52116002)(2906002)(6916009)(6666004)(83380400001)(36756003)(316002); DIR:OUT; SFP:1102; X-MS-Exchange-AntiSpam-MessageData: =?us-ascii?Q?FWLWVYAOq6FxHC4LGKIbQC6D4g8pRjuMcPaHgfqzqkHtGGKzubSUt6SE5U3Y?= =?us-ascii?Q?xG0uIo3lI+ppMRJFVHxRtnvD3IdFVez+CaMXfwo52QX7L/JPEm/jZiYXzJti?= =?us-ascii?Q?BrqeDYnpI+sYctWGB5UpGm/iiBkcwtg0kMd+KKk+Z/JyPxKwABN02ADmkalT?= =?us-ascii?Q?jHkYePybI25pgEnLNtRYmIAkNMjTwESHTT23l3+eZu6haF/CDN7hHydtLWit?= =?us-ascii?Q?BwzYFy/wJjK8jU1xCQyalZHC6CqKb4fW7M3/0cS8+E4fi9IeuL5ektQEsf6w?= =?us-ascii?Q?qbCOmTc5nkR8e+367rgEmyxNAQbdtRhvONnzqO3Kydxe1V8PYNa5jkuhWiXy?= =?us-ascii?Q?I4b93XSDd+LN71dAVI2eTWT25symutxYRc1Vejf3mkKCw8lhe7PBa7+Vc4KN?= =?us-ascii?Q?mQttzKzJ92Qy7uIsYIEDz7Lh1JkXcjXJc0mx0V0c+TIuq64QkFMD5BauPByS?= =?us-ascii?Q?AdLl2l4Qp7cDhB5hkLBkLnUhvZIWyxVJbVB1/cN7nVeu8twcOypOtDipL1y+?= =?us-ascii?Q?R2uAh5TXic0SpSIjgAIqHUZ+T9UUGAYWM0UziZdUD8MoNnyGzhC5kbkUYxoU?= =?us-ascii?Q?6pE+2gUoIgKZAY1Jx0hpjmO/Zl1xMpUAV0QYLuo6gzRR+yoxQGRPMvsCooEt?= =?us-ascii?Q?jajO5oyy854k6YWbdNZeQmibexg0Yyyv9uRpT9o/761dCkjuk2fMC+ePZRCc?= =?us-ascii?Q?WuPFPAcSeKWUFx54GhVNwvqtUn/mV5ljmrTtYP2tjF6RarPDSwzNhDWV8qpK?= =?us-ascii?Q?kEnndwNNWrz6U2K6Mz0sjZ8RvByVPnQ17483f2iya1ktoxVpmDHPPMfI4cBv?= =?us-ascii?Q?TJsebGWNB1PzL0O7J2h5yPLTtVg7erhVvxwJrrS4e0OD5RUU/uZ2wunCmSDd?= =?us-ascii?Q?A9IPJ1KetJURTM7XVHyE3Afk0nn6sUpFAiZsf5/z2Ahe4OXVn3fQ/TkB7hw4?= =?us-ascii?Q?mdxlYjRkzC3lxeFELgE+UbTI7pr9NogArmKS77NxtfZGs33ktEv7oJbmb2Ue?= =?us-ascii?Q?QET/?= X-OriginatorOrg: virtuozzo.com X-MS-Exchange-CrossTenant-AuthSource: AM7PR08MB5494.eurprd08.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 21 Dec 2020 19:06:32.6507 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 0bc7f26d-0264-416e-a6fc-8352af79c58f X-MS-Exchange-CrossTenant-Network-Message-Id: 184a6583-f293-4973-a249-08d8a5e387cb X-MS-Exchange-CrossTenant-MailboxType: HOSTED X-MS-Exchange-CrossTenant-UserPrincipalName: s6v5tS0ZYVSpkGVo9EEYTJmE8emCgDHO8OmnZWisrFuLxaqVA6HOXzW5SIZacgOgsnO/5mJSD0daTuhJRGqKDA2DjgUMw8rQfZxdlV7YKP8= X-MS-Exchange-Transport-CrossTenantHeadersStamped: AM5PR0801MB1652 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.2.90; envelope-from=vsementsov@virtuozzo.com; helo=EUR02-VE1-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: , Cc: den@openvz.org, jasowang@redhat.com, vsementsov@virtuozzo.com 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 should set ret to -1 on this failure path. Signed-off-by: Vladimir Sementsov-Ogievskiy --- net/tap.c | 1 + 1 file changed, 1 insertion(+) diff --git a/net/tap.c b/net/tap.c index b7512853f4..75b01d54ee 100644 --- a/net/tap.c +++ b/net/tap.c @@ -880,6 +880,7 @@ int net_init_tap(const Netdev *netdev, const char *name, if (i =3D=3D 0) { vnet_hdr =3D tap_probe_vnet_hdr(fd, errp); if (vnet_hdr < 0) { + ret =3D -1; goto free_fail; } } else if (vnet_hdr !=3D tap_probe_vnet_hdr(fd, NULL)) { --=20 2.28.0 From nobody Tue Nov 18 07:47:45 2025 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=1608579668; cv=pass; d=zohomail.com; s=zohoarc; b=NSHgv9uolNoZjSjy7LaJ3RSwwqXIpBCi/of8zF0K1Um1y5mlA9XwGaZXNXdLqdbir3Vn5mP0fx6fDDoynE1YAf5F0NKqxH3xudt8vSmXZfhu4mAY6tL6udg+dKt78Efvrd8z1OZqRQFulqBrIoTUdYQ4biMLb7xmfNODkxMLNMk= ARC-Message-Signature: i=2; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1608579668; 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=fg0DK8g1BSz/mJ4JBoyD8PyCT795P6OfRoaEr/iy7CU=; b=S+RxjQTVIMD8+HBQG5wGoYURi5sR/uLPtP9EZcGuI6oGup0fHqdu78u+pgUQGZVt0iLCueUnc+0qLios1RWZYA6dg7qgglUVNpHwndeBtabY0l8r0v+cN1Vn5KBQjOt7DVDUg/jKJauI2O17Kl7v9qCdiqSLaSmKbUkIwL7x8xM= 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 16085796689471010.5446692253311; Mon, 21 Dec 2020 11:41:08 -0800 (PST) Received: from localhost ([::1]:51216 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1krQY8-0004BI-9d for importer@patchew.org; Mon, 21 Dec 2020 14:08:52 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:50334) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1krQWK-0003FE-LD for qemu-devel@nongnu.org; Mon, 21 Dec 2020 14:07:00 -0500 Received: from mail-eopbgr20090.outbound.protection.outlook.com ([40.107.2.90]:62614 helo=EUR02-VE1-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 1krQWG-0006a3-PV for qemu-devel@nongnu.org; Mon, 21 Dec 2020 14:07:00 -0500 Received: from AM7PR08MB5494.eurprd08.prod.outlook.com (2603:10a6:20b:dc::15) by AM5PR0801MB1652.eurprd08.prod.outlook.com (2603:10a6:203:3c::21) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.3676.30; Mon, 21 Dec 2020 19:06:33 +0000 Received: from AM7PR08MB5494.eurprd08.prod.outlook.com ([fe80::d585:99a4:d7a4:d478]) by AM7PR08MB5494.eurprd08.prod.outlook.com ([fe80::d585:99a4:d7a4:d478%4]) with mapi id 15.20.3676.033; Mon, 21 Dec 2020 19:06:33 +0000 Received: from kvm.sw.ru (185.215.60.92) by AM0PR02CA0173.eurprd02.prod.outlook.com (2603:10a6:20b:28e::10) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.3676.28 via Frontend Transport; Mon, 21 Dec 2020 19:06:32 +0000 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=jRJKBVYDTuoXEkKJwO8rXSd4dtJ3VkFn3KfEt3B3iBmZtqWA2HqrdAfANVSoxgynMIozBM73FcAK/4hBQb7ha7IkWcwO0qJu5bfaMb7iB1+FrqKzb2BjzP18UOY51q02dUkpCns/LcQX8wFFptynDkJ14XDrooA3YSDOzY0iDTO7UO5zLQ23l1waQW4xPg6kKchoVX+J3FOGtIiV4MIP7/B2WnhSGn2t5DcDpeTizpO9JUsDq0ymmvWkh/JMSEhoI3PnRLPsezVK2R+i2agN0Gp6UQ2j2pq3ifXP0WAhwDu57zqQTIUKMB3RXzrTL1FtDUXEjNnWcn4Jd94/7crDiw== 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=fg0DK8g1BSz/mJ4JBoyD8PyCT795P6OfRoaEr/iy7CU=; b=cZ2Uwvb46DAc5wkIVlR/9rqbcFqvSXhA1AfWd1I1PGjtT7+M1ASTx3lIVnuHag42YvxLr6a/bjurpyR3/tMoWsgE/JTk9zI2GnVs2I1VfRK3FmIM26vLVjOSTlO/omwjHoHITtCQJ4U4U1OiQKmNMK0w5R53vBmaLwrsqos0FkG8dAyQEkbbJ83rIOVwn2YcWSgevLEXjSb9/qFPanx8Pv3oNa2b6VFqMuR24tsicZgCRj4aS79KFpQLNk6UDkdA6MQEQepWnSqlOT5HjLoYG0sjltM7ZuVNalEGLtjH+w3NcXlL3t3us7ukFwwnO/jKTP2kyHe7kbc2K/LFQzVUVg== 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=fg0DK8g1BSz/mJ4JBoyD8PyCT795P6OfRoaEr/iy7CU=; b=eOF4OMUas0OdvKUczipIZ2yqET3mqJrahSvu6JVUHWYzgx1NRKNZpFcAhsFNzX4wN/za6fVMmmHx6yxsT5wky70YpuwcTyS2PmGeLuJNcv9i2y6fg7/zqQ+uRSuSAhSo7LJTvkhWyUmADWVEnBkGBJsvwElqfl6B133c5aiSVgQ= 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-devel@nongnu.org Subject: [PATCH 2/5] net/tap: drop duplicated tap stubs Date: Mon, 21 Dec 2020 22:06:06 +0300 Message-Id: <20201221190609.93768-3-vsementsov@virtuozzo.com> X-Mailer: git-send-email 2.26.2 In-Reply-To: <20201221190609.93768-1-vsementsov@virtuozzo.com> References: <20201221190609.93768-1-vsementsov@virtuozzo.com> Content-Transfer-Encoding: quoted-printable X-Originating-IP: [185.215.60.92] X-ClientProxiedBy: AM0PR02CA0173.eurprd02.prod.outlook.com (2603:10a6:20b:28e::10) 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: d08a3afd-de59-4a02-c5dd-08d8a5e38821 X-MS-TrafficTypeDiagnostic: AM5PR0801MB1652: 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: 4fg50n4vEhYjdolUVvXINThaf30k7tTR4k+dZZZDS5Mx3DUVXMPpRoF1DGFDQZiQsVIxkaXtzv9fKNkndOEbRPZ/abZWdrS+wTKP7YrJtpVT8F5V4dr3P4RXirH16RR63/xtzZmft2JW5z2Mh4CSZfj0O2oqiOTSSkOnajp3b1mGWqT3RTl4rhDdLPIs85/PsZGTsPWr2LtjsAA7LsWV4L+pQufnV3+UKmMmHzgdFqnL7GUqe9meZJpEzZ+YCwfxoSS0EWuRq+OU1sjInAJ6bVWFCr/b9r6z77XLxxPASnTyUH9yjA2g+fO2LghIc2ZDdKpKsaamOSsli3OL8MPoDJB60T0GH9YLRJvsSsr3UbbqRT5nj/KaTKnKG+ZYOzDwhSmu4i3l7MhmWTOpJbu9Lw== 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)(346002)(39840400004)(396003)(136003)(366004)(376002)(478600001)(186003)(16526019)(6506007)(6486002)(8936002)(8676002)(26005)(2616005)(956004)(1076003)(86362001)(5660300002)(4326008)(66476007)(66556008)(66946007)(107886003)(6512007)(52116002)(2906002)(6916009)(6666004)(83380400001)(36756003)(316002); DIR:OUT; SFP:1102; X-MS-Exchange-AntiSpam-MessageData: =?us-ascii?Q?ua9mVl6YnNJ9dfm1aeroWqutBsT3tnKfOoALDm3v7nYWkOqg/PItI3fTItln?= =?us-ascii?Q?4HSUzuYC/i/3hlUNx3fFFXC7gGhkgc84nG5ftL/aJRAZUXbj57f7BddF0gw9?= =?us-ascii?Q?zXAlljXJ16cAXdQ0XSlCU32euHY3KsA9YZY77aBGCBpYfZR1lBXzOis+ND9c?= =?us-ascii?Q?n+w12mStv1IBPikILAccAx7GtR+fPpVmCkVTrfjPXWDkpt0dCGYl+5L/RIfi?= =?us-ascii?Q?xAtePyBuR2slBPJVpNP9Z5rDzZ4FbEntlgAxv/amfDf6VmAZ/rdiso5XzkCM?= =?us-ascii?Q?fKtEAZkWmDVA2dqFALCMuX07FmjmfSrH9zN3mKkJsF8H5MPPULV1afmmyQRp?= =?us-ascii?Q?pY3velHkIjB9rBRa0JQwE7AZmGaLcsFYsArTSPIhDhNiyT+U5GgGl+2c9H+5?= =?us-ascii?Q?PJad5C0gYxsNSWxmRA9fQaUDUa1NLmi77177yC4/x648XCKHjwdhb2RXDpgv?= =?us-ascii?Q?Kl26KKYlt3jERFzg9+ksT8D5piF9uwQhjWOXOWHcB9m6v2gdYPCat3Q0eTRh?= =?us-ascii?Q?x53IK4/qJZAYYzoPyqTBF/ydWS4sBOm8viDftKNcaThE/t3hMR7mddx9BHWc?= =?us-ascii?Q?3Cw92yUOdNMWcaONvgy5HEF13KNd2kzWZtH0zuPKxm7+DR8uXZMrLWkH30ax?= =?us-ascii?Q?znPcH1A91ZM4X0ypXT0orFBuqno5J9N/82DbLpSn3NM+Tm8EitN0pSENsgCv?= =?us-ascii?Q?TQ6vNcUTZQwiEEsRlQSARC4dNKkQi9beRS1ddn3HxqbJkycxbM25ehEwcJFV?= =?us-ascii?Q?gkEujLku30pLOO1ayMqvSURlzMJO/1tU3XSO0lKsVF+Bo86QoFeAzP7ueCAZ?= =?us-ascii?Q?Xdb7IR6HUlzqaxc4CJkvTnyl/vnZF/S7xXcJZ1M+J2Mh2JtRHZQjNi7jA5EM?= =?us-ascii?Q?GS+FObNglpMsQEPQlYm3Hr+YQx/brLYDGsYfB32s8wflfjJ7BMN/BDwZ3rWV?= =?us-ascii?Q?9+HJPB3kqs1R7wSPBjuma2PT+02UZwauYYfyiYblcNFr4AHDBl3hDcEbVnGP?= =?us-ascii?Q?Z1iK?= X-OriginatorOrg: virtuozzo.com X-MS-Exchange-CrossTenant-AuthSource: AM7PR08MB5494.eurprd08.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 21 Dec 2020 19:06:33.2322 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 0bc7f26d-0264-416e-a6fc-8352af79c58f X-MS-Exchange-CrossTenant-Network-Message-Id: d08a3afd-de59-4a02-c5dd-08d8a5e38821 X-MS-Exchange-CrossTenant-MailboxType: HOSTED X-MS-Exchange-CrossTenant-UserPrincipalName: 3VlihD0hgJ/nseFiSguUaJqq2Y6TVXjugeW8rmePhNRchQYKJDrqe+rXc4MhtDlEOIFVB4kA+MY7ASIIL/887ADMcd2RJfD+pXFV5H5KI8A= X-MS-Exchange-Transport-CrossTenantHeadersStamped: AM5PR0801MB1652 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.2.90; envelope-from=vsementsov@virtuozzo.com; helo=EUR02-VE1-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: , Cc: den@openvz.org, jasowang@redhat.com, vsementsov@virtuozzo.com 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" tap-solaris and tap-bsd realize only tap_open() interface and all other functions are duplicated with tap-stub. Let's split tap-stub so that we can reuse all stubs except for tap_open() for solaris and bsd. Signed-off-by: Vladimir Sementsov-Ogievskiy --- net/tap-bsd.c | 53 --------------------------------------------- net/tap-open-stub.c | 34 +++++++++++++++++++++++++++++ net/tap-solaris.c | 53 --------------------------------------------- net/tap-stub.c | 7 ------ net/meson.build | 3 +++ 5 files changed, 37 insertions(+), 113 deletions(-) create mode 100644 net/tap-open-stub.c diff --git a/net/tap-bsd.c b/net/tap-bsd.c index 77aaf674b1..5667e87c9a 100644 --- a/net/tap-bsd.c +++ b/net/tap-bsd.c @@ -206,56 +206,3 @@ error: return -1; } #endif /* __FreeBSD__ */ - -void tap_set_sndbuf(int fd, const NetdevTapOptions *tap, Error **errp) -{ -} - -int tap_probe_vnet_hdr(int fd, Error **errp) -{ - return 0; -} - -int tap_probe_has_ufo(int fd) -{ - return 0; -} - -int tap_probe_vnet_hdr_len(int fd, int len) -{ - return 0; -} - -void tap_fd_set_vnet_hdr_len(int fd, int len) -{ -} - -int tap_fd_set_vnet_le(int fd, int is_le) -{ - return -EINVAL; -} - -int tap_fd_set_vnet_be(int fd, int is_be) -{ - return -EINVAL; -} - -void tap_fd_set_offload(int fd, int csum, int tso4, - int tso6, int ecn, int ufo) -{ -} - -int tap_fd_enable(int fd) -{ - return -1; -} - -int tap_fd_disable(int fd) -{ - return -1; -} - -int tap_fd_get_ifname(int fd, char *ifname) -{ - return -1; -} diff --git a/net/tap-open-stub.c b/net/tap-open-stub.c new file mode 100644 index 0000000000..01cc03f630 --- /dev/null +++ b/net/tap-open-stub.c @@ -0,0 +1,34 @@ +/* + * QEMU System Emulator + * + * Copyright (c) 2003-2008 Fabrice Bellard + * + * 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/error.h" +#include "tap_int.h" + +int tap_open(char *ifname, int ifname_size, int *vnet_hdr, + int vnet_hdr_required, int mq_required, Error **errp) +{ + error_setg(errp, "tap is not supported in this build"); + return -1; +} diff --git a/net/tap-solaris.c b/net/tap-solaris.c index 0475a58207..920b4df2fe 100644 --- a/net/tap-solaris.c +++ b/net/tap-solaris.c @@ -202,56 +202,3 @@ int tap_open(char *ifname, int ifname_size, int *vnet_= hdr, fcntl(fd, F_SETFL, O_NONBLOCK); return fd; } - -void tap_set_sndbuf(int fd, const NetdevTapOptions *tap, Error **errp) -{ -} - -int tap_probe_vnet_hdr(int fd, Error **errp) -{ - return 0; -} - -int tap_probe_has_ufo(int fd) -{ - return 0; -} - -int tap_probe_vnet_hdr_len(int fd, int len) -{ - return 0; -} - -void tap_fd_set_vnet_hdr_len(int fd, int len) -{ -} - -int tap_fd_set_vnet_le(int fd, int is_le) -{ - return -EINVAL; -} - -int tap_fd_set_vnet_be(int fd, int is_be) -{ - return -EINVAL; -} - -void tap_fd_set_offload(int fd, int csum, int tso4, - int tso6, int ecn, int ufo) -{ -} - -int tap_fd_enable(int fd) -{ - return -1; -} - -int tap_fd_disable(int fd) -{ - return -1; -} - -int tap_fd_get_ifname(int fd, char *ifname) -{ - return -1; -} diff --git a/net/tap-stub.c b/net/tap-stub.c index de525a2e69..6fa130758b 100644 --- a/net/tap-stub.c +++ b/net/tap-stub.c @@ -26,13 +26,6 @@ #include "qapi/error.h" #include "tap_int.h" =20 -int tap_open(char *ifname, int ifname_size, int *vnet_hdr, - int vnet_hdr_required, int mq_required, Error **errp) -{ - error_setg(errp, "tap is not supported in this build"); - return -1; -} - void tap_set_sndbuf(int fd, const NetdevTapOptions *tap, Error **errp) { } diff --git a/net/meson.build b/net/meson.build index 1076b0a7ab..73b2ab78c2 100644 --- a/net/meson.build +++ b/net/meson.build @@ -32,6 +32,9 @@ softmmu_ss.add(when: 'CONFIG_BSD', if_true: files('tap-bs= d.c')) softmmu_ss.add(when: 'CONFIG_SOLARIS', if_true: files('tap-solaris.c')) tap_posix =3D ['tap.c'] if not config_host.has_key('CONFIG_LINUX') and not config_host.has_key('CO= NFIG_BSD') and not config_host.has_key('CONFIG_SOLARIS') + tap_posix +=3D 'tap-open-stub.c' +endif +if not config_host.has_key('CONFIG_LINUX') tap_posix +=3D 'tap-stub.c' endif softmmu_ss.add(when: 'CONFIG_POSIX', if_true: files(tap_posix)) --=20 2.28.0 From nobody Tue Nov 18 07:47:45 2025 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=1608578707; cv=pass; d=zohomail.com; s=zohoarc; b=WJ4e92AlWa5UBz6mCkNRb+p1OXK3NRBmv3nLsMsDTQaAFAKTbKhEv9fhQKnuY9E9d94UN8/Xo+OODpl2lk0RbevYIqtjaoN3TFmFxOZY3OoQ9raBH1RG3JHdfVBO5NrjHf4DHjL0FZbMWbH1LPppvNtr1EerbACuAlpDHhllBz0= ARC-Message-Signature: i=2; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1608578707; 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=k6Ys16+rUATdMCkvcsVfLfDueH9SncsVGYNMU3VmDr0=; b=H8mDzXxucKCX8+Ur/PqK7hFu+sfP12bdoVKGLTw2RtV3ysoXIFl6eXaqYNLIKCa5IRwgDCuoYYSc1zAQRjMQfqUVNGvWP67G4TVeQn0hNsP4aAS/JrWeFjVDbS2ZH6Aniebk8yvbMx4VJ4WN54FURtJZNdSS814j7QAtMbFhpgM= 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 1608578707607160.72224838818056; Mon, 21 Dec 2020 11:25:07 -0800 (PST) Received: from localhost ([::1]:60832 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1krQdx-00005u-Tb for importer@patchew.org; Mon, 21 Dec 2020 14:14:53 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:50348) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1krQWN-0003HJ-4T for qemu-devel@nongnu.org; Mon, 21 Dec 2020 14:07:03 -0500 Received: from mail-eopbgr20090.outbound.protection.outlook.com ([40.107.2.90]:62614 helo=EUR02-VE1-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 1krQWL-0006a3-8Y for qemu-devel@nongnu.org; Mon, 21 Dec 2020 14:07:02 -0500 Received: from AM7PR08MB5494.eurprd08.prod.outlook.com (2603:10a6:20b:dc::15) by AM5PR0801MB1652.eurprd08.prod.outlook.com (2603:10a6:203:3c::21) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.3676.30; Mon, 21 Dec 2020 19:06:34 +0000 Received: from AM7PR08MB5494.eurprd08.prod.outlook.com ([fe80::d585:99a4:d7a4:d478]) by AM7PR08MB5494.eurprd08.prod.outlook.com ([fe80::d585:99a4:d7a4:d478%4]) with mapi id 15.20.3676.033; Mon, 21 Dec 2020 19:06:34 +0000 Received: from kvm.sw.ru (185.215.60.92) by AM0PR02CA0173.eurprd02.prod.outlook.com (2603:10a6:20b:28e::10) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.3676.28 via Frontend Transport; Mon, 21 Dec 2020 19:06:33 +0000 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=lkgi5qFXJemof1+PJFWHUWxISPfY+YBYskeY9qLeakKeSy1YLzqh3rfF76pvucacl3Z8hcCkT1pxMHCrNwooPfuweM99GGqQR9Hih5pF12t5SxtX/q8zl+w07AyJFEuAWetTJNwCuPgWzS8R2Uhyg+z3lpk/J8+HL5UhbBalCku1R8c3hZDTcrX/rQxV59oMp9JE/b0wIb6NUgKcSO1p+jj4mK23wG3gCa5BP9dHeJiWbB9SrFTGw8lv38NGYcn7dAjZMPi0NM7LiUTySwDzVCCQCCSESbHa13M9SamzOv1tUmmfSAtucU2/8DNC9g0bC7AAixfXq0fihWir0byP7A== 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=k6Ys16+rUATdMCkvcsVfLfDueH9SncsVGYNMU3VmDr0=; b=BOjaNyYPOxtEJZosXPtf6Iueu4w40GRf7+4Lez9YCxHXmjskhDxotjyGzDAxmyiiBUNH+h73Yku6lD0X5Vwidwtvn6y2dXJpI7V4XU5OXnd2nmPMKgEOyMqxqH4mFHHeVA70AsOZ9z+QHTKjnihOiEn1k6VHt4lhCJdOU0E9p5sDvAFVNFPnff7MyarnaWIJKCeL6T0sk9Y7N7Mzrn87kL6sNJ4wNeRXTZXrO/Lkhf3p05I3qxGEDIqakbunf1OVDVZRifXE6ZjME0P/SDtF8GG+icBN3KE8PKwfpibYSq88E9wBFlpiJG7V1atUTSoqzc+x2WRYA0pDRHMIeqEtKQ== 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=k6Ys16+rUATdMCkvcsVfLfDueH9SncsVGYNMU3VmDr0=; b=hPnLQ57IDK4loDLBhLedgD8veK2opuXmBLxQom55D3fE4cN405CYC/18mG0caCQlpLCIUN0zmgLfpFNEqOrHvQ1cmy0yQABm5x9Dr7UiZ5pcMAEqh3o2VhnrmO86HHHF+ajtRbDJSns2QD7G/kdA4bBwX9HKxMOIv22QvgpQ0ko= 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-devel@nongnu.org Subject: [PATCH 3/5] net/tap: tap_set_sndbuf(): return status Date: Mon, 21 Dec 2020 22:06:07 +0300 Message-Id: <20201221190609.93768-4-vsementsov@virtuozzo.com> X-Mailer: git-send-email 2.26.2 In-Reply-To: <20201221190609.93768-1-vsementsov@virtuozzo.com> References: <20201221190609.93768-1-vsementsov@virtuozzo.com> Content-Transfer-Encoding: quoted-printable X-Originating-IP: [185.215.60.92] X-ClientProxiedBy: AM0PR02CA0173.eurprd02.prod.outlook.com (2603:10a6:20b:28e::10) 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: fd00952c-6adb-42d2-389f-08d8a5e3889c X-MS-TrafficTypeDiagnostic: AM5PR0801MB1652: X-MS-Exchange-Transport-Forked: True X-Microsoft-Antispam-PRVS: X-MS-Oob-TLC-OOBClassifiers: OLM:220; X-MS-Exchange-SenderADCheck: 1 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: p2yAOjmaobO7OpohaA3IAC5BJyDSdUuNtuSAjFYJXIiMDlW0ODinvk+nmYZ7el4UU5r7tDwT5lNAdow/agjJiqUqdb2M3lo6ifgA/ynTWzXeNw7mJ1WiwK535cuk61MfJ/tG8/CKfxvx/6Tes+3AcgHbT/tO2sD/i/BTjcN2h+AMQLs5Ko2Zme94cwLXzQH7JsYy6fjsTDxgEay76DjAgS1P0m9WIDefiEiMS4vDIYce29RA3NhP9RBBnfngam/V5qYDVeWG81e/t2gLBNNqO5IFsv6ZCvoa5C1yvVMT11z9w90qPIPWkI6/HzWxo46vzt8SyENisMTYTSlKgbfYECLdGzscMf6JgRGoLMIJy1gm4SYfdgKLDnawE281x1yHsjHA4q147kmdYBVFzGrjEQ== 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)(346002)(39840400004)(396003)(136003)(366004)(376002)(478600001)(186003)(16526019)(6506007)(6486002)(8936002)(8676002)(26005)(2616005)(956004)(1076003)(86362001)(5660300002)(4326008)(66476007)(66556008)(66946007)(107886003)(6512007)(52116002)(2906002)(6916009)(6666004)(83380400001)(36756003)(316002); DIR:OUT; SFP:1102; X-MS-Exchange-AntiSpam-MessageData: =?us-ascii?Q?sSm3XXbFbh1cXOspHh0+kBREZKXdp+fAqAq4m6HWrPUIEEBE1kjV5yet8uTe?= =?us-ascii?Q?qjhdjDQSHovFJ44JbGZamQN5AZ+O3GfWFilKjSrJfOOvs+HK9GpQhx0u005r?= =?us-ascii?Q?g/iCjRIFejxKkJpWFOw696aETUZsBM4JeeDlQhS8dh00X4NDAquSxuWbII/C?= =?us-ascii?Q?xU3NOOck2XqgbIvZBLmqpVbdPjWx2shYKYC303l+k2QCznOw0aRR6W4IMu+u?= =?us-ascii?Q?K/BadV4CoDa9zbIfvX/uPWK57uD7MsDslRtyx2IZbVH8cAtHxKf6ULjWBdmV?= =?us-ascii?Q?a7OJm9+tRTDITI/mLC7A3HlJdcLR9ljwuBVOzU7mv2S7QchYxoApss8OTXoY?= =?us-ascii?Q?qmU2zE2zQWQJ3IWs1YYqxng9qlAaaWC2q22lyZiOMgAxKx+2w0uL3k8pz36g?= =?us-ascii?Q?G32qY4/IFzxBs0JAP8WkZgUhDkRBiefTZnBYcg3wFijKv2U71w7jtspfqe7l?= =?us-ascii?Q?Jvkp1JVsix1TZHr+yeZFP0+QgH+mN8YaLv9oeZnHzFgx++RHYlarBBBIe12U?= =?us-ascii?Q?uDL8L66oS2nQwm3hGSO7Pozzg2fBltRmVDCgaWl5g6xg8ko+lpOOR6i58NKp?= =?us-ascii?Q?WmURss1h7Wm/fzukrOxx1h+9NwCfqXGk9vHVYHh2mu9rx1pfv6fGP/7cHiuq?= =?us-ascii?Q?SdC9rDndcm3jN+jgzMMtYOLiBqULSJzgC9bfyPrw7nPDlr3mKMGiCMqPsuDo?= =?us-ascii?Q?kdoNCepNKPpMn/MgOOqnkbh+hHgfuP1HT3E50Rk7DzpirvRKmlJQB/oGYLw1?= =?us-ascii?Q?4q9NmCbnHh22DE9w9eAfRS0FkLSYtPmc1wugcjdgN/oWyjUU0xhOlaiH3V/8?= =?us-ascii?Q?wCdAKuCurX2Jf2kJeqTyahjInh29Mff+mGuVkeeYg5daqb4iG1oc1kjNkirZ?= =?us-ascii?Q?chgKtD+GB3iT2WyW4tFz0i/jx+Hr17yIip9kEOimQI5ybidTIJJFuwCkbHYu?= =?us-ascii?Q?NVUMsN46l6kkTufPP7L38FIK46BVa+ODZ4bWK0Lci5KrGQmuEjbF8Bw+aoCc?= =?us-ascii?Q?eDX7?= X-OriginatorOrg: virtuozzo.com X-MS-Exchange-CrossTenant-AuthSource: AM7PR08MB5494.eurprd08.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 21 Dec 2020 19:06:34.0197 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 0bc7f26d-0264-416e-a6fc-8352af79c58f X-MS-Exchange-CrossTenant-Network-Message-Id: fd00952c-6adb-42d2-389f-08d8a5e3889c X-MS-Exchange-CrossTenant-MailboxType: HOSTED X-MS-Exchange-CrossTenant-UserPrincipalName: dVn1PQ5voQgU5MDJJq31LVO+v8mA/6zas7hqRIhGd4rp60eb6l158MX8uSHLwFulLsxuI8ahHu29PcwbZAK0FQfhMzokCbktjwHX5Bm1QQc= X-MS-Exchange-Transport-CrossTenantHeadersStamped: AM5PR0801MB1652 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.2.90; envelope-from=vsementsov@virtuozzo.com; helo=EUR02-VE1-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: , Cc: den@openvz.org, jasowang@redhat.com, vsementsov@virtuozzo.com 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" It's recommended to return a value indicating success / failure for functions with errp parameter (see include/qapi/error.h). Let's update tap_set_sndbuf(). Signed-off-by: Vladimir Sementsov-Ogievskiy Reviewed-by: Philippe Mathieu-Daud=C3=A9 --- net/tap_int.h | 2 +- net/tap-linux.c | 5 ++++- net/tap-stub.c | 2 +- net/tap.c | 6 +++--- 4 files changed, 9 insertions(+), 6 deletions(-) diff --git a/net/tap_int.h b/net/tap_int.h index 225a49ea48..57567b9f24 100644 --- a/net/tap_int.h +++ b/net/tap_int.h @@ -33,7 +33,7 @@ int tap_open(char *ifname, int ifname_size, int *vnet_hdr, =20 ssize_t tap_read_packet(int tapfd, uint8_t *buf, int maxlen); =20 -void tap_set_sndbuf(int fd, const NetdevTapOptions *tap, Error **errp); +int tap_set_sndbuf(int fd, const NetdevTapOptions *tap, Error **errp); int tap_probe_vnet_hdr(int fd, Error **errp); int tap_probe_vnet_hdr_len(int fd, int len); int tap_probe_has_ufo(int fd); diff --git a/net/tap-linux.c b/net/tap-linux.c index b0635e9e32..c51bcdc2a3 100644 --- a/net/tap-linux.c +++ b/net/tap-linux.c @@ -130,7 +130,7 @@ int tap_open(char *ifname, int ifname_size, int *vnet_h= dr, */ #define TAP_DEFAULT_SNDBUF 0 =20 -void tap_set_sndbuf(int fd, const NetdevTapOptions *tap, Error **errp) +int tap_set_sndbuf(int fd, const NetdevTapOptions *tap, Error **errp) { int sndbuf; =20 @@ -144,7 +144,10 @@ void tap_set_sndbuf(int fd, const NetdevTapOptions *ta= p, Error **errp) =20 if (ioctl(fd, TUNSETSNDBUF, &sndbuf) =3D=3D -1 && tap->has_sndbuf) { error_setg_errno(errp, errno, "TUNSETSNDBUF ioctl failed"); + return -1; } + + return 0; } =20 int tap_probe_vnet_hdr(int fd, Error **errp) diff --git a/net/tap-stub.c b/net/tap-stub.c index 6fa130758b..473d5e4afe 100644 --- a/net/tap-stub.c +++ b/net/tap-stub.c @@ -26,7 +26,7 @@ #include "qapi/error.h" #include "tap_int.h" =20 -void tap_set_sndbuf(int fd, const NetdevTapOptions *tap, Error **errp) +int tap_set_sndbuf(int fd, const NetdevTapOptions *tap, Error **errp) { } =20 diff --git a/net/tap.c b/net/tap.c index 75b01d54ee..33d749c7b6 100644 --- a/net/tap.c +++ b/net/tap.c @@ -661,10 +661,10 @@ static void net_init_tap_one(const NetdevTapOptions *= tap, NetClientState *peer, Error *err =3D NULL; TAPState *s =3D net_tap_fd_init(peer, model, name, fd, vnet_hdr); int vhostfd; + int ret; =20 - tap_set_sndbuf(s->fd, tap, &err); - if (err) { - error_propagate(errp, err); + ret =3D tap_set_sndbuf(s->fd, tap, errp); + if (ret < 0) { return; } =20 --=20 2.28.0 From nobody Tue Nov 18 07:47:45 2025 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=1608579659; cv=pass; d=zohomail.com; s=zohoarc; b=T3DOf/yL88w+I3ujGiWhwKO7wMDBQIWDe8qy62F4EVHZDLwwuRbeVaMV/5kcF/oVc5JMrZn2D0iI8qQOHeYEHV7amTZeNscMRYSIM7vk4Zsfbesis6bT4DLF/hHFkD3midY3kHJSqzFcvbm12oWnRPnCDCd1xXrrEtdYlt2RIHU= ARC-Message-Signature: i=2; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1608579659; 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=J3Wd1bSfd6k57AWa1n4Rw3gw3s2Tga6bMsf3Jf0I4Bc=; b=oI2zHBSLX9PFaKLl0QM2jZQDxH4tN7NFbM3pgJty8VTo1vwx9jk0i3tP9DbdXr3byKDRSb1iqntQuNopPqu+nVVAaZqAuhWU8xgzITByoBRVJB3XF8u8tKWdvSWk0GtBzKORsb4U+Mg9Hsx4O/IJXVgjd80U4DnHQtPN7Odlp+Y= 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 16085796594581013.1617913116778; Mon, 21 Dec 2020 11:40:59 -0800 (PST) Received: from localhost ([::1]:55572 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1krQbB-00067f-Gv for importer@patchew.org; Mon, 21 Dec 2020 14:12:01 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:50370) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1krQWT-0003Jl-5R for qemu-devel@nongnu.org; Mon, 21 Dec 2020 14:07:09 -0500 Received: from mail-eopbgr20090.outbound.protection.outlook.com ([40.107.2.90]:62614 helo=EUR02-VE1-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 1krQWN-0006a3-U3 for qemu-devel@nongnu.org; Mon, 21 Dec 2020 14:07:08 -0500 Received: from AM7PR08MB5494.eurprd08.prod.outlook.com (2603:10a6:20b:dc::15) by AM5PR0801MB1652.eurprd08.prod.outlook.com (2603:10a6:203:3c::21) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.3676.30; Mon, 21 Dec 2020 19:06:35 +0000 Received: from AM7PR08MB5494.eurprd08.prod.outlook.com ([fe80::d585:99a4:d7a4:d478]) by AM7PR08MB5494.eurprd08.prod.outlook.com ([fe80::d585:99a4:d7a4:d478%4]) with mapi id 15.20.3676.033; Mon, 21 Dec 2020 19:06:35 +0000 Received: from kvm.sw.ru (185.215.60.92) by AM0PR02CA0173.eurprd02.prod.outlook.com (2603:10a6:20b:28e::10) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.3676.28 via Frontend Transport; Mon, 21 Dec 2020 19:06:34 +0000 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=D0azA+fET1dWRCvd72G9Ewus50DfnLWoa7fzPLxkj/6EacqVpxmmB3qbjno2mz6vg+uuq+GqjDtWpIGrU5S4R+Gmp2h+CPYGH/2HiOSGEoAYak/Z9wlqh1r0V54RmzxzV3PNqI22yGK+2NZUIT7jf7HFDEPdSVB6tmjAF8duR3HtZ6brFYZc9oOpB2mu4+T9bVtiS04NX2FvczWlbOzS9wkv+WP3Cgn6gv0o9J/imZULiottg5Ua+tx2Iuzg23pQsfyKPQ4fO58Yu4XmR4rfv38LDDP1zEaPTzjiVJPQQRtNFfVsjKc69e0sqpZHwrNpfWJvrrTm0mM2rRUUTVZVbA== 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=J3Wd1bSfd6k57AWa1n4Rw3gw3s2Tga6bMsf3Jf0I4Bc=; b=UJcqaOy2uOmdTvbexzChBls/iflVCF0YW94d2uChZL/q9b1E69l5sw4XO5YBzhptZRYKNYFbUi0/7Z9YUItQ4jZyV7HO0oimPJp05eXi7P60lNmP3wO8t/imThVWY4qkRSrtqEwwPCJNZTBcOHubbHoVfJChn6VKkxWnciy8PXIvrlk68JbXbc6RcXjNVgFTwYJM3CorqANjmuh96BJReBQIaWL8SF7TORW9s2w2ZWyORZp40dsaYi60MObxht1cDeb2LAOeWjgAWHcJQWsi0HauR41sLNyrjcKIWwLuT+Up45K5anDbPBB5fnoziPvhkK9boxgNXPcGRnBopejThA== 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=J3Wd1bSfd6k57AWa1n4Rw3gw3s2Tga6bMsf3Jf0I4Bc=; b=KW5/sSSIrTog/L4P7cHCsnTIOo7G33svbfnzDVGAJipn/JweE0DfAyxhnIRdkgcw26lyCPzC5Pb79+0qq/8iG9ED1RPXL07YM2er9hC5aasrqB7IJzRTSaU2x6gOgzErI9YZ5unroRjeoeQRxz2oZ+LeVFCTGoy6aHrb3RTBCO4= 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-devel@nongnu.org Subject: [PATCH 4/5] net/tap: refactor and improve net_init_tap_one() Date: Mon, 21 Dec 2020 22:06:08 +0300 Message-Id: <20201221190609.93768-5-vsementsov@virtuozzo.com> X-Mailer: git-send-email 2.26.2 In-Reply-To: <20201221190609.93768-1-vsementsov@virtuozzo.com> References: <20201221190609.93768-1-vsementsov@virtuozzo.com> Content-Transfer-Encoding: quoted-printable X-Originating-IP: [185.215.60.92] X-ClientProxiedBy: AM0PR02CA0173.eurprd02.prod.outlook.com (2603:10a6:20b:28e::10) 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: f69171bc-3bfc-4379-143f-08d8a5e3898e X-MS-TrafficTypeDiagnostic: AM5PR0801MB1652: X-MS-Exchange-Transport-Forked: True X-Microsoft-Antispam-PRVS: X-MS-Oob-TLC-OOBClassifiers: OLM:3173; X-MS-Exchange-SenderADCheck: 1 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: PRX9MCBncdsbJZPGyrt0PrmoMFfc6sXh1d7NcHXpRPHAfXoijEZ6xXnxcy2W2q2GX5GdCw2982HSut7PFPHYmh7zgu+ULzrhh1lQ43D6JldGtrXb02ChdS8aSqIw1DX3p6iTpN5jwTbT5JPY2S8PXJb6Uh9RuiNlWQUEHz/uXo4NlmG/VvJDKvIiS+/l+3K40LBzH8uvcHyaWWEUT9deTBMfCKWJyupDhQGvucgvDTfm3YkVSfWn2rw/pZfMulQWAq1s0jjt/Swsxve1By4+Obfp5zTYDv5+9lkKJnSkpldlIMEQMlEGvxdhYzqBXEg8qIXUgKSdkwjirw+DLDaO3NngZ9kebC1H0r9PIrzmM5HtPiGPBgZUOAFP4CtLIzpXTe3zYcPvwL1GeR0r20UbWA== 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)(346002)(39840400004)(396003)(136003)(366004)(376002)(478600001)(186003)(16526019)(6506007)(6486002)(8936002)(8676002)(26005)(2616005)(956004)(1076003)(86362001)(5660300002)(4326008)(66476007)(66556008)(66946007)(107886003)(6512007)(52116002)(2906002)(6916009)(6666004)(83380400001)(36756003)(316002); DIR:OUT; SFP:1102; X-MS-Exchange-AntiSpam-MessageData: =?us-ascii?Q?hs4UQW1Am1MqfHIjr8QMzcoGUNbJw4jsBnTGjeeARWTj1Bjo3BeQYZ5M0a4x?= =?us-ascii?Q?SFR9h+C2NcPzyu2izIMWiJify7Abg5szaRQWGVVS9UioUrJpkRhkqyxuxtdb?= =?us-ascii?Q?z00wZpQm5agyqi5n/rG+HvrRBlAV8Ez56zKLmfW87NzN4ZHoAkQcoMy6Zyvw?= =?us-ascii?Q?m3gvnAaxBnGz92kWhEXulO9pdIKgnDYQdvlnilSPuzYMFomYKXtzyjumLooR?= =?us-ascii?Q?qwm2DGI83Ou41EG5VvdzPoTIfVyE9JdePNhVawEXC1IVZT4m7uN2EbtswsLC?= =?us-ascii?Q?XkC7w9Whi8x8XnRk9F1vl/S5gOWapo9HsedYOn/6lEKtcVIi2t38RwkK12BI?= =?us-ascii?Q?DmMezk9fYiye5pCRCrbj64kVwB3vSTJDJ1N5p3Ebu/iazSWIPdkv/gTaEVFO?= =?us-ascii?Q?7JcryQ4lyDvbOUjqt+7RINpmeWiDA7ueqIsZnc26M6RxO3rc7C6/VCNcEbr3?= =?us-ascii?Q?n7XeGZB1tDsnN2VyBPYCLYC2rwtZPQPcTTkR1zJGwspLlKod6BW0HabvU/bc?= =?us-ascii?Q?Oh1D6WvTY+kjc50gkc7+jLMLYT17apMWDB7JY6fZpbZkvlU50UJwQjcmGtn8?= =?us-ascii?Q?mdVx2ktFL8DDp7bcFr+9eXULzmOPmjzqEOz6hd7f8w0AoFYt9ZP7ICOsC52y?= =?us-ascii?Q?+QrHOaX5Ibsia6E04tMDQs96ZU3HeaTnUIpCcaeK+1eOBc5Z6aihE2dVm8ZW?= =?us-ascii?Q?hWY5lbdINb0Jg+6WK97I4+XLQos4/cfSoATOHoi/4SybOJMSExmyQ+VkFflm?= =?us-ascii?Q?T9zm5Lmd+cRekk3s0SAP3Xb5FdXoxCVOq1SAYkCCmmynbbdD5fm2QTFvRuzG?= =?us-ascii?Q?6YqiIwjCTgkSn5SPp/nuy9UaXr9qOpwXpoDKECJOkGUQDtfo4hvzufqoz6TW?= =?us-ascii?Q?Lfl0GM0iUi6XeQmlXVw5SqaveuKATALwXc417kg9OrplCta2UNsQNgs58Shx?= =?us-ascii?Q?T1CLiMfRvxf1zDrGdrQH39IJiaZWop+klbK9BaY7oM+X6fi3GiQ3Lj/Ff6f6?= =?us-ascii?Q?epCI?= X-OriginatorOrg: virtuozzo.com X-MS-Exchange-CrossTenant-AuthSource: AM7PR08MB5494.eurprd08.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 21 Dec 2020 19:06:35.5978 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 0bc7f26d-0264-416e-a6fc-8352af79c58f X-MS-Exchange-CrossTenant-Network-Message-Id: f69171bc-3bfc-4379-143f-08d8a5e3898e X-MS-Exchange-CrossTenant-MailboxType: HOSTED X-MS-Exchange-CrossTenant-UserPrincipalName: VqDUGSNUXJCTjKy8Hz5B6oxA5oGX4a7wEwGaRBOmLEeOTkC3iCUV0ytWf1h1Q/UujD7g7ulyd5zwp8ad8gHiGIWYedsLldkwaMS5iAuzoZk= X-MS-Exchange-Transport-CrossTenantHeadersStamped: AM5PR0801MB1652 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.2.90; envelope-from=vsementsov@virtuozzo.com; helo=EUR02-VE1-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: , Cc: den@openvz.org, jasowang@redhat.com, vsementsov@virtuozzo.com 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" First, 46d4d36d0bf2b24 changed the logic of net_init_tap_one() so that failure of vhost initialization is ignored (still, warning printed) when vhostforce is not set. Then 894022e616016fe8 updated net_init_tap_one() to use qemu_try_set_nonblock() instead of qemu_set_nonblock(), to not crash, but it didn't consider the failure-ignoring logic and used wrong fd for error message. Let's refactor the function net_init_tap_one() splitting out vhost-net initialization and fixing all the issues. Error message change: we need to fix fd anyway. Also, don't want to pass name to the new function only for error path, so, drop it. As a pay, add more information on vhost fd itself. Fixes: 894022e616016fe81745753f14adfbd680a1c7ee Signed-off-by: Vladimir Sementsov-Ogievskiy --- include/net/vhost_net.h | 3 -- net/tap.c | 103 +++++++++++++++++++++------------------- 2 files changed, 53 insertions(+), 53 deletions(-) diff --git a/include/net/vhost_net.h b/include/net/vhost_net.h index 172b0051d8..c00871cd1b 100644 --- a/include/net/vhost_net.h +++ b/include/net/vhost_net.h @@ -4,9 +4,6 @@ #include "net/net.h" #include "hw/virtio/vhost-backend.h" =20 -#define VHOST_NET_INIT_FAILED \ - "vhost-net requested but could not be initialized" - struct vhost_net; typedef struct vhost_net VHostNetState; =20 diff --git a/net/tap.c b/net/tap.c index 33d749c7b6..89ea04862b 100644 --- a/net/tap.c +++ b/net/tap.c @@ -652,15 +652,61 @@ static int net_tap_init(const NetdevTapOptions *tap, = int *vnet_hdr, =20 #define MAX_TAP_QUEUES 1024 =20 +static int tap_init_vhost_net(TAPState *s, const NetdevTapOptions *tap, + const char *vhostfdname, Error **errp) +{ + VhostNetOptions options; + int vhostfd; + int ret; + + options.backend_type =3D VHOST_BACKEND_TYPE_KERNEL; + options.net_backend =3D &s->nc; + if (tap->has_poll_us) { + options.busyloop_timeout =3D tap->poll_us; + } else { + options.busyloop_timeout =3D 0; + } + + if (vhostfdname) { + vhostfd =3D monitor_fd_param(monitor_cur(), vhostfdname, errp); + if (vhostfd < 0) { + return -1; + } + + ret =3D qemu_try_set_nonblock(vhostfd); + if (ret < 0) { + error_setg_errno(errp, -ret, + "tap: Can't use vhost file descriptor %s(%d)", + vhostfdname, vhostfd); + return -1; + } + } else { + vhostfd =3D open("/dev/vhost-net", O_RDWR); + if (vhostfd < 0) { + error_setg_errno(errp, errno, "tap: open vhost char device fai= led"); + return -1; + } + qemu_set_nonblock(vhostfd); + } + + options.opaque =3D (void *)(uintptr_t)vhostfd; + + s->vhost_net =3D vhost_net_init(&options); + if (!s->vhost_net) { + error_setg(errp, "vhost-net requested but could not be initialized= "); + return -1; + } + + return 0; +} + static void net_init_tap_one(const NetdevTapOptions *tap, NetClientState *= peer, const char *model, const char *name, const char *ifname, const char *script, const char *downscript, const char *vhostfdna= me, int vnet_hdr, int fd, Error **errp) { - Error *err =3D NULL; TAPState *s =3D net_tap_fd_init(peer, model, name, fd, vnet_hdr); - int vhostfd; int ret; =20 ret =3D tap_set_sndbuf(s->fd, tap, errp); @@ -687,58 +733,15 @@ static void net_init_tap_one(const NetdevTapOptions *= tap, NetClientState *peer, =20 if (tap->has_vhost ? tap->vhost : vhostfdname || (tap->has_vhostforce && tap->vhostforce)) { - VhostNetOptions options; - - options.backend_type =3D VHOST_BACKEND_TYPE_KERNEL; - options.net_backend =3D &s->nc; - if (tap->has_poll_us) { - options.busyloop_timeout =3D tap->poll_us; - } else { - options.busyloop_timeout =3D 0; - } - - if (vhostfdname) { - int ret; - - vhostfd =3D monitor_fd_param(monitor_cur(), vhostfdname, &err); - if (vhostfd =3D=3D -1) { - if (tap->has_vhostforce && tap->vhostforce) { - error_propagate(errp, err); - } else { - warn_report_err(err); - } - return; - } - ret =3D qemu_try_set_nonblock(vhostfd); - if (ret < 0) { - error_setg_errno(errp, -ret, "%s: Can't use file descripto= r %d", - name, fd); - return; - } - } else { - vhostfd =3D open("/dev/vhost-net", O_RDWR); - if (vhostfd < 0) { - if (tap->has_vhostforce && tap->vhostforce) { - error_setg_errno(errp, errno, - "tap: open vhost char device failed"); - } else { - warn_report("tap: open vhost char device failed: %s", - strerror(errno)); - } - return; - } - qemu_set_nonblock(vhostfd); - } - options.opaque =3D (void *)(uintptr_t)vhostfd; + Error *err =3D NULL; =20 - s->vhost_net =3D vhost_net_init(&options); - if (!s->vhost_net) { + ret =3D tap_init_vhost_net(s, tap, vhostfdname, &err); + if (ret < 0) { if (tap->has_vhostforce && tap->vhostforce) { - error_setg(errp, VHOST_NET_INIT_FAILED); + error_propagate(errp, err); } else { - warn_report(VHOST_NET_INIT_FAILED); + warn_report_err(err); } - return; } } else if (vhostfdname) { error_setg(errp, "vhostfd(s)=3D is not valid without vhost"); --=20 2.28.0 From nobody Tue Nov 18 07:47:45 2025 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=1608579265; cv=pass; d=zohomail.com; s=zohoarc; b=TfR5gKooUsrr7HwD1BvRFueu6gStSQQexwYwTygb8VIpCsSV0CoPDFQMDLZm6KWO5b2dszyDlFnPpfWKk1kJgdnW1dFPEJHR/1b79h5aqg4mr/DztHuMivgX+v8W4Da/GGESsMY29kd7dj8i8AQYRYwWSwC8DRwTS4euSoS/Wxs= ARC-Message-Signature: i=2; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1608579265; 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=pii+Km3azXOH6i7te3wloObtkCxotV1dcnczxvWWNT0=; b=nEBpHb1foh6X6SJqIIhXUe9ZLxlJ+LAVX/MibLNLUaDm3zuMkv3ttz+vmc15lENltMjdBBQcgKLZUJgUDDr5hAwpYbjfB6ORBwByTyy5JTC3OF0wCy1NGW37g2DJZQTHyVIEFceJn1AX+jNjWuSnpEWuAyOE+Lt+Ai5ZHMYTDC0= 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 1608579265712246.5562788916618; Mon, 21 Dec 2020 11:34:25 -0800 (PST) Received: from localhost ([::1]:60950 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1krQe9-000090-V7 for importer@patchew.org; Mon, 21 Dec 2020 14:15:05 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:50410) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1krQWW-0003NN-2X for qemu-devel@nongnu.org; Mon, 21 Dec 2020 14:07:12 -0500 Received: from mail-eopbgr20090.outbound.protection.outlook.com ([40.107.2.90]:62614 helo=EUR02-VE1-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 1krQWU-0006a3-9E for qemu-devel@nongnu.org; Mon, 21 Dec 2020 14:07:11 -0500 Received: from AM7PR08MB5494.eurprd08.prod.outlook.com (2603:10a6:20b:dc::15) by AM5PR0801MB1652.eurprd08.prod.outlook.com (2603:10a6:203:3c::21) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.3676.30; Mon, 21 Dec 2020 19:06:36 +0000 Received: from AM7PR08MB5494.eurprd08.prod.outlook.com ([fe80::d585:99a4:d7a4:d478]) by AM7PR08MB5494.eurprd08.prod.outlook.com ([fe80::d585:99a4:d7a4:d478%4]) with mapi id 15.20.3676.033; Mon, 21 Dec 2020 19:06:36 +0000 Received: from kvm.sw.ru (185.215.60.92) by AM0PR02CA0173.eurprd02.prod.outlook.com (2603:10a6:20b:28e::10) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.3676.28 via Frontend Transport; Mon, 21 Dec 2020 19:06:35 +0000 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=CSsyiJxk5DdH2R8lX+g9uqGbOctMhT7BPEijtsjBc1RzF2RZZ7UmCNJejmPD+xGM1azHLmaadha04sHeVGfA/N5OoAIWZBrn1s9k5I9EK7GdMKo9i69aV1r3FpTrtS0nG50bP8VEFuCn03tWne3lh75C4uaDuSxPpDE39pxmQ0P4kck0oKinimWNowNSvXIkqA+Gs5YU+7KkuW8GXnhT1tmMb4scPhxjYrqYAAVDMLi71qQw+0kjDyMYK032G58KOEKUkSKidwRXpUny8Jk6a9fi6Jhz/romojMHGhomC+HBfp8XsGJIGS/5fUCfLDm0ubdnxSJkO6/2CiWxZAtLcg== 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=pii+Km3azXOH6i7te3wloObtkCxotV1dcnczxvWWNT0=; b=BROl8D3lSnUOjPNTkIvQYtbNyCuO7CoeE9qAGO7JUU8kWPb9+PAWtY5wEIu9YuNjGxIq2Wa9Qpf+T8D9dNcgVBv7UrXke98QjHj71GhjR/6Vj4y8wcztEWNRUQTaBeGO98SOz516WUmjLoVycMs+CEh+ibCxsU76ptV82PGncS05dTqYp6VJXivyzgwSYZ+/g98jprpbJbdRGOELK2Cy2M1hpGyo7riyLpLaPCaUy3lsjBZ2BYAkHAyUdUufS1Cuowe/A/5MgB6Sp8D+LN4oEDejN/PRgjku8sUEygGTO+inZNKKM006sVHcuxBZzIUj94ZPb15o2XY6iFQM0DyPSQ== 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=pii+Km3azXOH6i7te3wloObtkCxotV1dcnczxvWWNT0=; b=nnzoG7KMwq0Um2FSEI4jM3FREAySPWRDyi3BccFou4/68ttO6ALTx7+ErPXA45ZJcM9T6QZFdlWRlNerMSoldLXYEYosQhyKnN5HO9H1eztO5NzDtD4NNXPmwqJma/wHeSZzFxPNSD1wRZd02S0g0RPhmjMmgS2OWzGiICwPIQ8= 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-devel@nongnu.org Subject: [PATCH 5/5] net/tap: net_init_tap_one(): fix net-client leak on failure path Date: Mon, 21 Dec 2020 22:06:09 +0300 Message-Id: <20201221190609.93768-6-vsementsov@virtuozzo.com> X-Mailer: git-send-email 2.26.2 In-Reply-To: <20201221190609.93768-1-vsementsov@virtuozzo.com> References: <20201221190609.93768-1-vsementsov@virtuozzo.com> Content-Transfer-Encoding: quoted-printable X-Originating-IP: [185.215.60.92] X-ClientProxiedBy: AM0PR02CA0173.eurprd02.prod.outlook.com (2603:10a6:20b:28e::10) 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: dc465360-b82d-4fa4-1e41-08d8a5e389ec X-MS-TrafficTypeDiagnostic: AM5PR0801MB1652: X-MS-Exchange-Transport-Forked: True X-Microsoft-Antispam-PRVS: X-MS-Oob-TLC-OOBClassifiers: OLM:324; X-MS-Exchange-SenderADCheck: 1 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: xWF5aiA/AfftuWEMfsa0ZmkG7+T45jDPcRpbFGABl2Xr0QlAV6YCr0Zts1tUOgHZ2eODQDhk4wNlilzhO3JOZnwiR7sS0X2eXpANeRLV2+P1zvLUxEHVMaBEqv2pubOXtiWGaUtcQ67e0VCX4OsmHTSuB4Q3Yl49lzQAhvgkJ9o50lDlqGTWJQrBDcdlhs+ljLZMn9cgbHFDqWNtzmgu1ZueaRPQOcC84JXJJo7j8n6iHcwzuX7q6/BWKS9rpdBBR9GTsTyVkcQhLFRqBIRh2gZ7LBCQfLuy+XHssRB+t9Nlt/9F7O41B5cX/A8TFPV1K1epwz7IRebkgGu/x0OvvN+Bra0e5skKPVznkMBFF+txnWSBJr6cBWGazNANcoUOEFwRHl15GtVHtyU1fcRB7w== 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)(346002)(39840400004)(396003)(136003)(366004)(376002)(478600001)(186003)(16526019)(6506007)(6486002)(8936002)(8676002)(26005)(2616005)(956004)(1076003)(86362001)(5660300002)(4326008)(66476007)(66556008)(66946007)(107886003)(6512007)(52116002)(2906002)(6916009)(6666004)(83380400001)(36756003)(316002); DIR:OUT; SFP:1102; X-MS-Exchange-AntiSpam-MessageData: =?us-ascii?Q?7/VAq0mkOd6jqljMAFOK6XiOPo/ihW391lQapxDdJcXjivK0OYyUUgjF3muc?= =?us-ascii?Q?Aon/lOcq44urEpTwIMuxEy+HvOK+QqHNvmCCU/nebfNK4kUTKHpp3Vt35TNG?= =?us-ascii?Q?xZpW//7tfe+n4kkYbAwg2oiWDKoFYP7Ox6yw4lFQKMQGwyFKjmhA6zFT1iwU?= =?us-ascii?Q?ben4ENZ58XnT7ZcJHL/BSSojBeewieVkhakygirNG9yilq0K2L49loSoURz7?= =?us-ascii?Q?pmVRbhqOeV5pbnB8TKA2y8s1DusH64yBMD1qdQ5EvA1LwFUbRfg7pPj0bwme?= =?us-ascii?Q?pCVaEP/innGP8lRPQJvFbFfSW23q8PFiNvndmedt/r+4xGASboWK04GLPcWL?= =?us-ascii?Q?RLg17xbcXJYO5MhfjgpYhCHoy5GaUwXDBdG7f+yxqndcyIUHHm3gT5CCUUtJ?= =?us-ascii?Q?sIPDIlG2FK8J5ngX40GuZoxcfeESWITwJahh7jRlIvZOty/3EKZxis6eVkzn?= =?us-ascii?Q?/5DFbUBdgtdiZlFtXvBj9UZ+DyLMgsz0wle/tuTKXqNvrFZ2LltcFESu2Bi8?= =?us-ascii?Q?QiAzBmXIAJ1rl7rZFGrGtMA4fSN+ujW2cCcbqfzntzaxPjEqKDVcRl+G384e?= =?us-ascii?Q?eW071Q7whCNtyn1zSge6RLPNdvsJ9eSpbMdZvkoAivTlyZgZZBwhk5BTK6OY?= =?us-ascii?Q?cqT8lqgNKWVNwgC86M8UwgnVDWa10mRxz+0pWyXEabTMXl+l3vLYz/2xMHhT?= =?us-ascii?Q?bhwjzrVK8ERnstZz6DXnzlrDQpE1q63TxOvYQNla823Jn4kcZ0635VN0gPQV?= =?us-ascii?Q?PnKoufDKKCTlZLHyX0RL9kJor59ly4cuxSDaojErmUuGCaKd73ep/EQ/Pe5M?= =?us-ascii?Q?Py0RjJQElEhGHNYO1bp0oITQX/0CqCIs2nJB7K7EG/DbSAJoz0vd3npPvfH0?= =?us-ascii?Q?CB6PjL1NYNBYO6TOPS423Iwz6JHjsCdW4QvwI52fJZNTe/Cp+ofMkVL5g8V8?= =?us-ascii?Q?wAdZxucCvO/N1dHRn+I9NLR/CoHwZDAOcv4pjZHXaAzaIquGwXAQ1IGsY0HK?= =?us-ascii?Q?lJ8v?= X-OriginatorOrg: virtuozzo.com X-MS-Exchange-CrossTenant-AuthSource: AM7PR08MB5494.eurprd08.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 21 Dec 2020 19:06:36.1742 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 0bc7f26d-0264-416e-a6fc-8352af79c58f X-MS-Exchange-CrossTenant-Network-Message-Id: dc465360-b82d-4fa4-1e41-08d8a5e389ec X-MS-Exchange-CrossTenant-MailboxType: HOSTED X-MS-Exchange-CrossTenant-UserPrincipalName: 9wUuswnl1JbsSj5rP77xxpp5Mh/HSuObmj4Dw7EA98rLaeym5nn6PrtZYogOwwPTq//jk42Cp01gQUa/MFlvgsH1lx7Puerf5kq3SpxnvtU= X-MS-Exchange-Transport-CrossTenantHeadersStamped: AM5PR0801MB1652 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.2.90; envelope-from=vsementsov@virtuozzo.com; helo=EUR02-VE1-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: , Cc: den@openvz.org, jasowang@redhat.com, vsementsov@virtuozzo.com 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" net_tap_fd_init() allocates new NetClientState through qemu_new_net_client(). We should free it on failure path. Signed-off-by: Vladimir Sementsov-Ogievskiy --- Attention: it's an intuitive patch. I see, that net-client is leaked. May be it's still freed some tricky way? And I don't understand the whole logic of qemu_del_net_client(), it's just the only public interface to free net-client I found. net/tap.c | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/net/tap.c b/net/tap.c index 89ea04862b..ba4c34af3d 100644 --- a/net/tap.c +++ b/net/tap.c @@ -711,7 +711,7 @@ static void net_init_tap_one(const NetdevTapOptions *ta= p, NetClientState *peer, =20 ret =3D tap_set_sndbuf(s->fd, tap, errp); if (ret < 0) { - return; + goto fail; } =20 if (tap->has_fd || tap->has_fds) { @@ -739,13 +739,20 @@ static void net_init_tap_one(const NetdevTapOptions *= tap, NetClientState *peer, if (ret < 0) { if (tap->has_vhostforce && tap->vhostforce) { error_propagate(errp, err); + goto fail; } else { warn_report_err(err); } } } else if (vhostfdname) { error_setg(errp, "vhostfd(s)=3D is not valid without vhost"); + goto fail; } + + return; + +fail: + qemu_del_net_client(&s->nc); } =20 static int get_fds(char *str, char *fds[], int max) --=20 2.28.0