On Fri, 2016-06-24 at 20:33 +0530, Shivaprasad G Bhat wrote:
-/* add definitions missing in older linux/kvm.h */ -#ifndef KVMIO -# define KVMIO 0xAE -#endif -#ifndef KVM_CHECK_EXTENSION -# define KVM_CHECK_EXTENSION _IO(KVMIO, 0x03) -#endif -#ifndef KVM_CAP_NR_VCPUS -# define KVM_CAP_NR_VCPUS 9 /* returns max vcpus per vm */ -#endif
[...]
+#ifndef KVM_CAP_NR_VCPUS +# define KVM_CAP_NR_VCPUS 9 /* returns max vcpus per vm */ +#endif
As mentioned during the previous round of reviews, you can't just get rid of code like that during what's supposed to be a simple code motion: you have to do so in a separate commit. I've tweaked the commit so that definitions are preserved, we'll clean up later. ACK and pushed. -- Andrea Bolognani / Red Hat / Virtualization