From nobody Sun Feb 8 10:03:12 2026 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; dmarc=pass(p=none dis=none) header.from=redhat.com Return-Path: Received: from mx1.redhat.com (mx1.redhat.com [209.132.183.28]) by mx.zohomail.com with SMTPS id 1547852766084563.16919916236; Fri, 18 Jan 2019 15:06:06 -0800 (PST) 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 078E67D0D3; Fri, 18 Jan 2019 23:06:04 +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 BBF9E5D757; Fri, 18 Jan 2019 23:06:03 +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 33C553F606; Fri, 18 Jan 2019 23:06:03 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.11]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id x0IN5Z6A008645 for ; Fri, 18 Jan 2019 18:05:35 -0500 Received: by smtp.corp.redhat.com (Postfix) id 071DC600CC; Fri, 18 Jan 2019 23:05:35 +0000 (UTC) Received: from worklaptop.redhat.com (ovpn-125-139.rdu2.redhat.com [10.10.125.139]) by smtp.corp.redhat.com (Postfix) with ESMTP id 81BC5600D6; Fri, 18 Jan 2019 23:05:34 +0000 (UTC) From: Cole Robinson To: libvirt-list@redhat.com Date: Fri, 18 Jan 2019 18:05:21 -0500 Message-Id: In-Reply-To: References: MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.11 X-loop: libvir-list@redhat.com Subject: [libvirt] [PATCH 03/10] conf: net: Rename 'model' to 'modelstr' 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: , 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.26]); Fri, 18 Jan 2019 23:06:05 +0000 (UTC) Content-Type: text/plain; charset="utf-8" We will be adding a 'model' enum in upcoming patches. Rename the existing value to make the differentiation clear Signed-off-by: Cole Robinson --- src/conf/domain_conf.c | 16 ++++++++-------- src/conf/domain_conf.h | 2 +- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c index 778b842979..25fbf6f64b 100644 --- a/src/conf/domain_conf.c +++ b/src/conf/domain_conf.c @@ -2120,7 +2120,7 @@ virDomainNetDefClear(virDomainNetDefPtr def) if (!def) return; =20 - VIR_FREE(def->model); + VIR_FREE(def->modelstr); =20 switch (def->type) { case VIR_DOMAIN_NET_TYPE_VHOSTUSER: @@ -11402,7 +11402,7 @@ virDomainNetDefParseXML(virDomainXMLOptionPtr xmlop= t, _("Model name contains invalid characters")); goto error; } - def->model =3D model; + def->modelstr =3D model; model =3D NULL; } =20 @@ -21971,10 +21971,10 @@ virDomainNetDefCheckABIStability(virDomainNetDefP= tr src, return false; } =20 - if (STRNEQ_NULLABLE(src->model, dst->model)) { + if (STRNEQ_NULLABLE(src->modelstr, dst->modelstr)) { virReportError(VIR_ERR_CONFIG_UNSUPPORTED, _("Target network card model %s does not match sour= ce %s"), - NULLSTR(dst->model), NULLSTR(src->model)); + NULLSTR(dst->modelstr), NULLSTR(src->modelstr)); return false; } =20 @@ -29841,28 +29841,28 @@ virDomainNetGetActualTrustGuestRxFilters(virDomai= nNetDefPtr iface) const char * virDomainNetGetModelString(const virDomainNetDef *iface) { - return iface->model; + return iface->modelstr; } =20 int virDomainNetSetModelString(virDomainNetDefPtr iface, const char *model) { - return VIR_STRDUP(iface->model, model); + return VIR_STRDUP(iface->modelstr, model); } =20 int virDomainNetStreqModelString(const virDomainNetDef *iface, const char *model) { - return STREQ_NULLABLE(iface->model, model); + return STREQ_NULLABLE(iface->modelstr, model); } =20 int virDomainNetStrcaseeqModelString(const virDomainNetDef *iface, const char *model) { - return iface->model && STRCASEEQ(iface->model, model); + return iface->modelstr && STRCASEEQ(iface->modelstr, model); } =20 bool diff --git a/src/conf/domain_conf.h b/src/conf/domain_conf.h index 8f856c2d14..5400deda4c 100644 --- a/src/conf/domain_conf.h +++ b/src/conf/domain_conf.h @@ -1021,7 +1021,7 @@ struct _virDomainNetDef { virDomainNetType type; virMacAddr mac; bool mac_generated; /* true if mac was *just now* auto-generated by li= bvirt */ - char *model; + char *modelstr; union { struct { virDomainNetBackendType name; /* which driver backend to use */ --=20 2.20.1 -- libvir-list mailing list libvir-list@redhat.com https://www.redhat.com/mailman/listinfo/libvir-list