Commit b2e78fac authored by Paolo Bonzini's avatar Paolo Bonzini
Browse files

KVM: cleanup unnecessary #ifdef KVM_CAP_... 



The capability macros are always defined, since they come from kernel
headers that are copied into the QEMU tree.  Remove the unnecessary #ifdefs.

Signed-off-by: default avatarPaolo Bonzini <pbonzini@redhat.com>
parent 5e76d84e

accel/kvm/kvm-all.c

+0 −2
Original line number Diff line number Diff line
@@ -1639,10 +1639,8 @@ static int kvm_init(MachineState *ms) 
        s->irq_set_ioctl = KVM_IRQ_LINE_STATUS;

    }



#ifdef KVM_CAP_READONLY_MEM

    kvm_readonly_mem_allowed =

        (kvm_check_extension(s, KVM_CAP_READONLY_MEM) > 0);

#endif



    kvm_eventfds_allowed =

        (kvm_check_extension(s, KVM_CAP_IOEVENTFD) > 0);

target/i386/kvm.c

+0 −8
Original line number Diff line number Diff line
@@ -1381,17 +1381,9 @@ int kvm_arch_init(MachineState *ms, KVMState *s) 
    int ret;

    struct utsname utsname;



#ifdef KVM_CAP_XSAVE

    has_xsave = kvm_check_extension(s, KVM_CAP_XSAVE);

#endif



#ifdef KVM_CAP_XCRS

    has_xcrs = kvm_check_extension(s, KVM_CAP_XCRS);

#endif



#ifdef KVM_CAP_PIT_STATE2

    has_pit_state2 = kvm_check_extension(s, KVM_CAP_PIT_STATE2);

#endif



    hv_vpindex_settable = kvm_check_extension(s, KVM_CAP_HYPERV_VP_INDEX);