From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:59273) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1g9sHW-0002aT-7d for qemu-devel@nongnu.org; Tue, 09 Oct 2018 09:42:39 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1g9sHQ-0000O2-FK for qemu-devel@nongnu.org; Tue, 09 Oct 2018 09:42:38 -0400 Received: from mx1.redhat.com ([209.132.183.28]:53298) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1g9sHQ-0000H5-1p for qemu-devel@nongnu.org; Tue, 09 Oct 2018 09:42:32 -0400 From: Vitaly Kuznetsov In-Reply-To: <20181009131738.GE29982@rkaganb.sw.ru> References: <20181008112726.16140-1-vkuznets@redhat.com> <20181008112726.16140-2-vkuznets@redhat.com> <20181009122046.GC29982@rkaganb.sw.ru> <87va6bqnon.fsf@vitty.brq.redhat.com> <20181009131738.GE29982@rkaganb.sw.ru> Date: Tue, 09 Oct 2018 15:42:27 +0200 Message-ID: <87sh1fqlrw.fsf@vitty.brq.redhat.com> MIME-Version: 1.0 Content-Type: text/plain Subject: Re: [Qemu-devel] [PATCH 1/2] linux-headers: update to pre-4.20 (kvm/queue) List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: Roman Kagan Cc: "qemu-devel@nongnu.org" , Paolo Bonzini , Richard Henderson , Eduardo Habkost , Marcelo Tosatti Roman Kagan writes: > On Tue, Oct 09, 2018 at 03:01:12PM +0200, Vitaly Kuznetsov wrote: >> Roman Kagan writes: >> >> > On Mon, Oct 08, 2018 at 01:27:25PM +0200, Vitaly Kuznetsov wrote: >> >> This brings us three new defines: KVM_CAP_ARM_INJECT_SERROR_ESR, >> >> KVM_CAP_MSR_PLATFORM_INFO and KVM_CAP_HYPERV_SEND_IPI. >> >> >> >> Signed-off-by: Vitaly Kuznetsov >> >> --- >> >> linux-headers/linux/kvm.h | 7 +++++-- >> >> 1 file changed, 5 insertions(+), 2 deletions(-) >> >> >> >> diff --git a/linux-headers/linux/kvm.h b/linux-headers/linux/kvm.h >> >> index 66790724f1..043f1e58b6 100644 >> >> --- a/linux-headers/linux/kvm.h >> >> +++ b/linux-headers/linux/kvm.h >> >> @@ -9,7 +9,7 @@ >> >> */ >> >> >> >> #include >> >> - >> >> +#include >> >> #include >> >> #include >> >> >> >> @@ -481,7 +481,7 @@ struct kvm_dirty_log { >> >> __u32 slot; >> >> __u32 padding1; >> >> union { >> >> - void *dirty_bitmap; /* one bit per page */ >> >> + void __user *dirty_bitmap; /* one bit per page */ >> > >> > Hmm, I thought "__user" and friends are supposed to get stripped while >> > "make headers_install". >> >> ... and of course I forgot about this, will send v2, thanks! > > Are you trying to say you didn't follow the regular linux header > harvesting process, which is to use scripts/update-linux-headers.sh > (which does 'make headers_install' and then applies further sanitizing, > so that problems like this wouldn't have popped up)? I think you > should, unless this is an interim patchset pending the merge of the > corresponding KVM changes in the mainline kernel. Honestly I didn't know about the standard process but looking at the output: $ scripts/update-linux-headers.sh PATH/TO/LINUX ... $ git diff --stat include/standard-headers/linux/input.h | 9 +++++---- linux-headers/asm-arm/kvm.h | 13 +++++++++++++ linux-headers/asm-arm64/kvm.h | 13 +++++++++++++ linux-headers/asm-s390/kvm.h | 2 ++ linux-headers/asm-x86/kvm.h | 1 + linux-headers/linux/kvm.h | 3 +++ linux-headers/linux/vfio.h | 2 ++ linux-headers/linux/vhost.h | 2 +- 8 files changed, 40 insertions(+), 5 deletions(-) I'm not sure if it would make sense to do this instead: the definition I need is currently in kvm/queue and I'm not exactly sure that updating other headers from there (e.g. linux/input.h) makes any sense. -- Vitaly