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>

diff --git a/ChangeLog b/ChangeLog
index de81d3a7acf28a099097936e8926e22acd7651f1..b151ba5f1fee1beab8343ebba00c2ed244deb1f4 100644 (file)
--- 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 15779b7ab032109b0d607c624ef5a5a2fb8c4933..d03d989e220d8171b05281d98ad42bbbc43fdbfc 100644 (file)
--- 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 69342cbfc9dcfc7fdb739e17dbffb0877537b3df..e2c7514dae072c0d6638ef46b70a118cc9607469 100644 (file)
--- 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 c96fb45f69d4188d18502f23c78785a5e683e0a6..dee6ba63762f5d35a1c6f667a111cb129bd3c9ff 100644 (file)
--- 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