diff options
author | Michael S. Tsirkin | 2011-06-14 16:51:11 +0200 |
---|---|---|
committer | Michael S. Tsirkin | 2011-06-15 17:27:15 +0200 |
commit | befeac45d4d9afb587eca9a27d975db4a7950960 (patch) | |
tree | aab24c856a3ea944e287d7f2591bb4bab6a56eb4 /arch_init.c | |
parent | print meaningful error message in case of --disable-vhost-net (diff) | |
parent | configure: Detect and don't try to use older libcurl (diff) | |
download | qemu-befeac45d4d9afb587eca9a27d975db4a7950960.tar.gz qemu-befeac45d4d9afb587eca9a27d975db4a7950960.tar.xz qemu-befeac45d4d9afb587eca9a27d975db4a7950960.zip |
Merge remote-tracking branch 'origin/master' into pci
Conflicts:
hw/virtio-pci.c
Diffstat (limited to 'arch_init.c')
-rw-r--r-- | arch_init.c | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/arch_init.c b/arch_init.c index 0c09f9118e..484b39d4dd 100644 --- a/arch_init.c +++ b/arch_init.c @@ -709,6 +709,11 @@ int audio_available(void) #endif } +int tcg_available(void) +{ + return 1; +} + int kvm_available(void) { #ifdef CONFIG_KVM |