diff options
-rw-r--r-- | hw/xen.h | 4 | ||||
-rw-r--r-- | include/sysemu/kvm.h | 2 | ||||
-rw-r--r-- | include/sysemu/qtest.h | 2 | ||||
-rw-r--r-- | qtest.c | 2 | ||||
-rw-r--r-- | vl.c | 12 |
5 files changed, 11 insertions, 11 deletions
@@ -21,9 +21,9 @@ enum xen_mode { extern uint32_t xen_domid; 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) return xen_allowed; diff --git a/include/sysemu/kvm.h b/include/sysemu/kvm.h index 6e6dfb3..f2d97b5 100644 --- a/include/sysemu/kvm.h +++ b/include/sysemu/kvm.h @@ -39,7 +39,7 @@ #define KVM_FEATURE_CLOCKSOURCE_STABLE_BIT 0 #endif -extern int kvm_allowed; +extern bool kvm_allowed; extern bool kvm_kernel_irqchip; extern bool kvm_async_interrupts_allowed; extern bool kvm_irqfds_allowed; diff --git a/include/sysemu/qtest.h b/include/sysemu/qtest.h index 723a4f9..9a0c6b3 100644 --- a/include/sysemu/qtest.h +++ b/include/sysemu/qtest.h @@ -17,7 +17,7 @@ #include "qemu-common.h" #if !defined(CONFIG_USER_ONLY) -extern int qtest_allowed; +extern bool qtest_allowed; extern const char *qtest_chrdev; extern const char *qtest_log; @@ -24,7 +24,7 @@ const char *qtest_chrdev; const char *qtest_log; -int qtest_allowed = 0; +bool qtest_allowed; static DeviceState *irq_intercept_dev; static FILE *qtest_log_fp; @@ -263,9 +263,9 @@ static NotifierList exit_notifiers = static NotifierList machine_init_done_notifiers = NOTIFIER_LIST_INITIALIZER(machine_init_done_notifiers); -static int tcg_allowed = 1; -int kvm_allowed = 0; -int xen_allowed = 0; +static bool tcg_allowed = true; +bool kvm_allowed; +bool xen_allowed; uint32_t xen_domid; enum xen_mode xen_mode = XEN_EMULATE; static int tcg_tb_size; @@ -2544,7 +2544,7 @@ static struct { const char *name; int (*available)(void); int (*init)(void); - int *allowed; + bool *allowed; } accel_list[] = { { "tcg", "tcg", tcg_available, tcg_init, &tcg_allowed }, { "xen", "Xen", xen_available, xen_init, &xen_allowed }, @@ -2582,14 +2582,14 @@ static int configure_accelerator(void) accel_list[i].name); continue; } - *(accel_list[i].allowed) = 1; + *(accel_list[i].allowed) = true; ret = accel_list[i].init(); if (ret < 0) { init_failed = true; fprintf(stderr, "failed to initialize %s: %s\n", accel_list[i].name, strerror(-ret)); - *(accel_list[i].allowed) = 0; + *(accel_list[i].allowed) = false; } else { accel_initialised = true; } |