NuKVM/libvirt
3
0
Fork 0
mirror of https://github.com/libvirt/libvirt.git synced 2025-02-25 18:55:26 -06:00
Code Issues Packages Projects Releases Wiki Activity

conf: net: Rename 'model' to 'modelstr'

Browse Source 
We will be adding a 'model' enum in upcoming patches. Rename
the existing value to make the differentiation clear

Acked-by: Michal Privoznik <mprivozn@redhat.com>
Signed-off-by: Cole Robinson <crobinso@redhat.com>
This commit is contained in:
Cole Robinson 2019-01-18 16:32:22 -05:00
parent 6bf7c67699
commit aa3c9f34bf
2 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
src/conf/domain_conf.c
View File

@ -2325,7 +2325,7 @@ virDomainNetDefClear(virDomainNetDefPtr def)
if (!def) if (!def)
return; return;
VIR_FREE(def->model); VIR_FREE(def->modelstr);
switch (def->type) { switch (def->type) {
case VIR_DOMAIN_NET_TYPE_VHOSTUSER: case VIR_DOMAIN_NET_TYPE_VHOSTUSER:
@ -11619,7 +11619,7 @@ virDomainNetDefParseXML(virDomainXMLOptionPtr xmlopt,
_("Model name contains invalid characters")); _("Model name contains invalid characters"));
goto error; goto error;
} }
VIR_STEAL_PTR(def->model, model); VIR_STEAL_PTR(def->modelstr, model);
} }
switch (def->type) { switch (def->type) {
@ -21824,10 +21824,10 @@ virDomainNetDefCheckABIStability(virDomainNetDefPtr src,
return false; return false;
} }
if (STRNEQ_NULLABLE(src->model, dst->model)) { if (STRNEQ_NULLABLE(src->modelstr, dst->modelstr)) {
virReportError(VIR_ERR_CONFIG_UNSUPPORTED, virReportError(VIR_ERR_CONFIG_UNSUPPORTED,
_("Target network card model %s does not match source %s"), _("Target network card model %s does not match source %s"),
NULLSTR(dst->model), NULLSTR(src->model)); NULLSTR(dst->modelstr), NULLSTR(src->modelstr));
return false; return false;
} }
@ -29480,28 +29480,28 @@ virDomainNetGetActualTrustGuestRxFilters(virDomainNetDefPtr iface)
const char * const char *
virDomainNetGetModelString(const virDomainNetDef *net) virDomainNetGetModelString(const virDomainNetDef *net)
{ {
return net->model; return net->modelstr;
} }
int int
virDomainNetSetModelString(virDomainNetDefPtr net, virDomainNetSetModelString(virDomainNetDefPtr net,
const char *model) const char *model)
{ {
return VIR_STRDUP(net->model, model); return VIR_STRDUP(net->modelstr, model);
} }
int int
virDomainNetStreqModelString(const virDomainNetDef *net, virDomainNetStreqModelString(const virDomainNetDef *net,
const char *model) const char *model)
{ {
return STREQ_NULLABLE(net->model, model); return STREQ_NULLABLE(net->modelstr, model);
} }
int int
virDomainNetStrcaseeqModelString(const virDomainNetDef *net, virDomainNetStrcaseeqModelString(const virDomainNetDef *net,
const char *model) const char *model)
{ {
return net->model && STRCASEEQ(net->model, model); return net->modelstr && STRCASEEQ(net->modelstr, model);
} }
bool bool

2
src/conf/domain_conf.h
View File

@ -898,7 +898,7 @@ struct _virDomainNetDef {
virDomainNetType type; virDomainNetType type;
virMacAddr mac; virMacAddr mac;
bool mac_generated; /* true if mac was *just now* auto-generated by libvirt */ bool mac_generated; /* true if mac was *just now* auto-generated by libvirt */
char *model; char *modelstr;
union { union {
struct { struct {
virDomainNetBackendType name; /* which driver backend to use */ virDomainNetBackendType name; /* which driver backend to use */