From: Ian Jackson <ian.jackson@eu.citrix.com>
Date: Thu, 23 Oct 2008 15:01:11 +0000 (+0100)
Subject: const-correctness fixes for xen-specific code
X-Git-Tag: t.master-before-merge~66^2
X-Git-Url: http://xenbits.xensource.com/gitweb?a=commitdiff_plain;h=0df6ee29654b23fc4a9a78ef8425035b6184e932;p=qemu-xen-4.5-testing.git

const-correctness fixes for xen-specific code

hw/pass-through.c and xenstore.c had a few cases of a string "..."
being assigned to a char*, which causes a warning with
---

diff --git a/hw/pass-through.c b/hw/pass-through.c
index 77ab759a5..f07608770 100644
--- a/hw/pass-through.c
+++ b/hw/pass-through.c
@@ -694,7 +694,8 @@ static int token_value(char *token)
 
 static int next_bdf(char **str, int *seg, int *bus, int *dev, int *func)
 {
-    char *token, *delim = ":.-";
+    char *token;
+    const char *delim = ":.-";
 
     if ( !(*str) ||
           ( !strchr(*str, ':') && !strchr(*str, '.')) )
@@ -767,7 +768,8 @@ found:
 int insert_to_pci_slot(char *bdf_slt)
 {
     int seg, bus, dev, func, slot;
-    char *bdf_str, *slt_str, *delim="@";
+    char *bdf_str, *slt_str;
+    const char *delim="@";
 
     bdf_str = strsep(&bdf_slt, delim);
     slt_str = bdf_slt;
diff --git a/qemu-xen.h b/qemu-xen.h
index c9df5bda7..8375b7933 100644
--- a/qemu-xen.h
+++ b/qemu-xen.h
@@ -83,8 +83,8 @@ int xenstore_unsubscribe_from_hotplug_status(struct xs_handle *handle,
   * at least when it comes to running our own frontends
   */
 
-int xenstore_vm_write(int domid, char *key, char *val);
-char *xenstore_vm_read(int domid, char *key, unsigned int *len);
+int xenstore_vm_write(int domid, const char *key, const char *val);
+char *xenstore_vm_read(int domid, const char *key, unsigned int *len);
 char *xenstore_device_model_read(int domid, char *key, unsigned int *len);
 char *xenstore_read_battery_data(int battery_status);
 int xenstore_refresh_battery_status(void);
diff --git a/xenstore.c b/xenstore.c
index d064df100..2588951ab 100644
--- a/xenstore.c
+++ b/xenstore.c
@@ -1119,7 +1119,7 @@ static char *xenstore_vm_key_path(int domid, char *key) {
     return buf;
 }
 
-char *xenstore_vm_read(int domid, char *key, unsigned int *len)
+char *xenstore_vm_read(int domid, const char *key, unsigned int *len)
 {
     char *path = NULL, *value = NULL;
 
@@ -1136,7 +1136,7 @@ char *xenstore_vm_read(int domid, char *key, unsigned int *len)
     return value;
 }
 
-int xenstore_vm_write(int domid, char *key, char *value)
+int xenstore_vm_write(int domid, const char *key, const char *value)
 {
     char *path = NULL;
     int rc = -1;