From nobody Sun Feb 8 20:37:55 2026 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of lists.libvirt.org designates 8.43.85.245 as permitted sender) client-ip=8.43.85.245; envelope-from=devel-bounces@lists.libvirt.org; helo=lists.libvirt.org; Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of lists.libvirt.org designates 8.43.85.245 as permitted sender) smtp.mailfrom=devel-bounces@lists.libvirt.org; dmarc=pass(p=reject dis=none) header.from=lists.libvirt.org ARC-Seal: i=1; a=rsa-sha256; t=1770386169; cv=none; d=zohomail.com; s=zohoarc; b=T2dVQqNEXkJrN475Jax4HfWInmP/cqoMRucNB59IY/Pm5r1/KE/lkbDStMhEy5GGB4S7kW/dtzm1JCXnThnrTv7uUhoHowy+hs438tNEEP6Yq5HPMCswGw6ZQ6ylHZlWROQkq2D136kN40KjcawjaABS0iWrq2s72HluT/AwxWI= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1770386169; h=Content-Type:Content-Transfer-Encoding:Date:Date:From:From:In-Reply-To:List-Subscribe:List-Post:List-Owner:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:Reply-To:Reply-To:References:Subject:Subject:To:To:Message-Id:Cc; bh=MMv3TbRzSb0U/auVwjYyshvg9EwnU0SaD8x5MjyT4/Y=; b=IVOagk7GBSLHz0iGVFciIaP9TY5MJm3TukvDQI43Nk0aARHihOxzm5PdR462WBCMNIhEjdPSbA/+Sn/8Jcc6qJMuASoKC7YPrsWkbYSNhZdO4sFMR6tRw04WCCG8BTbmWgXL8ZM8/Ys7H/Iu1D8lC9qxG4oQ6USZPTF7XY1Y8m8= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of lists.libvirt.org designates 8.43.85.245 as permitted sender) smtp.mailfrom=devel-bounces@lists.libvirt.org; dmarc=pass header.from= (p=reject dis=none) Return-Path: Received: from lists.libvirt.org (lists.libvirt.org [8.43.85.245]) by mx.zohomail.com with SMTPS id 1770386169456665.6197926674691; Fri, 6 Feb 2026 05:56:09 -0800 (PST) Received: by lists.libvirt.org (Postfix, from userid 993) id 8658541826; Fri, 6 Feb 2026 08:56:08 -0500 (EST) Received: from [172.19.199.6] (lists.libvirt.org [8.43.85.245]) by lists.libvirt.org (Postfix) with ESMTP id 485A343E0C; Fri, 6 Feb 2026 08:52:55 -0500 (EST) Received: by lists.libvirt.org (Postfix, from userid 993) id AF15941A97; Fri, 6 Feb 2026 08:52:48 -0500 (EST) Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.133.124]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (3072 bits) server-digest SHA256) (No client certificate requested) by lists.libvirt.org (Postfix) with ESMTPS id 92BCA3FBC9 for ; Fri, 6 Feb 2026 08:52:46 -0500 (EST) Received: from mx-prod-mc-03.mail-002.prod.us-west-2.aws.redhat.com (ec2-54-186-198-63.us-west-2.compute.amazonaws.com [54.186.198.63]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-6-uqvg3TVfOOmTpHaljKAj3Q-1; Fri, 06 Feb 2026 08:52:45 -0500 Received: from mx-prod-int-08.mail-002.prod.us-west-2.aws.redhat.com (mx-prod-int-08.mail-002.prod.us-west-2.aws.redhat.com [10.30.177.111]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by mx-prod-mc-03.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTPS id 347401955F27 for ; Fri, 6 Feb 2026 13:52:44 +0000 (UTC) Received: from moe (unknown [10.43.3.236]) by mx-prod-int-08.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTP id 91B801800465 for ; Fri, 6 Feb 2026 13:52:43 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 4.0.1 (2024-03-26) on lists.libvirt.org X-Spam-Level: X-Spam-Status: No, score=-5.0 required=5.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,MAILING_LIST_MULTI,RCVD_IN_DNSWL_MED, RCVD_IN_VALIDITY_CERTIFIED_BLOCKED,RCVD_IN_VALIDITY_RPBL_BLOCKED, RCVD_IN_VALIDITY_SAFE_BLOCKED,SPF_PASS autolearn=unavailable autolearn_force=no version=4.0.1 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1770385966; h=from:from: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; bh=MMv3TbRzSb0U/auVwjYyshvg9EwnU0SaD8x5MjyT4/Y=; b=XlQJ4dCjJ0LnU8sRcO1h9pWj4mnYynnJfgIr4Sok++npftShH2wHybZ4mDATDCypxBXjjz kKreeEz9JAHtkZ/NpqWwV/1FpjQDZfJlFdi9cS7aDUh+ay3PCRT0q+WIaPHtu5e1Q4WuMT yU1HyJbje1zJZK61nVxY/H3xnKQvQHQ= X-MC-Unique: uqvg3TVfOOmTpHaljKAj3Q-1 X-Mimecast-MFC-AGG-ID: uqvg3TVfOOmTpHaljKAj3Q_1770385964 To: devel@lists.libvirt.org Subject: [PATCH 3/4] hyperv: Move MAC parsing into a separate function Date: Fri, 6 Feb 2026 14:52:36 +0100 Message-ID: <9a9b0e656db21ef4f54a42999fa9f38e5f2f6349.1770385874.git.mprivozn@redhat.com> In-Reply-To: References: MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.4.1 on 10.30.177.111 X-Mimecast-Spam-Score: 0 X-Mimecast-MFC-PROC-ID: KHGEO5AkvTNJkA37ZNcsBY4OR1kPhVsIuysb0qsfm2Y_1770385964 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: quoted-printable Message-ID-Hash: WWCNG4XKF6MNVDE473UUDKGZ65IYOM2Q X-Message-ID-Hash: WWCNG4XKF6MNVDE473UUDKGZ65IYOM2Q X-MailFrom: mprivozn@redhat.com X-Mailman-Rule-Misses: dmarc-mitigation; no-senders; approved; loop; banned-address; header-match-devel.lists.libvirt.org-0; emergency; member-moderation; nonmember-moderation; administrivia; implicit-dest; max-recipients; max-size; news-moderation; no-subject; digests; suspicious-header X-Mailman-Version: 3.3.10 Precedence: list List-Id: Development discussions about the libvirt library & tools Archived-At: List-Archive: List-Help: List-Owner: List-Post: List-Subscribe: List-Unsubscribe: From: Michal Privoznik via Devel Reply-To: Michal Privoznik X-ZohoMail-DKIM: fail (Header signature does not verify) X-ZM-MESSAGEID: 1770386171818158500 Content-Type: text/plain; charset="utf-8"; x-default="true" From: Michal Privoznik When constructing a domain definition, NICs are fetched from WMI and their MAC addresses are then parsed. Move this code into a separate function so that it can be reused later. Signed-off-by: Michal Privoznik --- src/hyperv/hyperv_driver.c | 59 ++++++++++++++++++++++---------------- 1 file changed, 34 insertions(+), 25 deletions(-) diff --git a/src/hyperv/hyperv_driver.c b/src/hyperv/hyperv_driver.c index 8dd56f39dc..fbc76544df 100644 --- a/src/hyperv/hyperv_driver.c +++ b/src/hyperv/hyperv_driver.c @@ -1550,18 +1550,48 @@ hypervDomainDefParseSerial(virDomainDef *def, Msvm_= ResourceAllocationSettingData } =20 =20 +static int +hypervDomainDefParseEthernetAdapterMAC(hypervPrivate *priv, + Msvm_EthernetPortAllocationSettingD= ata *net, + virMacAddr *mac) +{ + g_autoptr(Msvm_SyntheticEthernetPortSettingData) sepsd =3D NULL; + char *sepsdPATH =3D NULL; + g_autofree char *sepsdEscaped =3D NULL; + g_auto(virBuffer) query =3D VIR_BUFFER_INITIALIZER; + + sepsdPATH =3D net->data->Parent; + sepsdEscaped =3D virStringReplace(sepsdPATH, "\\", "\\\\"); + virBufferAsprintf(&query, + MSVM_SYNTHETICETHERNETPORTSETTINGDATA_WQL_SELECT "WH= ERE __PATH =3D '%s'", + sepsdEscaped); + + if (hypervGetWmiClass(Msvm_SyntheticEthernetPortSettingData, &sepsd) <= 0) + return -1; + + if (!sepsd) { + virReportError(VIR_ERR_INTERNAL_ERROR, "%s", _("Could not retrieve= NIC settings")); + return -1; + } + + /* set mac address */ + if (virMacAddrParseHex(sepsd->data->Address, mac) < 0) + return -1; + + return 0; +} + + static int hypervDomainDefParseEthernetAdapter(virDomainDef *def, Msvm_EthernetPortAllocationSettingData= *net, hypervPrivate *priv) { g_autoptr(virDomainNetDef) ndef =3D g_new0(virDomainNetDef, 1); - g_autoptr(Msvm_SyntheticEthernetPortSettingData) sepsd =3D NULL; g_autoptr(Msvm_VirtualEthernetSwitch) vSwitch =3D NULL; char **switchConnection =3D NULL; g_autofree char *switchConnectionEscaped =3D NULL; - char *sepsdPATH =3D NULL; - g_autofree char *sepsdEscaped =3D NULL; + g_autofree char *sepsdInstanceIDEscaped =3D NULL; g_auto(virBuffer) query =3D VIR_BUFFER_INITIALIZER; =20 VIR_DEBUG("Parsing ethernet adapter '%s'", net->data->InstanceID); @@ -1580,28 +1610,7 @@ hypervDomainDefParseEthernetAdapter(virDomainDef *de= f, return 0; } =20 - /* - * Now we retrieve the associated Msvm_SyntheticEthernetPortSettingDat= a and - * Msvm_VirtualEthernetSwitch objects and use them to build the XML de= finition. - */ - - /* begin by getting the Msvm_SyntheticEthernetPortSettingData object */ - sepsdPATH =3D net->data->Parent; - sepsdEscaped =3D virStringReplace(sepsdPATH, "\\", "\\\\"); - virBufferAsprintf(&query, - MSVM_SYNTHETICETHERNETPORTSETTINGDATA_WQL_SELECT "WH= ERE __PATH =3D '%s'", - sepsdEscaped); - - if (hypervGetWmiClass(Msvm_SyntheticEthernetPortSettingData, &sepsd) <= 0) - return -1; - - if (!sepsd) { - virReportError(VIR_ERR_INTERNAL_ERROR, "%s", _("Could not retrieve= NIC settings")); - return -1; - } - - /* set mac address */ - if (virMacAddrParseHex(sepsd->data->Address, &ndef->mac) < 0) + if (hypervDomainDefParseEthernetAdapterMAC(priv, net, &ndef->mac) < 0) return -1; =20 /* now we get the Msvm_VirtualEthernetSwitch */ --=20 2.52.0