diff options
| author | Marcelo Tosatti <mtosatti@redhat.com> | 2010-04-06 11:02:17 -0300 |
|---|---|---|
| committer | Marcelo Tosatti <mtosatti@redhat.com> | 2010-04-06 11:02:17 -0300 |
| commit | d43ca2436bc63f090ffba9814de70cdd5413faa0 (patch) | |
| tree | c07c22120e94aa93c61f4faf0892edf64314bb84 /qemu-kvm.c | |
| parent | f2fb30dfb583eae703fbd0e3798bfd6d59e2076b (diff) | |
| parent | d745bef890f9fa57298ae099365da8e8aa575cbd (diff) | |
Merge commit 'd745bef890f9fa57298ae099365da8e8aa575cbd' into upstream-merge
* commit 'd745bef890f9fa57298ae099365da8e8aa575cbd': (35 commits)
Move KVM and Xen global flags to vl.c
Move cpu_exec_init_all() declaration to qemu-common.h
Allow various header files to be included from non-CPU code
Adjust debug handling
tcg/mips: fix branch offset during retranslation
exec: remove dead code
linux-user/ppc: use the Linux register layout
qemu-io: fix aio help texts
tcg/arm: Replace qemu_ld32u (left over from previous commit)
Fix driftfix option
Fix BSD and win32 builds
Refactor numa mode setting
pflash_cfi02: fix incorrect TARGET_FMT_lx/d use
Compile vmware_vga only once
tcg-mips: add guest base support
tcg/mips: implement the not_i32 op the same way as gcc
tcg-mips: implement nor
be more specific in -mem-path error messages
Add a missing #include for FreeBSD hosts
error: Move qerror_report() from qemu-error.[ch] to qerror.[ch]
...
Signed-off-by: Marcelo Tosatti <mtosatti@redhat.com>
Diffstat (limited to 'qemu-kvm.c')
| -rw-r--r-- | qemu-kvm.c | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/qemu-kvm.c b/qemu-kvm.c index cf2818245..714a59226 100644 --- a/qemu-kvm.c +++ b/qemu-kvm.c @@ -50,7 +50,6 @@ #error libkvm: userspace and kernel version mismatch #endif -int kvm_allowed = 1; int kvm_irqchip = 1; int kvm_pit = 1; int kvm_pit_reinject = 1; |