From nobody Tue May 14 15:20:26 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 ARC-Seal: i=1; a=rsa-sha256; t=1621506798; cv=none; d=zohomail.com; s=zohoarc; b=iaUxmIgm946ljz7eA/gSeL5ZKeOZx/Ijjo+mi+DN8cnR5CVKn2KqR7OQVVJhKs/Hr1cC3ysFJpBuIoTnsssnhCmqsNonK0OkQ+Ky1knWDRoiSv4XHd/u7i0ftHV1e42JtwYL6pCFZvKVCMTe0Fk+b1LS232ffv7KN82HBHRVlhQ= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1621506798; 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=6NeSNOzrZ+LFPSUDEmDlF0fcWjmZqPhPFyxca1g/f9Y=; b=ZoIQGK4a+YaZHL05UK2QRj7nVWHM9kAWJ4AXbYqX0cbGxYFmbt9oDgocj+0DQiK7z/EcHmq5i9qxykyhuJniObgFF5MtVSRinH48p50tUR9b6P66uexTQGdgnWjudb940QL/ernrQ4PMxWH8UVza8lrbTp7MKjR+rPrDeOxLa8Q= 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 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 1621506798154855.3302857387191; Thu, 20 May 2021 03:33:18 -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-543-cDqVfkYAN7OZKB4OQgmsZA-1; Thu, 20 May 2021 06:33:14 -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 3FFF51854E2B; Thu, 20 May 2021 10:33:08 +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 18DC95C261; Thu, 20 May 2021 10:33:08 +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 A240A44A5D; Thu, 20 May 2021 10:33:07 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx03.intmail.prod.int.rdu2.redhat.com [10.11.54.3]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id 14KAVf7n021091 for ; Thu, 20 May 2021 06:31:41 -0400 Received: by smtp.corp.redhat.com (Postfix) id 449F710D16C8; Thu, 20 May 2021 10:31:41 +0000 (UTC) Received: from mimecast-mx02.redhat.com (mimecast05.extmail.prod.ext.rdu2.redhat.com [10.11.55.21]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 3FF5D1054FD0 for ; Thu, 20 May 2021 10:31:38 +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 898018339A1 for ; Thu, 20 May 2021 10:31:38 +0000 (UTC) Received: from mo4-p00-ob.smtp.rzone.de (mo4-p00-ob.smtp.rzone.de [85.215.255.21]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-246-1j1ZfG7KNrWBnNnzFzw0lA-1; Thu, 20 May 2021 06:31:36 -0400 Received: from sender by smtp.strato.de (RZmta 47.26.1 AUTH) with ESMTPSA id y090b8x4KAVX1qR (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256 bits)) (Client did not present a certificate); Thu, 20 May 2021 12:31:33 +0200 (CEST) X-MC-Unique: cDqVfkYAN7OZKB4OQgmsZA-1 X-MC-Unique: 1j1ZfG7KNrWBnNnzFzw0lA-1 X-RZG-AUTH: ":P2EQZWCpfu+qG7CngxMFH1J+3q8wa/QXkBR9MXjAuzpIG0mv9coXAgs09ValFcstyKtnZMLOo4jr88Zf5nXI1mYJUK+h" X-RZG-CLASS-ID: mo00 From: Olaf Hering To: libvir-list@redhat.com Subject: [PATCH v3] libxl: adjust handling of libxl_device_nic objects Date: Thu, 20 May 2021 12:31:29 +0200 Message-Id: <20210520103129.14919-1-olaf@aepfle.de> MIME-Version: 1.0 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.3 X-loop: libvir-list@redhat.com Cc: Olaf Hering 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, it is owned by the caller. Adjust libxlMakeNicList to initialize the list of objects, before they are filled by libxlMakeNic. In case of error the objects are disposed by libxl_domain_config_dispose. Signed-off-by: Olaf Hering --- src/libxl/libxl_conf.c | 34 +++++++++++++--------------------- 1 file changed, 13 insertions(+), 21 deletions(-) diff --git a/src/libxl/libxl_conf.c b/src/libxl/libxl_conf.c index f29a28a841..8dc7e26cea 100644 --- a/src/libxl/libxl_conf.c +++ b/src/libxl/libxl_conf.c @@ -1339,8 +1339,6 @@ libxlMakeNic(virDomainDef *def, return -1; } =20 - libxl_device_nic_init(x_nic); - virMacAddrGetRaw(&l_nic->mac, x_nic->mac); =20 /* @@ -1526,39 +1524,33 @@ libxlMakeNicList(virDomainDef *def, libxl_domain_c= onfig *d_config) { virDomainNetDef **l_nics =3D def->nets; size_t nnics =3D def->nnets; - libxl_device_nic *x_nics; size_t i, nvnics =3D 0; =20 - x_nics =3D g_new0(libxl_device_nic, nnics); - for (i =3D 0; i < nnics; i++) { if (virDomainNetGetActualType(l_nics[i]) =3D=3D VIR_DOMAIN_NET_TYP= E_HOSTDEV) continue; + nvnics++; + } + if (!nvnics) + return 0; =20 - if (libxlMakeNic(def, l_nics[i], &x_nics[nvnics], false)) - goto error; + d_config->nics =3D g_new0(libxl_device_nic, nvnics); + d_config->num_nics =3D nvnics; + + for (i =3D 0; i < nvnics; i++) { + libxl_device_nic_init(&d_config->nics[i]); + if (libxlMakeNic(def, l_nics[i], &d_config->nics[i], false)) + return -1; /* * The devid (at least right now) will not get initialized by * libxl in the setup case but is required for starting the * device-model. */ - if (x_nics[nvnics].devid < 0) - x_nics[nvnics].devid =3D nvnics; - - nvnics++; + if (d_config->nics[i].devid < 0) + d_config->nics[i].devid =3D i; } =20 - VIR_SHRINK_N(x_nics, nnics, nnics - nvnics); - d_config->nics =3D x_nics; - d_config->num_nics =3D nvnics; - return 0; - - error: - for (i =3D 0; i < nnics; i++) - libxl_device_nic_dispose(&x_nics[i]); - VIR_FREE(x_nics); - return -1; } =20 int