| Message ID | 1534858452-37519-1-git-send-email-pbonzini@redhat.com |
|---|---|
| State | New |
| Headers | show |
| Series | KVM: cleanup unnecessary #ifdef KVM_CAP_... | expand |
On 21.08.2018 15:34, Paolo Bonzini wrote: > 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: Paolo Bonzini <pbonzini@redhat.com> > --- > accel/kvm/kvm-all.c | 2 -- > target/i386/kvm.c | 8 -------- > 2 files changed, 10 deletions(-) > > diff --git a/accel/kvm/kvm-all.c b/accel/kvm/kvm-all.c > index 38f468d..de12f78 100644 > --- a/accel/kvm/kvm-all.c > +++ b/accel/kvm/kvm-all.c > @@ -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); > diff --git a/target/i386/kvm.c b/target/i386/kvm.c > index 9313602..0b2a07d 100644 > --- a/target/i386/kvm.c > +++ b/target/i386/kvm.c > @@ -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); > > indeed, Reviewed-by: David Hildenbrand <david@redhat.com>
diff --git a/accel/kvm/kvm-all.c b/accel/kvm/kvm-all.c index 38f468d..de12f78 100644 --- a/accel/kvm/kvm-all.c +++ b/accel/kvm/kvm-all.c @@ -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); diff --git a/target/i386/kvm.c b/target/i386/kvm.c index 9313602..0b2a07d 100644 --- a/target/i386/kvm.c +++ b/target/i386/kvm.c @@ -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);
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: Paolo Bonzini <pbonzini@redhat.com> --- accel/kvm/kvm-all.c | 2 -- target/i386/kvm.c | 8 -------- 2 files changed, 10 deletions(-)