[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH qemu 2/6] eliminate arch_config_name variable
From: |
Eduardo Habkost |
Subject: |
[Qemu-devel] [PATCH qemu 2/6] eliminate arch_config_name variable |
Date: |
Tue, 24 Apr 2012 17:32:57 -0300 |
Not needed anymore, as the code that uses the variable is already inside
arch_init.c.
Signed-off-by: Eduardo Habkost <address@hidden>
---
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 828256c..c7cb94a 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
- [Qemu-devel] [PATCH qemu v2 0/6] -no-user-config option, move CPU models to /usr/share, Eduardo Habkost, 2012/04/24
- [Qemu-devel] [PATCH qemu 4/6] vl.c: change 'defconfig' variable to bool, Eduardo Habkost, 2012/04/24
- [Qemu-devel] [PATCH qemu 3/6] move list of default config files to an array, Eduardo Habkost, 2012/04/24
- [Qemu-devel] [PATCH qemu 1/6] move code to read default config files to a separate function (v2), Eduardo Habkost, 2012/04/24
- [Qemu-devel] [PATCH qemu 2/6] eliminate arch_config_name variable,
Eduardo Habkost <=
- [Qemu-devel] [PATCH qemu 5/6] implement -no-user-config command-line option (v2), Eduardo Habkost, 2012/04/24
- [Qemu-devel] [PATCH qemu 6/6] move CPU definitions to /usr/share/qemu/cpus-x86_64.conf (v2), Eduardo Habkost, 2012/04/24
- [Qemu-devel] [PATCH qemu 7/6] vl.c: actually change defconfig variable to bool, Eduardo Habkost, 2012/04/30