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>

diff --git a/src/libvirt_private.syms b/src/libvirt_private.syms
index 893859caba4768f14a6651dea16d87af21bbc8ac..9897caea213a6ffa0010d3d6b56502a20b5c949c 100644 (file)
--- a/src/libvirt_private.syms
+++ b/src/libvirt_private.syms
@@ -2417,8 +2417,10 @@ virFirewallCmdGetArgCount;
 virFirewallCmdToString;
 virFirewallFree;
 virFirewallGetBackend;
+virFirewallGetName;
 virFirewallNew;
 virFirewallRemoveCmd;
+virFirewallSetName;
 virFirewallStartRollback;
 virFirewallStartTransaction;
 

diff --git a/src/util/virfirewall.c b/src/util/virfirewall.c
index b9b4140ad6d6a0964a09497eebcb50c1be5ca45b..fe8c09c0ed4f5cf21d5e5de1159f0b36f66e9179 100644 (file)
--- a/src/util/virfirewall.c
+++ b/src/util/virfirewall.c
@@ -78,6 +78,7 @@ struct _virFirewallGroup {
 struct _virFirewall {
     int err;
 
+    char *name;
     size_t ngroups;
     virFirewallGroup **groups;
     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
 virFirewallCmdFree(virFirewallCmd *fwCmd)
 {
@@ -169,8 +186,9 @@ void virFirewallFree(virFirewall *firewall)
 
     for (i = 0; i < firewall->ngroups; i++)
         virFirewallGroupFree(firewall->groups[i]);
-    g_free(firewall->groups);
 
+    g_free(firewall->groups);
+    g_free(firewall->name);
     g_free(firewall);
 }
 

diff --git a/src/util/virfirewall.h b/src/util/virfirewall.h
index e6aac365f1c91c2a6439110f67808f801c6d18bd..e8ad81056fe94a5958e72cf69e006b70c7acaaa8 100644 (file)
--- a/src/util/virfirewall.h
+++ b/src/util/virfirewall.h
@@ -46,6 +46,8 @@ VIR_ENUM_DECL(virFirewallBackend);
 virFirewall *virFirewallNew(virFirewallBackend backend);
 void virFirewallFree(virFirewall *firewall);
 virFirewallBackend virFirewallGetBackend(virFirewall *firewall);
+const char *virFirewallGetName(virFirewall *firewall);
+void virFirewallSetName(virFirewall *firewall, const char *name);
 
 /**
  * virFirewallAddCmd: