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 /target-s390x | |
| 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 'target-s390x')
| -rw-r--r-- | target-s390x/kvm.c | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/target-s390x/kvm.c b/target-s390x/kvm.c index adf4a9e1e5..38823f54f7 100644 --- a/target-s390x/kvm.c +++ b/target-s390x/kvm.c @@ -70,7 +70,11 @@ #define SCLP_CMDW_READ_SCP_INFO 0x00020001 #define SCLP_CMDW_READ_SCP_INFO_FORCED 0x00120001 -int kvm_arch_init(KVMState *s, int smp_cpus) +const KVMCapabilityInfo kvm_arch_required_capabilities[] = { + KVM_CAP_LAST_INFO +}; + +int kvm_arch_init(KVMState *s) { return 0; } |