[libvirt] [PATCH 2/5] 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(a)redhat.com>
---
arch_init.c | 3 +--
arch_init.h | 2 --
2 files changed, 1 insertions(+), 4 deletions(-)
diff --git a/arch_init.c b/arch_init.c
index 4008115..152cbbb 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 329faf7..495871b 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,
--
1.7.3.2