[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH 08/15] kvm: Drop KVM_CAP build dependencies
From: |
Marcelo Tosatti |
Subject: |
[Qemu-devel] [PATCH 08/15] kvm: Drop KVM_CAP build dependencies |
Date: |
Tue, 21 Jun 2011 14:07:57 -0300 |
From: Jan Kiszka <address@hidden>
No longer needed with accompanied kernel headers. We are only left with
build dependencies that are controlled by kvm arch headers.
CC: Alexander Graf <address@hidden>
Signed-off-by: Jan Kiszka <address@hidden>
Signed-off-by: Marcelo Tosatti <address@hidden>
---
kvm-all.c | 8 --------
1 files changed, 0 insertions(+), 8 deletions(-)
diff --git a/kvm-all.c b/kvm-all.c
index 4a9910a..cbc2532 100644
--- a/kvm-all.c
+++ b/kvm-all.c
@@ -757,21 +757,17 @@ int kvm_init(void)
s->coalesced_mmio = kvm_check_extension(s, KVM_CAP_COALESCED_MMIO);
s->broken_set_mem_region = 1;
-#ifdef KVM_CAP_JOIN_MEMORY_REGIONS_WORKS
ret = kvm_check_extension(s, KVM_CAP_JOIN_MEMORY_REGIONS_WORKS);
if (ret > 0) {
s->broken_set_mem_region = 0;
}
-#endif
#ifdef KVM_CAP_VCPU_EVENTS
s->vcpu_events = kvm_check_extension(s, KVM_CAP_VCPU_EVENTS);
#endif
-#ifdef KVM_CAP_X86_ROBUST_SINGLESTEP
s->robust_singlestep =
kvm_check_extension(s, KVM_CAP_X86_ROBUST_SINGLESTEP);
-#endif
#ifdef KVM_CAP_DEBUGREGS
s->debugregs = kvm_check_extension(s, KVM_CAP_DEBUGREGS);
@@ -850,7 +846,6 @@ static void kvm_handle_io(uint16_t port, void *data, int
direction, int size,
}
}
-#ifdef KVM_CAP_INTERNAL_ERROR_DATA
static int kvm_handle_internal_error(CPUState *env, struct kvm_run *run)
{
fprintf(stderr, "KVM internal error.");
@@ -877,7 +872,6 @@ static int kvm_handle_internal_error(CPUState *env, struct
kvm_run *run)
*/
return -1;
}
-#endif
void kvm_flush_coalesced_mmio_buffer(void)
{
@@ -1008,11 +1002,9 @@ int kvm_cpu_exec(CPUState *env)
(uint64_t)run->hw.hardware_exit_reason);
ret = -1;
break;
-#ifdef KVM_CAP_INTERNAL_ERROR_DATA
case KVM_EXIT_INTERNAL_ERROR:
ret = kvm_handle_internal_error(env, run);
break;
-#endif
default:
DPRINTF("kvm_arch_handle_exit\n");
ret = kvm_arch_handle_exit(env, run);
--
1.7.5.4
- [Qemu-devel] [PATCH 00/15] [PULL] qemu-kvm.git uq/master queue, Marcelo Tosatti, 2011/06/21
- [Qemu-devel] [PATCH 06/15] kvm: ppc: Drop CONFIG_KVM_PPC_PVR, Marcelo Tosatti, 2011/06/21
- [Qemu-devel] [PATCH 12/15] kvm: x86: Pass KVMState to kvm_arch_get_supported_cpuid, Marcelo Tosatti, 2011/06/21
- [Qemu-devel] [PATCH 07/15] kvm: Drop useless zero-initializations, Marcelo Tosatti, 2011/06/21
- [Qemu-devel] [PATCH 10/15] kvm: ppc: Drop KVM_CAP build dependencies, Marcelo Tosatti, 2011/06/21
- [Qemu-devel] [PATCH 08/15] kvm: Drop KVM_CAP build dependencies,
Marcelo Tosatti <=
- [Qemu-devel] [PATCH 11/15] kvm: Clean up stubs, Marcelo Tosatti, 2011/06/21
- [Qemu-devel] [PATCH 13/15] Remove unneeded kvm.h from cpu-exec.c, Marcelo Tosatti, 2011/06/21
- [Qemu-devel] [PATCH 05/15] kvm: Drop CONFIG_KVM_PARA, Marcelo Tosatti, 2011/06/21
- [Qemu-devel] [PATCH 14/15] KVM: Fix XSAVE feature bit enumeration, Marcelo Tosatti, 2011/06/21
- [Qemu-devel] [PATCH 01/15] kvm: x86: Save/restore FPU OP, IP and DP, Marcelo Tosatti, 2011/06/21
- [Qemu-devel] [PATCH 04/15] Switch build system to accompanied kernel headers, Marcelo Tosatti, 2011/06/21
- [Qemu-devel] [PATCH 02/15] Add kernel header update script, Marcelo Tosatti, 2011/06/21
- [Qemu-devel] [PATCH 15/15] kvm: fix FPU state subsection, Marcelo Tosatti, 2011/06/21
- [Qemu-devel] [PATCH 09/15] kvm: x86: Drop KVM_CAP build dependencies, Marcelo Tosatti, 2011/06/21
- [Qemu-devel] [PATCH 03/15] Import kernel headers, Marcelo Tosatti, 2011/06/21