summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorEduardo Habkost <ehabkost@redhat.com>2012-05-02 13:07:26 -0300
committerAnthony Liguori <aliguori@us.ibm.com>2012-05-10 12:37:55 -0500
commitc8262a4767dc1c554dec615accc1b7152b433ab3 (patch)
tree6652ece0a2f2607d45f545841e9730f4e5138814
parentb5a8fe5e8a9d8a5751dd5506026bc30a14010443 (diff)
downloadqemu-c8262a4767dc1c554dec615accc1b7152b433ab3.tar.gz
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>
-rw-r--r--arch_init.c3
-rw-r--r--arch_init.h2
2 files changed, 1 insertions, 4 deletions
diff --git a/arch_init.c b/arch_init.c
index 4008115e35..152cbbbb63 100644
--- a/arch_init.c
+++ b/arch_init.c
@@ -54,7 +54,6 @@ int graphic_height = 600;
int graphic_depth = 15;
#endif
-const char arch_config_name[] = CONFIG_QEMU_CONFDIR "/target-" TARGET_ARCH ".conf";
#if defined(TARGET_ALPHA)
#define QEMU_ARCH QEMU_ARCH_ALPHA
@@ -122,7 +121,7 @@ int qemu_read_default_config_files(void)
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) {
return ret;
}
diff --git a/arch_init.h b/arch_init.h
index 828256cc42..c7cb94a932 100644
--- a/arch_init.h
+++ b/arch_init.h
@@ -1,8 +1,6 @@
#ifndef QEMU_ARCH_INIT_H
#define QEMU_ARCH_INIT_H
-extern const char arch_config_name[];
-
enum {
QEMU_ARCH_ALL = -1,
QEMU_ARCH_ALPHA = 1,