mirrors/qemu
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

accel: change {xen, kvm, tcg, qtest}_allowed from int to bool

Browse Source 
Signed-off-by: liguang <lig.fnst@cn.fujitsu.com>
Signed-off-by: Anthony Liguori <aliguori@us.ibm.com>
This commit is contained in:
liguang 2013-01-24 13:03:27 +08:00 committed by Anthony Liguori
parent 217e21be6e
commit d5286af5ef
5 changed files with 11 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
hw/xen.h
View File

@ -21,9 +21,9 @@ enum xen_mode {
extern uint32_t xen_domid; extern uint32_t xen_domid;
extern enum xen_mode xen_mode; extern enum xen_mode xen_mode;
extern int xen_allowed; extern bool xen_allowed;
static inline int xen_enabled(void) static inline bool xen_enabled(void)
{ {
#if defined(CONFIG_XEN_BACKEND) && !defined(CONFIG_NO_XEN) #if defined(CONFIG_XEN_BACKEND) && !defined(CONFIG_NO_XEN)
return xen_allowed; return xen_allowed;

2
include/sysemu/kvm.h
View File

@ -39,7 +39,7 @@
#define KVM_FEATURE_CLOCKSOURCE_STABLE_BIT 0 #define KVM_FEATURE_CLOCKSOURCE_STABLE_BIT 0
#endif #endif
extern int kvm_allowed; extern bool kvm_allowed;
extern bool kvm_kernel_irqchip; extern bool kvm_kernel_irqchip;
extern bool kvm_async_interrupts_allowed; extern bool kvm_async_interrupts_allowed;
extern bool kvm_irqfds_allowed; extern bool kvm_irqfds_allowed;

2
include/sysemu/qtest.h
View File

@ -17,7 +17,7 @@
#include "qemu-common.h" #include "qemu-common.h"
#if !defined(CONFIG_USER_ONLY) #if !defined(CONFIG_USER_ONLY)
extern int qtest_allowed; extern bool qtest_allowed;
extern const char *qtest_chrdev; extern const char *qtest_chrdev;
extern const char *qtest_log; extern const char *qtest_log;

2
qtest.c
View File

@ -24,7 +24,7 @@
const char *qtest_chrdev; const char *qtest_chrdev;
const char *qtest_log; const char *qtest_log;
int qtest_allowed = 0; bool qtest_allowed;
static DeviceState *irq_intercept_dev; static DeviceState *irq_intercept_dev;
static FILE *qtest_log_fp; static FILE *qtest_log_fp;

12
vl.c
View File

@ -263,9 +263,9 @@ static NotifierList exit_notifiers =
static NotifierList machine_init_done_notifiers = static NotifierList machine_init_done_notifiers =
NOTIFIER_LIST_INITIALIZER(machine_init_done_notifiers); NOTIFIER_LIST_INITIALIZER(machine_init_done_notifiers);
static int tcg_allowed = 1; static bool tcg_allowed = true;
int kvm_allowed = 0; bool kvm_allowed;
int xen_allowed = 0; bool xen_allowed;
uint32_t xen_domid; uint32_t xen_domid;
enum xen_mode xen_mode = XEN_EMULATE; enum xen_mode xen_mode = XEN_EMULATE;
static int tcg_tb_size; static int tcg_tb_size;
@ -2544,7 +2544,7 @@ static struct {
const char *name; const char *name;
int (*available)(void); int (*available)(void);
int (*init)(void); int (*init)(void);
int *allowed; bool *allowed;
} accel_list[] = { } accel_list[] = {
{ "tcg", "tcg", tcg_available, tcg_init, &tcg_allowed }, { "tcg", "tcg", tcg_available, tcg_init, &tcg_allowed },
{ "xen", "Xen", xen_available, xen_init, &xen_allowed }, { "xen", "Xen", xen_available, xen_init, &xen_allowed },
@ -2582,14 +2582,14 @@ static int configure_accelerator(void)
accel_list[i].name); accel_list[i].name);
continue; continue;
} }
*(accel_list[i].allowed) = 1; *(accel_list[i].allowed) = true;
ret = accel_list[i].init(); ret = accel_list[i].init();
if (ret < 0) { if (ret < 0) {
init_failed = true; init_failed = true;
fprintf(stderr, "failed to initialize %s: %s\n", fprintf(stderr, "failed to initialize %s: %s\n",
accel_list[i].name, accel_list[i].name,
strerror(-ret)); strerror(-ret));
*(accel_list[i].allowed) = 0; *(accel_list[i].allowed) = false;
} else { } else {
accel_initialised = true; accel_initialised = true;
} }