From nobody Thu May 15 21:24:18 2025 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of redhat.com designates 209.132.183.28 as permitted sender) client-ip=209.132.183.28; envelope-from=libvir-list-bounces@redhat.com; helo=mx1.redhat.com; Authentication-Results: mx.zohomail.com; spf=pass (zoho.com: domain of redhat.com designates 209.132.183.28 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com Return-Path: Received: from mx1.redhat.com (mx1.redhat.com [209.132.183.28]) by mx.zohomail.com with SMTPS id 150694353988846.641701119611184; Mon, 2 Oct 2017 04:25:39 -0700 (PDT) Received: from smtp.corp.redhat.com (int-mx05.intmail.prod.int.phx2.redhat.com [10.5.11.15]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 60719C04AC66; Mon, 2 Oct 2017 11:25:38 +0000 (UTC) Received: from colo-mx.corp.redhat.com (colo-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.20]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 37A425EDE2; Mon, 2 Oct 2017 11:25:38 +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 D4BF018355C4; Mon, 2 Oct 2017 11:25:37 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.12]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id v92B1VG6012885 for ; Mon, 2 Oct 2017 07:01:31 -0400 Received: by smtp.corp.redhat.com (Postfix) id 8D5768E7A2; Mon, 2 Oct 2017 11:01:31 +0000 (UTC) Received: from moe.brq.redhat.com (unknown [10.43.2.192]) by smtp.corp.redhat.com (Postfix) with ESMTP id 1523F8E7A4 for ; Mon, 2 Oct 2017 11:01:30 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mx1.redhat.com 60719C04AC66 Authentication-Results: ext-mx07.extmail.prod.ext.phx2.redhat.com; dmarc=none (p=none dis=none) header.from=redhat.com Authentication-Results: ext-mx07.extmail.prod.ext.phx2.redhat.com; spf=fail smtp.mailfrom=libvir-list-bounces@redhat.com From: Michal Privoznik To: libvir-list@redhat.com Date: Mon, 2 Oct 2017 13:01:19 +0200 Message-Id: <44ddc80e05caca6a621e6866939cf75c2c90a213.1506941768.git.mprivozn@redhat.com> In-Reply-To: References: In-Reply-To: References: X-Scanned-By: MIMEDefang 2.79 on 10.5.11.12 X-loop: libvir-list@redhat.com Subject: [libvirt] [PATCH 2/3] virmacaddr: Track if MAC address is autogenerated 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: , MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Sender: libvir-list-bounces@redhat.com Errors-To: libvir-list-bounces@redhat.com X-Scanned-By: MIMEDefang 2.79 on 10.5.11.15 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.31]); Mon, 02 Oct 2017 11:25:39 +0000 (UTC) X-ZohoMail: RSF_0 Z_629925259 SPT_0 Content-Type: text/plain; charset="utf-8" It will come handy to know if the MAC address was generated (e.g. during XML parse) or if it was parsed since provided by user in the XML. Signed-off-by: Michal Privoznik Reviewed-by: Erik Skultety --- src/util/virmacaddr.c | 5 +++++ src/util/virmacaddr.h | 2 ++ tests/bhyveargv2xmlmock.c | 1 + tests/bhyvexml2argvmock.c | 1 + 4 files changed, 9 insertions(+) diff --git a/src/util/virmacaddr.c b/src/util/virmacaddr.c index 7afe032b9..409fdc34d 100644 --- a/src/util/virmacaddr.c +++ b/src/util/virmacaddr.c @@ -107,6 +107,7 @@ void virMacAddrSet(virMacAddrPtr dst, const virMacAddr *src) { memcpy(dst, src, sizeof(*src)); + dst->generated =3D false; } =20 /** @@ -120,6 +121,7 @@ void virMacAddrSetRaw(virMacAddrPtr dst, const unsigned char src[VIR_MAC_BUFLEN= ]) { memcpy(dst->addr, src, VIR_MAC_BUFLEN); + dst->generated =3D false; } =20 /** @@ -149,6 +151,7 @@ virMacAddrParse(const char* str, virMacAddrPtr addr) { size_t i; =20 + addr->generated =3D false; errno =3D 0; for (i =3D 0; i < VIR_MAC_BUFLEN; i++) { char *end_ptr; @@ -217,6 +220,7 @@ virMacAddrParseHex(const char *str, virMacAddrPtr addr) str[VIR_MAC_HEXLEN]) return -1; =20 + addr->generated =3D false; for (i =3D 0; i < VIR_MAC_BUFLEN; i++) addr->addr[i] =3D (virHexToBin(str[2 * i]) << 4 | virHexToBin(str[2 * i + 1])); @@ -232,6 +236,7 @@ void virMacAddrGenerate(const unsigned char prefix[VIR_= MAC_PREFIX_BUFLEN], addr->addr[3] =3D virRandomBits(8); addr->addr[4] =3D virRandomBits(8); addr->addr[5] =3D virRandomBits(8); + addr->generated =3D true; } =20 /* The low order bit of the first byte is the "multicast" bit. */ diff --git a/src/util/virmacaddr.h b/src/util/virmacaddr.h index f4f5e2ce1..ef4285d63 100644 --- a/src/util/virmacaddr.h +++ b/src/util/virmacaddr.h @@ -36,6 +36,8 @@ typedef virMacAddr *virMacAddrPtr; =20 struct _virMacAddr { unsigned char addr[VIR_MAC_BUFLEN]; + bool generated; /* True if MAC address was autogenerated, + false otherwise. */ }; =20 int virMacAddrCompare(const char *mac1, const char *mac2); diff --git a/tests/bhyveargv2xmlmock.c b/tests/bhyveargv2xmlmock.c index 1f08bebb7..dd25f4e13 100644 --- a/tests/bhyveargv2xmlmock.c +++ b/tests/bhyveargv2xmlmock.c @@ -16,6 +16,7 @@ virMacAddrGenerate(const unsigned char prefix[VIR_MAC_PRE= FIX_BUFLEN], addr->addr[3] =3D 0; addr->addr[4] =3D 0; addr->addr[5] =3D 0; + addr->generated =3D true; } =20 int diff --git a/tests/bhyvexml2argvmock.c b/tests/bhyvexml2argvmock.c index 7afa0e34c..bec7f902a 100644 --- a/tests/bhyvexml2argvmock.c +++ b/tests/bhyvexml2argvmock.c @@ -17,6 +17,7 @@ void virMacAddrGenerate(const unsigned char prefix[VIR_MA= C_PREFIX_BUFLEN], addr->addr[3] =3D 0; addr->addr[4] =3D 0; addr->addr[5] =3D 0; + addr->generated =3D true; } =20 int virNetDevTapCreateInBridgePort(const char *brname ATTRIBUTE_UNUSED, --=20 2.13.5 -- libvir-list mailing list libvir-list@redhat.com https://www.redhat.com/mailman/listinfo/libvir-list