From nobody Tue May 7 21:53:53 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of redhat.com designates 63.128.21.124 as permitted sender) client-ip=63.128.21.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 63.128.21.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=1604346964; cv=none; d=zohomail.com; s=zohoarc; b=SJJjW60MYuH7/67fVYaY6S9xEmhV8dKxoxd1UtbJcYvZ4WPMswr+KojqEHumm1cH3bibXo5kgcxRuOpyIFbJ0nwMCUja2L+2mg7TjU11NAmDQI6rgbBduBVnvvEQ+6TJS5LV2AWEZOduEo0oZECHTdG2QlUbJNLSUX/s9J8NskQ= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1604346964; h=Content-Type:Content-Transfer-Encoding:Date:From:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:Sender:Subject:To; bh=zeBZN/wW0DaSYPI1dQQs7JzGnBbyzm6txmmVo27KZyE=; b=OMRSbcwDIw9Rhi+tauS3qxeRC3bsTJwqyJYCIsA93MPWaUHfGT+49NBev6nWaM+sf0kmMIMuNLg6uDYTvlTRx/KW072It22LTSeaxvE7XMZGtF8Ef4yUT3SWIM6fUayW9Q7uLTwjyKbcdIoup+86I3V7KA6FBaY6l/HXbXV2Reo= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 63.128.21.124 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=pass header.from= (p=none dis=none) header.from= Return-Path: Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [63.128.21.124]) by mx.zohomail.com with SMTPS id 1604346964089918.5836106827921; Mon, 2 Nov 2020 11:56:04 -0800 (PST) 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-500-GwiHF61KPiSROz6WRVPNLQ-1; Mon, 02 Nov 2020 14:56:00 -0500 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 229451074640; Mon, 2 Nov 2020 19:55:55 +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 01B0D5C5BB; Mon, 2 Nov 2020 19:55:54 +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 DD34B181A06B; Mon, 2 Nov 2020 19:55:52 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx06.intmail.prod.int.phx2.redhat.com [10.5.11.16]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id 0A2Jtq3B003030 for ; Mon, 2 Nov 2020 14:55:52 -0500 Received: by smtp.corp.redhat.com (Postfix) id 15E985C3E0; Mon, 2 Nov 2020 19:55:52 +0000 (UTC) Received: from localhost.localdomain (unknown [10.40.193.124]) by smtp.corp.redhat.com (Postfix) with ESMTP id 88E415C5BB for ; Mon, 2 Nov 2020 19:55:48 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1604346963; 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:list-id:list-help: list-unsubscribe:list-subscribe:list-post; bh=zeBZN/wW0DaSYPI1dQQs7JzGnBbyzm6txmmVo27KZyE=; b=GVxJpTcuxAY+1Ba6kiZcxX87eHlH8JjEFHEFiu/YBJCyF+Or7i5N3zc1QBOi7gc4Bhgcyl 7c3mB5hvf8CHurzAWHdm7MinSc8PDIgcsAlRjFrpjNNRDPu2L+VL822wmyUPu9yPzgSffi ZD+ejXyi1g021eh9HMC+QnD3LSfudbk= X-MC-Unique: GwiHF61KPiSROz6WRVPNLQ-1 From: Michal Privoznik To: libvir-list@redhat.com Subject: [PATCH] virDomainNetDefParseXML: Fix error message for unknown value of //mac/@type Date: Mon, 2 Nov 2020 20:55:46 +0100 Message-Id: MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.16 X-loop: libvir-list@redhat.com 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 X-ZohoMail-DKIM: pass (identity @redhat.com) Content-Type: text/plain; charset="utf-8" In v6.6.0-rc1~124 we've introduced a new mechanism for MAC addresses for ESX: ignore all checks (type=3D'static') that libvirt or ESX would do (and possibly fail) for specified MAC address. Accepted values for the @type attribute are "generated" and "static". But the error message mentions a different attribute. Fixes 454e5961abf40c14f8b6d7ee216229e68fd170bf Resolves: https://bugzilla.redhat.com/show_bug.cgi?id=3D1892130 Signed-off-by: Michal Privoznik --- Pushed as trivial. src/conf/domain_conf.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c index f4f017cf83..b47f43afd9 100644 --- a/src/conf/domain_conf.c +++ b/src/conf/domain_conf.c @@ -12248,7 +12248,7 @@ virDomainNetDefParseXML(virDomainXMLOptionPtr xmlop= t, int tmp; if ((tmp =3D virDomainNetMacTypeTypeFromString(macaddr_type)) <=3D= 0) { virReportError(VIR_ERR_XML_ERROR, - _("invalid mac address check value: '%s'. Valid= " + _("invalid mac address type value: '%s'. Valid " "values are \"generated\" and \"static\"."), macaddr_type); goto error; --=20 2.26.2