Mark XML param for attach/detach APIs const

diff --git a/ChangeLog b/ChangeLog
index f89e74ba73d6c7c5f083e2027eb98d57cfd82bdb..ff8bde5b9ab56f9c8b45b0db8cf212e87c36c0aa 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+Mon Oct 15 17:35:00 EST 2007 Daniel P. Berrange <berrange@redhat.com>
+
+       * src/driver.h, src/libvirt.c, include/libvirt/libvirt.h.in,
+       include/libvirt/libvirt.h, src/xen_unified.c, src/xend_internal.c,
+       src/xml.c, src/xml.h: Mark XML param for attach/detach APIs 'const'
+
 Mon Oct 15 15:31:00 BST 2007 Richard W.M. Jones <rjones@redhat.com>
 
        * src/test.c, include/libvirt/libvirt.h.in: Remove virDomainRestart

diff --git a/include/libvirt/libvirt.h b/include/libvirt/libvirt.h
index fb4cc6a15b6e1262c43ac22e7a83b8dc6adf05af..0402aeade38a448d17418bfc0826591f16119395 100644 (file)
--- a/include/libvirt/libvirt.h
+++ b/include/libvirt/libvirt.h
@@ -579,8 +579,8 @@ int                 virDomainGetVcpus       (virDomainPtr domain,
  */
 #define VIR_GET_CPUMAP(cpumaps,maplen,vcpu)    &(cpumaps[(vcpu)*(maplen)])
 
-int virDomainAttachDevice(virDomainPtr domain, char *xml);
-int virDomainDetachDevice(virDomainPtr domain, char *xml);
+int virDomainAttachDevice(virDomainPtr domain, const char *xml);
+int virDomainDetachDevice(virDomainPtr domain, const char *xml);
 
 /*
  * NUMA support

diff --git a/include/libvirt/libvirt.h.in b/include/libvirt/libvirt.h.in
index b61ed29512341c0ebe253d6335b29d0c7fd392bd..9d44a74f0f10a574ab9df462e30a7f7f16e05e98 100644 (file)
--- a/include/libvirt/libvirt.h.in
+++ b/include/libvirt/libvirt.h.in
@@ -579,8 +579,8 @@ int                 virDomainGetVcpus       (virDomainPtr domain,
  */
 #define VIR_GET_CPUMAP(cpumaps,maplen,vcpu)    &(cpumaps[(vcpu)*(maplen)])
 
-int virDomainAttachDevice(virDomainPtr domain, char *xml);
-int virDomainDetachDevice(virDomainPtr domain, char *xml);
+int virDomainAttachDevice(virDomainPtr domain, const char *xml);
+int virDomainDetachDevice(virDomainPtr domain, const char *xml);
 
 /*
  * NUMA support

diff --git a/src/driver.h b/src/driver.h
index 3d83b7164989475936e25be972b24c984430120a..2dbe7407fc2b2694072144fc8068b6194538c54c 100644 (file)
--- a/src/driver.h
+++ b/src/driver.h
@@ -184,10 +184,10 @@ typedef int
        (*virDrvDomainGetMaxVcpus)      (virDomainPtr domain);
 typedef int
        (*virDrvDomainAttachDevice)     (virDomainPtr domain,
-                                        char *xml);
+                                        const char *xml);
 typedef int
        (*virDrvDomainDetachDevice)     (virDomainPtr domain,
-                                        char *xml);
+                                        const char *xml);
 typedef int
        (*virDrvDomainGetAutostart)     (virDomainPtr domain,
                                         int *autostart);

diff --git a/src/libvirt.c b/src/libvirt.c
index 353775ea2cd98daf1e6cf2455103ae76c218b8b0..d15588955c8702c96b1a4d797984889d8210f58c 100644 (file)
--- a/src/libvirt.c
+++ b/src/libvirt.c
@@ -2602,7 +2602,7 @@ virDomainGetMaxVcpus(virDomainPtr domain)
  * Returns 0 in case of success, -1 in case of failure.
  */
 int
-virDomainAttachDevice(virDomainPtr domain, char *xml)
+virDomainAttachDevice(virDomainPtr domain, const char *xml)
 {
     virConnectPtr conn;
     DEBUG("domain=%p, xml=%s", domain, xml);
@@ -2634,7 +2634,7 @@ virDomainAttachDevice(virDomainPtr domain, char *xml)
  * Returns 0 in case of success, -1 in case of failure.
  */
 int
-virDomainDetachDevice(virDomainPtr domain, char *xml)
+virDomainDetachDevice(virDomainPtr domain, const char *xml)
 {
     virConnectPtr conn;
     DEBUG("domain=%p, xml=%s", domain, xml);

diff --git a/src/remote_internal.c b/src/remote_internal.c
index fc9d3e27adf4b9fabd5bfc1a7b519dc240e03b14..96de52045ef0eb46852ae2a31067125dee30bcd2 100644 (file)
--- a/src/remote_internal.c
+++ b/src/remote_internal.c
@@ -2089,13 +2089,13 @@ remoteDomainUndefine (virDomainPtr domain)
 }
 
 static int
-remoteDomainAttachDevice (virDomainPtr domain, char *xml)
+remoteDomainAttachDevice (virDomainPtr domain, const char *xml)
 {
     remote_domain_attach_device_args args;
     GET_PRIVATE (domain->conn, -1);
 
     make_nonnull_domain (&args.dom, domain);
-    args.xml = xml;
+    args.xml = (char *) xml;
 
     if (call (domain->conn, priv, 0, REMOTE_PROC_DOMAIN_ATTACH_DEVICE,
               (xdrproc_t) xdr_remote_domain_attach_device_args, (char *) &args,
@@ -2106,13 +2106,13 @@ remoteDomainAttachDevice (virDomainPtr domain, char *xml)
 }
 
 static int
-remoteDomainDetachDevice (virDomainPtr domain, char *xml)
+remoteDomainDetachDevice (virDomainPtr domain, const char *xml)
 {
     remote_domain_detach_device_args args;
     GET_PRIVATE (domain->conn, -1);
 
     make_nonnull_domain (&args.dom, domain);
-    args.xml = xml;
+    args.xml = (char *) xml;
 
     if (call (domain->conn, priv, 0, REMOTE_PROC_DOMAIN_DETACH_DEVICE,
               (xdrproc_t) xdr_remote_domain_detach_device_args, (char *) &args,

diff --git a/src/xen_unified.c b/src/xen_unified.c
index 684a0a191e1ac9bdaee19189f6978eb1e07eec7e..b5c27e443c49627ef58711b1997bb50caf593763 100644 (file)
--- a/src/xen_unified.c
+++ b/src/xen_unified.c
@@ -948,7 +948,7 @@ xenUnifiedDomainUndefine (virDomainPtr dom)
 }
 
 static int
-xenUnifiedDomainAttachDevice (virDomainPtr dom, char *xml)
+xenUnifiedDomainAttachDevice (virDomainPtr dom, const char *xml)
 {
     GET_PRIVATE(dom->conn);
     int i;
@@ -962,7 +962,7 @@ xenUnifiedDomainAttachDevice (virDomainPtr dom, char *xml)
 }
 
 static int
-xenUnifiedDomainDetachDevice (virDomainPtr dom, char *xml)
+xenUnifiedDomainDetachDevice (virDomainPtr dom, const char *xml)
 {
     GET_PRIVATE(dom->conn);
     int i;

diff --git a/src/xend_internal.c b/src/xend_internal.c
index 793581f47de883f292f24e465bc41b4ede01e0fe..022ac4a7d85d564f4fafdb027a4366e60a391551 100644 (file)
--- a/src/xend_internal.c
+++ b/src/xend_internal.c
@@ -58,8 +58,8 @@ static virDomainPtr xenDaemonCreateLinux(virConnectPtr conn,
                                          const char *xmlDesc,
                                         unsigned int flags);
 static char *xenDaemonDomainGetOSType(virDomainPtr domain);
-static int xenDaemonAttachDevice(virDomainPtr domain, char *xml);
-static int xenDaemonDetachDevice(virDomainPtr domain, char *xml);
+static int xenDaemonAttachDevice(virDomainPtr domain, const char *xml);
+static int xenDaemonDetachDevice(virDomainPtr domain, const char *xml);
 static int xenDaemonDomainCoreDump(virDomainPtr domain, const char *filename,
                                    int flags);
 #endif /* PROXY */
@@ -3337,7 +3337,7 @@ xenDaemonCreateLinux(virConnectPtr conn, const char *xmlDesc,
  * Returns 0 in case of success, -1 in case of failure.
  */
 static int
-xenDaemonAttachDevice(virDomainPtr domain, char *xml)
+xenDaemonAttachDevice(virDomainPtr domain, const char *xml)
 {
     char *sexpr, *conf, *str;
     int hvm = 0, ret;
@@ -3396,7 +3396,7 @@ xenDaemonAttachDevice(virDomainPtr domain, char *xml)
  * Returns 0 in case of success, -1 in case of failure.
  */
 static int
-xenDaemonDetachDevice(virDomainPtr domain, char *xml)
+xenDaemonDetachDevice(virDomainPtr domain, const char *xml)
 {
     char class[8], ref[80];
 

diff --git a/src/xml.c b/src/xml.c
index 8cdb9b8b52e00abf325701321d867a3fb9debf90..aa1884516718870a07a8f508801c2e0d016f1bc8 100644 (file)
--- a/src/xml.c
+++ b/src/xml.c
@@ -1335,7 +1335,7 @@ virDomainParseXMLDesc(virConnectPtr conn, const char *xmldesc, char **name, int
  *         the caller must free() the returned value.
  */
 char *
-virParseXMLDevice(virConnectPtr conn, char *xmldesc, int hvm, int xendConfigVersion)
+virParseXMLDevice(virConnectPtr conn, const char *xmldesc, int hvm, int xendConfigVersion)
 {
     xmlDocPtr xml = NULL;
     xmlNodePtr node;
@@ -1396,7 +1396,7 @@ virParseXMLDevice(virConnectPtr conn, char *xmldesc, int hvm, int xendConfigVers
  * Returns 0 in case of success, -1 in case of failure.
  */
 int
-virDomainXMLDevID(virDomainPtr domain, char *xmldesc, char *class, char *ref, int ref_len)
+virDomainXMLDevID(virDomainPtr domain, const char *xmldesc, char *class, char *ref, int ref_len)
 {
     xmlDocPtr xml = NULL;
     xmlNodePtr node, cur;

diff --git a/src/xml.h b/src/xml.h
index 11f2c5e5832872fe33fa0f0d27fbf5c45b6b78b5..c572d6826f3eefc0e368e48fdb3fc3f6a39efe5b 100644 (file)
--- a/src/xml.h
+++ b/src/xml.h
@@ -32,8 +32,8 @@ int           virXPathNodeSet (const char *xpath,
                                 xmlNodePtr **list);
 
 char *virDomainParseXMLDesc(virConnectPtr conn, const char *xmldesc, char **name, int xendConfigVersion);
-char *virParseXMLDevice(virConnectPtr conn, char *xmldesc, int hvm, int xendConfigVersion);
-  int virDomainXMLDevID(virDomainPtr domain, char *xmldesc, char *class, char *ref, int ref_len);
+char *virParseXMLDevice(virConnectPtr conn, const char *xmldesc, int hvm, int xendConfigVersion);
+  int virDomainXMLDevID(virDomainPtr domain, const char *xmldesc, char *class, char *ref, int ref_len);
 
 #ifdef __cplusplus
 }