From nobody Thu May 16 03:20:35 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of redhat.com designates 216.205.24.124 as permitted sender) client-ip=216.205.24.124; envelope-from=libvir-list-bounces@redhat.com; helo=us-smtp-delivery-124.mimecast.com; Authentication-Results: mx.zohomail.com; spf=pass (zohomail.com: domain of redhat.com designates 216.205.24.124 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=fail(p=quarantine dis=quarantine) header.from=suse.com ARC-Seal: i=1; a=rsa-sha256; t=1622060054; cv=none; d=zohomail.com; s=zohoarc; b=Fnf1M3sn+SOnH/rzMsQGboRAb4eC1EztkhUdG7MnnEzej1C1P2zg4k2zIrLPyjbo6ilvmKwRus+GHFMcNbqlOoVID9pxhx2fwwhMN9XIDavgHArfq/xz6Z85+zEwqECMzEM1spfPHRr19Ad6nv8P10OvFx2OsdutIsS0VUhNL1s= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1622060054; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:Sender:Subject:To; bh=8ZQtKuEJ0N7qASTkH8lcP8PhCt4VHteWi/vGsmuiUQA=; b=FJBrjfJA2iCY5x8WKEv0COGS8yKMDSc1a4ttpqvnKIKtvh8x/38TX+VoJ+yTn5UkiTnIcWl2mpWuSse99rNpTk/9wzEo1VtMQ58OLjdl2Xvnmu0Ljjbj/2wO2jSnwZ6BHuTur6hZrdXFX0REl+MpTWo6JcJBmxBgfUiMCOZ9Q6k= ARC-Authentication-Results: i=1; mx.zohomail.com; spf=pass (zohomail.com: domain of redhat.com designates 216.205.24.124 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=fail header.from= (p=quarantine dis=quarantine) header.from= Return-Path: Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [216.205.24.124]) by mx.zohomail.com with SMTPS id 1622060054902541.2413869384513; Wed, 26 May 2021 13:14:14 -0700 (PDT) Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-551-79RL4wOtO9SFAk5hTNy_Cg-1; Wed, 26 May 2021 16:14:10 -0400 Received: from smtp.corp.redhat.com (int-mx06.intmail.prod.int.phx2.redhat.com [10.5.11.16]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id C3653188E3C2; Wed, 26 May 2021 20:14:02 +0000 (UTC) Received: from colo-mx.corp.redhat.com (colo-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.21]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 569DD5C257; Wed, 26 May 2021 20:14:01 +0000 (UTC) Received: from lists01.pubmisc.prod.ext.phx2.redhat.com (lists01.pubmisc.prod.ext.phx2.redhat.com [10.5.19.33]) by colo-mx.corp.redhat.com (Postfix) with ESMTP id 38BF155351; Wed, 26 May 2021 20:13:58 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx06.intmail.prod.int.rdu2.redhat.com [10.11.54.6]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id 14QKDu06003670 for ; Wed, 26 May 2021 16:13:56 -0400 Received: by smtp.corp.redhat.com (Postfix) id 46EE520E76A6; Wed, 26 May 2021 20:13:56 +0000 (UTC) Received: from mimecast-mx02.redhat.com (mimecast01.extmail.prod.ext.rdu2.redhat.com [10.11.55.17]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 4199020E76B0 for ; Wed, 26 May 2021 20:13:53 +0000 (UTC) Received: from us-smtp-1.mimecast.com (us-smtp-1.mimecast.com [205.139.110.61]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id B5732857D08 for ; Wed, 26 May 2021 20:13:53 +0000 (UTC) Received: from de-smtp-delivery-102.mimecast.com (de-smtp-delivery-102.mimecast.com [194.104.109.102]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-6-15aM0jK4Pker_En00mr-KQ-1; Wed, 26 May 2021 16:13:51 -0400 Received: from EUR05-VI1-obe.outbound.protection.outlook.com (mail-vi1eur05lp2175.outbound.protection.outlook.com [104.47.17.175]) (Using TLS) by relay.mimecast.com with ESMTP id de-mta-17-ZrhPafY0PBSadQgIJTYRgw-1; Wed, 26 May 2021 22:13:49 +0200 Received: from AS8PR04MB7976.eurprd04.prod.outlook.com (2603:10a6:20b:2af::18) by AM6PR04MB4614.eurprd04.prod.outlook.com (2603:10a6:20b:18::23) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4173.20; Wed, 26 May 2021 20:13:48 +0000 Received: from AS8PR04MB7976.eurprd04.prod.outlook.com ([fe80::31c1:7bd3:c311:14d5]) by AS8PR04MB7976.eurprd04.prod.outlook.com ([fe80::31c1:7bd3:c311:14d5%3]) with mapi id 15.20.4173.021; Wed, 26 May 2021 20:13:48 +0000 Received: from linux-tbji.devlab.prv.suse.com (192.150.158.33) by FR3P281CA0072.DEUP281.PROD.OUTLOOK.COM (2603:10a6:d10:4b::23) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4173.12 via Frontend Transport; Wed, 26 May 2021 20:13:46 +0000 X-MC-Unique: 79RL4wOtO9SFAk5hTNy_Cg-1 X-MC-Unique: 15aM0jK4Pker_En00mr-KQ-1 X-MC-Unique: ZrhPafY0PBSadQgIJTYRgw-1 From: Jim Fehlig To: libvir-list@redhat.com Subject: [PATCH V5] libxl: adjust handling of libxl_device_nic objects Date: Wed, 26 May 2021 14:13:23 -0600 Message-ID: <20210526201323.13087-1-jfehlig@suse.com> X-Originating-IP: [192.150.158.33] X-ClientProxiedBy: FR3P281CA0072.DEUP281.PROD.OUTLOOK.COM (2603:10a6:d10:4b::23) To AS8PR04MB7976.eurprd04.prod.outlook.com (2603:10a6:20b:2af::18) MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 954f766e-46d0-423a-07b0-08d92082c546 X-MS-TrafficTypeDiagnostic: AM6PR04MB4614: X-MS-Exchange-Transport-Forked: True X-Microsoft-Antispam-PRVS: X-MS-Oob-TLC-OOBClassifiers: OLM:8273 X-MS-Exchange-SenderADCheck: 1 X-Microsoft-Antispam: BCL:0 X-Microsoft-Antispam-Message-Info: a5H0zYkZck3/6kg59St/9rbkYNfghMT59f16t63mvgnWR9IVATn+NuqgpZOxsXXCloUaMU0xmWHmEStgvz2hE1OiYywKRgZ4sY3EeXzHO8JRZuHrrCp2ffeOO3+oP4r4VBwk/nlqSGyvMkNnEn8FQCmIgFrb2fUQT30TKo+BnaLXN54vI6rtwXceGP5uOsUagaFmV04f43KkQWluPXi8F+hsM7cNCvxWgIRWl4j5ewzjxNPAcePh/ocHp5EiDgIpmOttdib3tBH09lO9YFgy21jDTRaCkPxYUBYCvSip9KJ5w/Fqqybc12QXASR9QG+e9ewCIxj6ZL9g1dcYlVaVV4pfVTVuH2dxyCbf8HMwCdY7pJfxPCOz/4RV8QjucohqvGOFShjL/zC5+5INYeWM41YK0Nr2hO6So6am4G/62P6xHyZZfhrwJtH5VgiiwQEmeGlOgoiKbkVBjw3dwNt+iUkStjP0GGQr3y8Ej6vZvFYIx9o+zQvOQ0rIsuFXc1jOKLCJpzhOYZh2M8LM/CiH6u89Tg76B+1Rj7EO6WEye3ToWaiD61P3WgqGMBA5EVglID1EyVOi6bN32uuM7ISX0DAIYZ/o4BIBrxz4BHcwOaqyfKm9lA2+6vFLjpnsj4muEvsy4iEaeE/YHupi87lUKA== X-Forefront-Antispam-Report: CIP:255.255.255.255; CTRY:; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:AS8PR04MB7976.eurprd04.prod.outlook.com; PTR:; CAT:NONE; SFS:(366004)(396003)(346002)(39830400003)(376002)(52116002)(83380400001)(7696005)(1076003)(26005)(6486002)(86362001)(186003)(6916009)(8936002)(8676002)(16526019)(508600001)(956004)(66476007)(66556008)(107886003)(66946007)(2616005)(36756003)(6666004)(4326008)(38100700002)(5660300002)(2906002)(38350700002); DIR:OUT; SFP:1101 X-MS-Exchange-AntiSpam-MessageData: =?us-ascii?Q?ZTF7owCwml6HAJfsruLajM9dU0oeOxyi8wrTK36MQCZDBfajbuGXXe6C3cew?= =?us-ascii?Q?IbAcBeERgHGS+hl7BjVgYG2IcK0mhqdrV+gwjoorswlAZe6OJGt7G7aswEW0?= =?us-ascii?Q?3SvA4LAUziQKyU2VHgOLn4Gwu9l2lM2B5SBk/IZ8a8ZkZwAO+ex1/wcANGQJ?= =?us-ascii?Q?7zEvD841674cz8fs6VvLBAwJo5jHGxafHBMnZ9EtGAy/7UVUR8lFyfT6apP2?= =?us-ascii?Q?KexzbBarDRb/QSuzlOQA5d1kzCmn7r2+BcP6i+JWsBGiFPAjQJnEyYx17KcM?= =?us-ascii?Q?RTYI7dR8cdpANERGGRqfgfAeafdx+H79x0iZMgLctfeLGi56w3Aif8rgIs0Y?= =?us-ascii?Q?c4Y4OOhkcWprL0Sy7Z1jJxU0PmOlBIlxdV7ukyThpLu5mR91aNPpYdn+UDE3?= =?us-ascii?Q?aiCa36bpR6zE/C7IJZIIjgWuOybVAGiha5HkMwqOq978UBVP3uQXd6za+dM/?= =?us-ascii?Q?dA16hk08cmCZHTdGo6MiQw0wsznm6YwUz6z3cJ3QdsZUTFFyv1rn/cugYumL?= =?us-ascii?Q?y3gAAbf4Z0OHItzYUSPFsMhgsH9NioLucAyvdIM45TqyKhgWN1nIWzsFI4/h?= =?us-ascii?Q?ULLIRdM5Z4EzjT9yN5aaKyt15t4g7TUBhRImmWeXjCpsHHEgq8aIT5VrE/LZ?= =?us-ascii?Q?vu3q4eNMGwF26yCJ+t8MbZjluzbRiCO0qdIXzSja193XPwBMeydyNf1+EUgz?= =?us-ascii?Q?iCmJUsg/sMAXNBMOHPHCGaTVZMqbp6O//7cWClI6HtPeunTz0H2iS6VDqk34?= =?us-ascii?Q?qT74Ui6QBH28RjMORuRs/rwvbFEqMAJtdD5DrS+wgZn0bhJO6gD9Ve2M3AuT?= =?us-ascii?Q?hNYPmSo15rgmKQ1DNY9rSRATp2Wp/t8Isi4AbK5uMsdRIus7ABJv64jeMYx8?= =?us-ascii?Q?TiSjL1PrM2YxlTwkJXbvP+4bD2Cz1OXlCg9hMzk7UEKVNqz5OfLt2pE5TWv+?= =?us-ascii?Q?ebFXklvNaEOv/vhHdVVtTgan/5hwmo8mbQhXrnfP4ZYH5D5IzRgEffngxGRz?= =?us-ascii?Q?36nXE8zOyBphQP2M4hlhKv2YkD1uIIXlKJ3A2Lu4HEDGNC2xX1MMrdZoXHv4?= =?us-ascii?Q?9tD8TKseRb6Rg4Qwwid4rXbohcpCWfHR58XBRSZaSfOPmSaWpVBiinrXpChc?= =?us-ascii?Q?gNtsswayQ2Lg5y7pivrtELiYBHKvJbfi928Z85pUjWFcFNbFo3XTjwabPbuc?= =?us-ascii?Q?L391jv1pM70zr+2Ay2piYDsUntw/BqbK3TdYgOKWcdHHtnRPsc9lRZdncpps?= =?us-ascii?Q?Lfcrb+0B2b3GFzl2aCou/1zmy5NfIM5RPtxFV8zc7o/h+5pCnvh1C+y7vtxg?= =?us-ascii?Q?HTLyELlE350oUNWoebsyicLb?= X-OriginatorOrg: suse.com X-MS-Exchange-CrossTenant-Network-Message-Id: 954f766e-46d0-423a-07b0-08d92082c546 X-MS-Exchange-CrossTenant-AuthSource: AS8PR04MB7976.eurprd04.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 26 May 2021 20:13:48.0360 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: f7a17af6-1c5c-4a36-aa8b-f5be247aa4ba X-MS-Exchange-CrossTenant-MailboxType: HOSTED X-MS-Exchange-CrossTenant-UserPrincipalName: HwXiWtaxBjoI9Q5NrXuok9g0E5YQJP1ghwU2p+VPLq4V+BNq786NOg9AfvMfTMbBQw3dHtBodihPj2dfMCg5Fw== X-MS-Exchange-Transport-CrossTenantHeadersStamped: AM6PR04MB4614 X-Mimecast-Impersonation-Protect: Policy=CLT - Impersonation Protection Definition; Similar Internal Domain=false; Similar Monitored External Domain=false; Custom External Domain=false; Mimecast External Domain=false; Newly Observed Domain=false; Internal User Name=false; Custom Display Name List=false; Reply-to Address Mismatch=false; Targeted Threat Dictionary=false; Mimecast Threat Dictionary=false; Custom Threat Dictionary=false X-Scanned-By: MIMEDefang 2.78 on 10.11.54.6 X-MIME-Autoconverted: from quoted-printable to 8bit by lists01.pubmisc.prod.ext.phx2.redhat.com id 14QKDu06003670 X-loop: libvir-list@redhat.com Cc: olaf@aepfle.de X-BeenThere: libvir-list@redhat.com X-Mailman-Version: 2.1.12 Precedence: junk List-Id: Development discussions about the libvirt library & tools List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: libvir-list-bounces@redhat.com Errors-To: libvir-list-bounces@redhat.com X-Scanned-By: MIMEDefang 2.79 on 10.5.11.16 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=libvir-list-bounces@redhat.com X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" libxl objects are supposed to be initialized and disposed. Adjust libxlMakeNic to use an already initialized object owned by the caller. Adjust libxlMakeNicList to initialize the list of objects, before they are filled by libxlMakeNic. The libxl_domain_config object passed to libxlMakeNicList is owned by the caller and will be disposed with libxl_domain_config_dispose, which also disposes embedded objects such as libxl_device_nic. Signed-off-by: Jim Fehlig Acked-by: Olaf Hering --- src/libxl/libxl_conf.c | 16 ++++++---------- 1 file changed, 6 insertions(+), 10 deletions(-) diff --git a/src/libxl/libxl_conf.c b/src/libxl/libxl_conf.c index 91cebf1498..fc4268db01 100644 --- a/src/libxl/libxl_conf.c +++ b/src/libxl/libxl_conf.c @@ -1313,8 +1313,6 @@ libxlMakeNic(virDomainDef *def, return -1; } =20 - libxl_device_nic_init(x_nic); - virMacAddrGetRaw(&l_nic->mac, x_nic->mac); =20 /* @@ -1502,6 +1500,7 @@ libxlMakeNicList(virDomainDef *def, libxl_domain_con= fig *d_config) size_t nnics =3D def->nnets; libxl_device_nic *x_nics; size_t i, nvnics =3D 0; + int ret =3D -1; =20 x_nics =3D g_new0(libxl_device_nic, nnics); =20 @@ -1509,8 +1508,9 @@ libxlMakeNicList(virDomainDef *def, libxl_domain_con= fig *d_config) if (virDomainNetGetActualType(l_nics[i]) =3D=3D VIR_DOMAIN_NET_TYP= E_HOSTDEV) continue; =20 + libxl_device_nic_init(&x_nics[nvnics]); if (libxlMakeNic(def, l_nics[i], &x_nics[nvnics], false)) - goto error; + goto out; /* * The devid (at least right now) will not get initialized by * libxl in the setup case but is required for starting the @@ -1521,18 +1521,14 @@ libxlMakeNicList(virDomainDef *def, libxl_domain_c= onfig *d_config) =20 nvnics++; } + ret =3D 0; =20 + out: VIR_SHRINK_N(x_nics, nnics, nnics - nvnics); d_config->nics =3D x_nics; d_config->num_nics =3D nvnics; =20 - return 0; - - error: - for (i =3D 0; i < nnics; i++) - libxl_device_nic_dispose(&x_nics[i]); - VIR_FREE(x_nics); - return -1; + return ret; } =20 int --=20 2.31.1