mirror of https://gitee.com/openkylin/libvirt.git
util: add name attribute to virFirewall
This will be used to label (via "name='blah'") a firewall when it is formatted to XML and written to the network status. Signed-off-by: Laine Stump <laine@redhat.com> Reviewed-by: Daniel P. Berrangé <berrange@redhat.com>
This commit is contained in:
parent
e1b6b0646f
commit
d24b7501dc
|
@ -2417,8 +2417,10 @@ virFirewallCmdGetArgCount;
|
||||||
virFirewallCmdToString;
|
virFirewallCmdToString;
|
||||||
virFirewallFree;
|
virFirewallFree;
|
||||||
virFirewallGetBackend;
|
virFirewallGetBackend;
|
||||||
|
virFirewallGetName;
|
||||||
virFirewallNew;
|
virFirewallNew;
|
||||||
virFirewallRemoveCmd;
|
virFirewallRemoveCmd;
|
||||||
|
virFirewallSetName;
|
||||||
virFirewallStartRollback;
|
virFirewallStartRollback;
|
||||||
virFirewallStartTransaction;
|
virFirewallStartTransaction;
|
||||||
|
|
||||||
|
|
|
@ -78,6 +78,7 @@ struct _virFirewallGroup {
|
||||||
struct _virFirewall {
|
struct _virFirewall {
|
||||||
int err;
|
int err;
|
||||||
|
|
||||||
|
char *name;
|
||||||
size_t ngroups;
|
size_t ngroups;
|
||||||
virFirewallGroup **groups;
|
virFirewallGroup **groups;
|
||||||
size_t currentGroup;
|
size_t currentGroup;
|
||||||
|
@ -119,6 +120,22 @@ virFirewallGetBackend(virFirewall *firewall)
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
const char *
|
||||||
|
virFirewallGetName(virFirewall *firewall)
|
||||||
|
{
|
||||||
|
return firewall->name;
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
|
void
|
||||||
|
virFirewallSetName(virFirewall *firewall,
|
||||||
|
const char *name)
|
||||||
|
{
|
||||||
|
g_free(firewall->name);
|
||||||
|
firewall->name = g_strdup(name);
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
static void
|
static void
|
||||||
virFirewallCmdFree(virFirewallCmd *fwCmd)
|
virFirewallCmdFree(virFirewallCmd *fwCmd)
|
||||||
{
|
{
|
||||||
|
@ -169,8 +186,9 @@ void virFirewallFree(virFirewall *firewall)
|
||||||
|
|
||||||
for (i = 0; i < firewall->ngroups; i++)
|
for (i = 0; i < firewall->ngroups; i++)
|
||||||
virFirewallGroupFree(firewall->groups[i]);
|
virFirewallGroupFree(firewall->groups[i]);
|
||||||
g_free(firewall->groups);
|
|
||||||
|
|
||||||
|
g_free(firewall->groups);
|
||||||
|
g_free(firewall->name);
|
||||||
g_free(firewall);
|
g_free(firewall);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -46,6 +46,8 @@ VIR_ENUM_DECL(virFirewallBackend);
|
||||||
virFirewall *virFirewallNew(virFirewallBackend backend);
|
virFirewall *virFirewallNew(virFirewallBackend backend);
|
||||||
void virFirewallFree(virFirewall *firewall);
|
void virFirewallFree(virFirewall *firewall);
|
||||||
virFirewallBackend virFirewallGetBackend(virFirewall *firewall);
|
virFirewallBackend virFirewallGetBackend(virFirewall *firewall);
|
||||||
|
const char *virFirewallGetName(virFirewall *firewall);
|
||||||
|
void virFirewallSetName(virFirewall *firewall, const char *name);
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* virFirewallAddCmd:
|
* virFirewallAddCmd:
|
||||||
|
|
Loading…
Reference in New Issue