clearlinux/kvmtool
2
0
Fork 0
mirror of https://github.com/clearlinux/kvmtool.git synced 2026-06-15 18:05:49 +00:00
Code Issues Packages Projects Releases Wiki Activity

kvm tools: move mmio_debug into struct kvm_config

Browse Source 
This config option was 'extern'ed between different objects. Clean it up
and move it into struct kvm_config.

Signed-off-by: Sasha Levin <levinsasha928@gmail.com>
Signed-off-by: Pekka Enberg <penberg@kernel.org>
This commit is contained in:
Sasha Levin
2012-09-05 10:31:41 +02:00
committed by Will Deacon
parent 5765977da2
commit e830cce778
3 changed files with 3 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
builtin-run.c
+1 -2
View File
@@ -57,7 +57,6 @@ struct kvm *kvm;
struct kvm_cpu **kvm_cpus;
__thread struct kvm_cpu *current_kvm_cpu;
extern bool mmio_debug;
static int kvm_run_wrapper;
extern int active_console;
extern int debug_iodelay;
@@ -472,7 +471,7 @@ static int shmem_parser(const struct option *opt, const char *arg, int unset)
"Enable single stepping"), \
OPT_BOOLEAN('\0', "debug-ioport", &(cfg)->ioport_debug, \
"Enable ioport debugging"), \
OPT_BOOLEAN('\0', "debug-mmio", &mmio_debug, \
OPT_BOOLEAN('\0', "debug-mmio", &(cfg)->mmio_debug, \
"Enable MMIO debugging"), \
OPT_INTEGER('\0', "debug-iodelay", &debug_iodelay, \
"Delay IO by millisecond"), \
include/kvm/kvm-config.h
+1
View File
@@ -49,6 +49,7 @@ struct kvm_config {
bool no_net;
bool no_dhcp;
bool ioport_debug;
bool mmio_debug;
};
#endif
mmio.c
+1 -2
View File
@@ -21,7 +21,6 @@ struct mmio_mapping {
};
static struct rb_root mmio_tree = RB_ROOT;
bool mmio_debug = false;
static struct mmio_mapping *mmio_search(struct rb_root *root, u64 addr, u64 len)
{
@@ -130,7 +129,7 @@ bool kvm__emulate_mmio(struct kvm *kvm, u64 phys_addr, u8 *data, u32 len, u8 is_
if (mmio)
mmio->mmio_fn(phys_addr, data, len, is_write, mmio->ptr);
else {
if (mmio_debug)
if (kvm->cfg.mmio_debug)
fprintf(stderr, "Warning: Ignoring MMIO %s at %016llx (length %u)\n",
to_direction(is_write), phys_addr, len);
}