From 2edab512a081278d1d3d357637b18cdaa0690f27 Mon Sep 17 00:00:00 2001
From: Jim Meyering <meyering@redhat.com>
Date: Mon, 14 Jan 2008 14:05:25 +0000
Subject: [PATCH] Clean up the global name space.

* src/qemu_conf.c: Add "static" and "const" attributes to some globals.
* src/qemu_conf.h: Update a declaration.
* src/qemu_driver.c (qemud_driver): Declare static.


Author: Jim Meyering <meyering@redhat.com>
---
 ChangeLog         |  5 +++++
 src/qemu_conf.c   | 14 +++++++-------
 src/qemu_conf.h   |  4 ++--
 src/qemu_driver.c |  2 +-
 4 files changed, 15 insertions(+), 10 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index de81d3a7ac..b151ba5f1f 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,10 @@
 2008-01-14  Jim Meyering  <meyering@redhat.com>
 
+	Clean up the global name space.
+	* src/qemu_conf.c: Add "static" and "const" attributes to some globals.
+	* src/qemu_conf.h: Update a declaration.
+	* src/qemu_driver.c (qemud_driver): Declare static.
+
 	Clean up global name space in examples and tests.
 	* docs/examples/suspend.c: Declare global "conn" to be static.
 	* tests/qemuxml2argvtest.c: Declare global "driver" to be static.
diff --git a/src/qemu_conf.c b/src/qemu_conf.c
index 15779b7ab0..d03d989e22 100644
--- a/src/qemu_conf.c
+++ b/src/qemu_conf.c
@@ -231,35 +231,35 @@ void qemudFreeVM(struct qemud_vm *vm) {
 
 /* The list of possible machine types for various architectures,
    as supported by QEMU - taken from 'qemu -M ?' for each arch */
-static const char *arch_info_x86_machines[] = {
+static const char *const arch_info_x86_machines[] = {
     "pc", "isapc", NULL
 };
-static const char *arch_info_mips_machines[] = {
+static const char *const arch_info_mips_machines[] = {
     "mips", NULL
 };
-static const char *arch_info_sparc_machines[] = {
+static const char *const arch_info_sparc_machines[] = {
     "sun4m", NULL
 };
-static const char *arch_info_ppc_machines[] = {
+static const char *const arch_info_ppc_machines[] = {
     "g3bw", "mac99", "prep", NULL
 };
 
 /* Feature flags for the architecture info */
-struct qemu_feature_flags arch_info_i686_flags [] = {
+static const struct qemu_feature_flags const arch_info_i686_flags [] = {
     { "pae",  1, 1 },
     { "acpi", 1, 1 },
     { "apic", 1, 0 },
     { NULL, -1, -1 }
 };
 
-struct qemu_feature_flags arch_info_x86_64_flags [] = {
+static const struct qemu_feature_flags const arch_info_x86_64_flags [] = {
     { "acpi", 1, 1 },
     { "apic", 1, 0 },
     { NULL, -1, -1 }
 };
 
 /* The archicture tables for supported QEMU archs */
-struct qemu_arch_info qemudArchs[] = { 
+const struct qemu_arch_info const qemudArchs[] = { 
     /* i686 must be in position 0 */
     {  "i686", 32, arch_info_x86_machines, "qemu", arch_info_i686_flags },
     /* x86_64 must be in position 1 */
diff --git a/src/qemu_conf.h b/src/qemu_conf.h
index 69342cbfc9..e2c7514dae 100644
--- a/src/qemu_conf.h
+++ b/src/qemu_conf.h
@@ -426,11 +426,11 @@ struct qemu_feature_flags {
 struct qemu_arch_info {
     const char *arch;
     int wordsize;
-    const char **machines;
+    const char *const *machines;
     const char *binary;
     const struct qemu_feature_flags *fflags;
 };
-extern struct qemu_arch_info qemudArchs[];
+extern const struct qemu_arch_info const qemudArchs[];
 
 #endif /* WITH_QEMU */
 
diff --git a/src/qemu_driver.c b/src/qemu_driver.c
index c96fb45f69..dee6ba6376 100644
--- a/src/qemu_driver.c
+++ b/src/qemu_driver.c
@@ -107,7 +107,7 @@ static int qemudShutdownNetworkDaemon(virConnectPtr conn,
                                       struct qemud_driver *driver,
                                       struct qemud_network *network);
 
-struct qemud_driver *qemu_driver = NULL;
+static struct qemud_driver *qemu_driver = NULL;
 
 
 static