From 914d1b7403ddc305c26052383cf403f0c7492a1d Mon Sep 17 00:00:00 2001
From: "Daniel P. Berrange" <berrange@redhat.com>
Date: Thu, 10 Nov 2011 11:18:57 +0000
Subject: [PATCH] Add missing 'const' annotations for internal domain conf
 helpers

The virDomainNetGetActualBridgeName and virDomainNetGetActualDirectDev
methods both return strings that point to data in the virDomainDefPtr
struct, and should therefore not be freed. The return values should
thus be 'const char *' not 'char *'.

* src/conf/domain_conf.c, src/conf/domain_conf.h: Mark const
* src/network/bridge_driver.c: Update to use a const char *
---
 src/conf/domain_conf.c      |  4 ++--
 src/conf/domain_conf.h      |  4 ++--
 src/network/bridge_driver.c | 12 ++++++------
 3 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c
index c7d215fc57..4fa4313687 100644
--- a/src/conf/domain_conf.c
+++ b/src/conf/domain_conf.c
@@ -13064,7 +13064,7 @@ virDomainNetGetActualType(virDomainNetDefPtr iface)
     return iface->data.network.actual->type;
 }
 
-char *
+const char *
 virDomainNetGetActualBridgeName(virDomainNetDefPtr iface)
 {
     if (iface->type == VIR_DOMAIN_NET_TYPE_BRIDGE)
@@ -13076,7 +13076,7 @@ virDomainNetGetActualBridgeName(virDomainNetDefPtr iface)
     return iface->data.network.actual->data.bridge.brname;
 }
 
-char *
+const char *
 virDomainNetGetActualDirectDev(virDomainNetDefPtr iface)
 {
     if (iface->type == VIR_DOMAIN_NET_TYPE_DIRECT)
diff --git a/src/conf/domain_conf.h b/src/conf/domain_conf.h
index 9528199bfb..4e86d30eab 100644
--- a/src/conf/domain_conf.h
+++ b/src/conf/domain_conf.h
@@ -1794,8 +1794,8 @@ int virDomainGraphicsListenSetNetwork(virDomainGraphicsDefPtr def,
             ATTRIBUTE_NONNULL(1);
 
 int virDomainNetGetActualType(virDomainNetDefPtr iface);
-char *virDomainNetGetActualBridgeName(virDomainNetDefPtr iface);
-char *virDomainNetGetActualDirectDev(virDomainNetDefPtr iface);
+const char *virDomainNetGetActualBridgeName(virDomainNetDefPtr iface);
+const char *virDomainNetGetActualDirectDev(virDomainNetDefPtr iface);
 int virDomainNetGetActualDirectMode(virDomainNetDefPtr iface);
 virNetDevVPortProfilePtr
 virDomainNetGetActualDirectVirtPortProfile(virDomainNetDefPtr iface);
diff --git a/src/network/bridge_driver.c b/src/network/bridge_driver.c
index 7bea465bfc..c49c25b844 100644
--- a/src/network/bridge_driver.c
+++ b/src/network/bridge_driver.c
@@ -2899,7 +2899,7 @@ networkNotifyActualDevice(virDomainNetDefPtr iface)
     struct network_driver *driver = driverState;
     virNetworkObjPtr network;
     virNetworkDefPtr netdef;
-    char *actualDev;
+    const char *actualDev;
     int ret = -1;
 
     if (iface->type != VIR_DOMAIN_NET_TYPE_NETWORK)
@@ -2925,8 +2925,8 @@ networkNotifyActualDevice(virDomainNetDefPtr iface)
     if (!actualDev) {
         networkReportError(VIR_ERR_INTERNAL_ERROR,
                            "%s", _("the interface uses a direct mode, but has no source dev"));
-            goto cleanup;
-        }
+        goto cleanup;
+    }
 
     netdef = network->def;
     if (netdef->nForwardIfs == 0) {
@@ -2999,7 +2999,7 @@ networkReleaseActualDevice(virDomainNetDefPtr iface)
     struct network_driver *driver = driverState;
     virNetworkObjPtr network = NULL;
     virNetworkDefPtr netdef;
-    char *actualDev;
+    const char *actualDev;
     int ret = -1;
 
     if (iface->type != VIR_DOMAIN_NET_TYPE_NETWORK)
@@ -3026,8 +3026,8 @@ networkReleaseActualDevice(virDomainNetDefPtr iface)
     if (!actualDev) {
         networkReportError(VIR_ERR_INTERNAL_ERROR,
                            "%s", _("the interface uses a direct mode, but has no source dev"));
-            goto cleanup;
-        }
+        goto cleanup;
+    }
 
     netdef = network->def;
     if (netdef->nForwardIfs == 0) {
-- 
2.39.5