From b4fab30b892b0be873929a70c865d90ab02d9b47 Mon Sep 17 00:00:00 2001 From: "Daniel P. Berrange" Date: Mon, 15 Oct 2007 21:38:56 +0000 Subject: [PATCH] Mark XML param for attach/detach APIs const --- ChangeLog | 6 ++++++ include/libvirt/libvirt.h | 4 ++-- include/libvirt/libvirt.h.in | 4 ++-- src/driver.h | 4 ++-- src/libvirt.c | 4 ++-- src/remote_internal.c | 8 ++++---- src/xen_unified.c | 4 ++-- src/xend_internal.c | 8 ++++---- src/xml.c | 4 ++-- src/xml.h | 4 ++-- 10 files changed, 28 insertions(+), 22 deletions(-) diff --git a/ChangeLog b/ChangeLog index f89e74ba73..ff8bde5b9a 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +Mon Oct 15 17:35:00 EST 2007 Daniel P. Berrange + + * 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 * src/test.c, include/libvirt/libvirt.h.in: Remove virDomainRestart diff --git a/include/libvirt/libvirt.h b/include/libvirt/libvirt.h index fb4cc6a15b..0402aeade3 100644 --- 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 b61ed29512..9d44a74f0f 100644 --- 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 3d83b71649..2dbe7407fc 100644 --- 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 353775ea2c..d15588955c 100644 --- 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 fc9d3e27ad..96de52045e 100644 --- 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 684a0a191e..b5c27e443c 100644 --- 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 793581f47d..022ac4a7d8 100644 --- 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 8cdb9b8b52..aa18845167 100644 --- 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 11f2c5e583..c572d6826f 100644 --- 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 } -- 2.47.2