Browse Source

eliminate arch_config_name variable

Not needed anymore, as the code that uses the variable is already inside
arch_init.c.

Signed-off-by: Eduardo Habkost <ehabkost@redhat.com>
Signed-off-by: Anthony Liguori <aliguori@us.ibm.com>
Eduardo Habkost 13 years ago
parent
commit
c8262a4767
2 changed files with 1 additions and 4 deletions
  1. 1 2
      arch_init.c
  2. 0 2
      arch_init.h

+ 1 - 2
arch_init.c

@@ -54,7 +54,6 @@ int graphic_height = 600;
 int graphic_depth = 15;
 int graphic_depth = 15;
 #endif
 #endif
 
 
-const char arch_config_name[] = CONFIG_QEMU_CONFDIR "/target-" TARGET_ARCH ".conf";
 
 
 #if defined(TARGET_ALPHA)
 #if defined(TARGET_ALPHA)
 #define QEMU_ARCH QEMU_ARCH_ALPHA
 #define QEMU_ARCH QEMU_ARCH_ALPHA
@@ -122,7 +121,7 @@ int qemu_read_default_config_files(void)
         return ret;
         return ret;
     }
     }
 
 
-    ret = qemu_read_config_file(arch_config_name);
+    ret = qemu_read_config_file(CONFIG_QEMU_CONFDIR "/target-" TARGET_ARCH ".conf");
     if (ret < 0 && ret != -ENOENT) {
     if (ret < 0 && ret != -ENOENT) {
         return ret;
         return ret;
     }
     }

+ 0 - 2
arch_init.h

@@ -1,8 +1,6 @@
 #ifndef QEMU_ARCH_INIT_H
 #ifndef QEMU_ARCH_INIT_H
 #define QEMU_ARCH_INIT_H
 #define QEMU_ARCH_INIT_H
 
 
-extern const char arch_config_name[];
-
 enum {
 enum {
     QEMU_ARCH_ALL = -1,
     QEMU_ARCH_ALL = -1,
     QEMU_ARCH_ALPHA = 1,
     QEMU_ARCH_ALPHA = 1,