From nobody Sun Feb 8 12:31:11 2026 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of redhat.com designates 170.10.129.124 as permitted sender) client-ip=170.10.129.124; envelope-from=libvir-list-bounces@redhat.com; helo=us-smtp-delivery-124.mimecast.com; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 170.10.129.124 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=pass(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1660742852; cv=none; d=zohomail.com; s=zohoarc; b=Tk/rBUjSxIWucFVk8OP0d2+h0ARZz2A0FTji8IbyISngXI1ETaIucNnt99H30oUCnyE4fd1DfrOAYMu0TxsG3LJNEJgqSQ1Wv4YyCP06x7Upj07ErQp5vuYMlJIbdX7brRzsGMUmtrQPyA0i0vbLjIHoDf9ZcTydleLhD+xNDzI= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1660742852; h=Content-Type:Content-Transfer-Encoding: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=rLVNYjilNoXZ5Us1Z0XGxkh0niEzv4/KUgNzRRT/Lb4=; b=Rr2+Ti7CX+zhq2EiRzDtnl0SccwzoxljcnAvS3O/6WOYLNnBCl+ZvtTh7E6ZFCMVBxbM4AoUr+RglQb526fsy1164uaYJgI5Jja2EU53VabMePaZXjtokRybCzoMBxQJuEozhZUu4Uez8+CK2NOn664xH5Nt2EyhJ9TOYIWmXms= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 170.10.129.124 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=pass header.from= (p=none dis=none) Return-Path: Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.129.124]) by mx.zohomail.com with SMTPS id 166074285206953.440707850016224; Wed, 17 Aug 2022 06:27:32 -0700 (PDT) Received: from mimecast-mx02.redhat.com (mimecast-mx02.redhat.com [66.187.233.88]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-97-DTCotTBAPsWaNhSf8an5ZA-1; Wed, 17 Aug 2022 09:27:26 -0400 Received: from smtp.corp.redhat.com (int-mx02.intmail.prod.int.rdu2.redhat.com [10.11.54.2]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id 947631019C91; Wed, 17 Aug 2022 13:27:23 +0000 (UTC) Received: from mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (unknown [10.30.29.100]) by smtp.corp.redhat.com (Postfix) with ESMTP id 80DFD400E726; Wed, 17 Aug 2022 13:27:23 +0000 (UTC) Received: from mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (localhost [IPv6:::1]) by mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (Postfix) with ESMTP id D4D01194E00C; Wed, 17 Aug 2022 13:27:22 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx03.intmail.prod.int.rdu2.redhat.com [10.11.54.3]) by mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (Postfix) with ESMTP id CC0ED1946A40 for ; Wed, 17 Aug 2022 12:50:48 +0000 (UTC) Received: by smtp.corp.redhat.com (Postfix) id B0B77112131B; Wed, 17 Aug 2022 12:50:48 +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 ACFDB1121314 for ; Wed, 17 Aug 2022 12:50:48 +0000 (UTC) Received: from us-smtp-1.mimecast.com (us-smtp-2.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 91F8085A581 for ; Wed, 17 Aug 2022 12:50:48 +0000 (UTC) Received: from mail-ed1-f72.google.com (mail-ed1-f72.google.com [209.85.208.72]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_128_GCM_SHA256) id us-mta-472-MvMeKSrqM5uwgw6oFCBm3Q-1; Wed, 17 Aug 2022 08:50:47 -0400 Received: by mail-ed1-f72.google.com with SMTP id r12-20020a05640251cc00b00440647ec649so8836619edd.21 for ; Wed, 17 Aug 2022 05:50:46 -0700 (PDT) Received: from wheatley.localdomain (nat-pool-brq-t.redhat.com. [213.175.37.10]) by smtp.gmail.com with ESMTPSA id r11-20020aa7d58b000000b00445e1489313sm1140872edq.94.2022.08.17.05.50.43 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 17 Aug 2022 05:50:44 -0700 (PDT) Received: from wheatley.redhat.com (wheatley.k8r.cz [127.0.0.1]) by wheatley.localdomain (Postfix) with ESMTP id 7BCE88F2D64A for ; Wed, 17 Aug 2022 14:50:43 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1660742850; h=from:from:sender:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:mime-version:mime-version: content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references:list-id:list-help: list-unsubscribe:list-subscribe:list-post; bh=rLVNYjilNoXZ5Us1Z0XGxkh0niEzv4/KUgNzRRT/Lb4=; b=Vs/SzRVzyDjhj2sv09NdV+CzHT+dprNtxzhbu+IIKHdc6dbm2qdj8rtujtOOa6YSaM6bi7 4vgK+DcYXLOLgW85ITzhRSaQ5NGWXfGErNJ0JOIW9ji5I0kc3Rd46Ic6VQhAbbxA6CUQWV PuxwZzejNQsax4yOd7Jo0HTCMcS44bU= X-MC-Unique: DTCotTBAPsWaNhSf8an5ZA-1 X-Original-To: libvir-list@listman.corp.redhat.com X-MC-Unique: MvMeKSrqM5uwgw6oFCBm3Q-1 X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:x-gm-message-state:from:to:cc; bh=rLVNYjilNoXZ5Us1Z0XGxkh0niEzv4/KUgNzRRT/Lb4=; b=oZy4PaEqZHmSTxM6hXGHRKlIfCP48pG0jiU56AJnTlUoHwUsDeVqSndHtyjdpuGGQX kMnIseqlZ5ICvyAGYyh0kWj4/63r7RJH8c1pioNrNUwV8gB5q6V9e4zzg6+lDVG7GzAV E1XCSMau8JWrUiY6mkUSUv3eP2Ru8oIBEz6vDo8KBc98sgGR3sjoGbbhr29NtBYHeaP7 8Alx0IrR7Q0bxPPm5lbu6SvpM8O+CoT/jJwH61jM9jduC54kHXyC0IM84iwnDs+IjMLS tPmke2OCbyETiPWud3tfFD8TedVS3+MDRGkMhdu4dVIymQ5f1oL+F3poJeVmTL+bnm0d DZYg== X-Gm-Message-State: ACgBeo1hdg8b6NsDZKZvIpgNDSQKJbVrFRAUqLB/G4EPYZI8gBs5OAFd ZVLvyIDRstxdO60WruavusJUSGqLol9WAjZv8w+RDLwveW3CmzEAhmCDUzBdSTtKG+HgThf+5OO zuGE77lrwK49eriaKJOYecUKD1iucdL4oqKuPKGVyfYer5BfATrj4oy5auybIJalcYjY1pqk= X-Received: by 2002:a17:907:6d8b:b0:730:c160:1f9c with SMTP id sb11-20020a1709076d8b00b00730c1601f9cmr16875385ejc.342.1660740645341; Wed, 17 Aug 2022 05:50:45 -0700 (PDT) X-Google-Smtp-Source: AA6agR4wM9YpVU8gIGNOchLccyOXbMQGW6nw5uYtX6cKw8bg26sO5jIIfGQDR/cMuzPaweBeTQx0kA== X-Received: by 2002:a17:907:6d8b:b0:730:c160:1f9c with SMTP id sb11-20020a1709076d8b00b00730c1601f9cmr16875370ejc.342.1660740645016; Wed, 17 Aug 2022 05:50:45 -0700 (PDT) From: Martin Kletzander To: libvir-list@redhat.com Subject: [PATCH 2/5] conf: Rewrite virNetDevVPortProfileCopy Date: Wed, 17 Aug 2022 14:50:37 +0200 Message-Id: <1e266676d34ef2718af744dc95b875b83eeb16bd.1660740500.git.mkletzan@redhat.com> In-Reply-To: References: MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.78 on 10.11.54.3 X-BeenThere: libvir-list@redhat.com X-Mailman-Version: 2.1.29 Precedence: list List-Id: Development discussions about the libvirt library & tools List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: libvir-list-bounces@redhat.com Sender: "libvir-list" X-Scanned-By: MIMEDefang 2.84 on 10.11.54.2 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @redhat.com) X-ZM-MESSAGEID: 1660742854381100001 Content-Type: text/plain; charset="utf-8"; x-default="true" This makes it nicer to use as since it cannot fail shortens the usage in all callers. Signed-off-by: Martin Kletzander --- src/conf/domain_conf.c | 9 +++------ src/util/virnetdevvportprofile.c | 18 ++++++++++-------- src/util/virnetdevvportprofile.h | 5 +++-- 3 files changed, 16 insertions(+), 16 deletions(-) diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c index 7764b1054d6f..0cfbe22dc099 100644 --- a/src/conf/domain_conf.c +++ b/src/conf/domain_conf.c @@ -29348,8 +29348,7 @@ virDomainNetDefToNetworkPort(virDomainDef *dom, =20 memcpy(&port->mac, &iface->mac, VIR_MAC_BUFLEN); =20 - if (virNetDevVPortProfileCopy(&port->virtPortProfile, iface->virtPortP= rofile) < 0) - return NULL; + port->virtPortProfile =3D virNetDevVPortProfileCopy(iface->virtPortPro= file); =20 if (virNetDevBandwidthCopy(&port->bandwidth, iface->bandwidth) < 0) return NULL; @@ -29448,8 +29447,7 @@ virDomainNetDefActualFromNetworkPort(virDomainNetDe= f *iface, goto error; } =20 - if (virNetDevVPortProfileCopy(&actual->virtPortProfile, port->virtPort= Profile) < 0) - goto error; + actual->virtPortProfile =3D virNetDevVPortProfileCopy(port->virtPortPr= ofile); =20 if (virNetDevBandwidthCopy(&actual->bandwidth, port->bandwidth) < 0) goto error; @@ -29589,8 +29587,7 @@ virDomainNetDefActualToNetworkPort(virDomainDef *do= m, return NULL; } =20 - if (virNetDevVPortProfileCopy(&port->virtPortProfile, actual->virtPort= Profile) < 0) - return NULL; + port->virtPortProfile =3D virNetDevVPortProfileCopy(actual->virtPortPr= ofile); =20 if (virNetDevBandwidthCopy(&port->bandwidth, actual->bandwidth) < 0) return NULL; diff --git a/src/util/virnetdevvportprofile.c b/src/util/virnetdevvportprof= ile.c index 88c34879525e..ae23f795b25a 100644 --- a/src/util/virnetdevvportprofile.c +++ b/src/util/virnetdevvportprofile.c @@ -122,16 +122,18 @@ virNetDevVPortProfileEqual(const virNetDevVPortProfil= e *a, const virNetDevVPortP } =20 =20 -int virNetDevVPortProfileCopy(virNetDevVPortProfile **dst, const virNetDev= VPortProfile *src) +virNetDevVPortProfile * +virNetDevVPortProfileCopy(const virNetDevVPortProfile *src) { - if (!src) { - *dst =3D NULL; - return 0; - } + virNetDevVPortProfile *ret =3D NULL; =20 - *dst =3D g_new0(virNetDevVPortProfile, 1); - memcpy(*dst, src, sizeof(*src)); - return 0; + if (!src) + return NULL; + + ret =3D g_new0(virNetDevVPortProfile, 1); + memcpy(ret, src, sizeof(*ret)); + + return ret; } =20 =20 diff --git a/src/util/virnetdevvportprofile.h b/src/util/virnetdevvportprof= ile.h index e7a93e23a4f5..600b2093c507 100644 --- a/src/util/virnetdevvportprofile.h +++ b/src/util/virnetdevvportprofile.h @@ -77,8 +77,9 @@ struct _virNetDevVPortProfile { =20 bool virNetDevVPortProfileEqual(const virNetDevVPortProfile *a, const virNetDevVPortProfile *b); -int virNetDevVPortProfileCopy(virNetDevVPortProfile **dst, - const virNetDevVPortProfile *src); + +virNetDevVPortProfile * +virNetDevVPortProfileCopy(const virNetDevVPortProfile *src); =20 int virNetDevVPortProfileCheckComplete(virNetDevVPortProfile *virtport, bool generateMissing); --=20 2.37.2