diff options
author | Anthony Liguori <aliguori@us.ibm.com> | 2011-02-01 15:23:24 -0600 |
---|---|---|
committer | Anthony Liguori <aliguori@us.ibm.com> | 2011-02-01 15:32:18 -0600 |
commit | b3a98367eec7b2d87acca54ef5e4de3b0e0a7ed5 (patch) | |
tree | 22b6121e6f81c09c7dd780ed211afef7b9ebb92d /vl.c | |
parent | 9363ee31ab53fc0fd39fbe5936d9c00a2f4e54a4 (diff) | |
parent | c5999bfcfdf66390c98115044cb6fd174fbcf36d (diff) |
Merge remote branch 'qemu-kvm/uq/master' into staging
aliguori: fix build with !defined(KVM_CAP_ASYNC_PF)
Signed-off-by: Anthony Liguori <aliguori@us.ibm.com>
Diffstat (limited to 'vl.c')
-rw-r--r-- | vl.c | 2 |
1 files changed, 1 insertions, 1 deletions
@@ -2860,7 +2860,7 @@ int main(int argc, char **argv, char **envp) } if (kvm_allowed) { - int ret = kvm_init(smp_cpus); + int ret = kvm_init(); if (ret < 0) { if (!kvm_available()) { printf("KVM not supported for this target\n"); |