From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-8.3 required=3.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS,MAILING_LIST_MULTI, SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED,USER_AGENT_SANE_1 autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 8C188C433DF for ; Wed, 14 Oct 2020 07:05:54 +0000 (UTC) Received: from lists.xenproject.org (lists.xenproject.org [192.237.175.120]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id D29692072C for ; Wed, 14 Oct 2020 07:05:53 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (1024-bit key) header.d=suse.com header.i=@suse.com header.b="OJ4POUJQ" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org D29692072C Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=suse.com Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=xen-devel-bounces@lists.xenproject.org Received: from list by lists.xenproject.org with outflank-mailman.6454.17241 (Exim 4.92) (envelope-from ) id 1kSar1-0000Pv-Ko; Wed, 14 Oct 2020 07:05:43 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 6454.17241; Wed, 14 Oct 2020 07:05:43 +0000 X-BeenThere: xen-devel@lists.xenproject.org List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-devel-bounces@lists.xenproject.org Precedence: list Sender: "Xen-devel" Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1kSar1-0000Po-Hi; Wed, 14 Oct 2020 07:05:43 +0000 Received: by outflank-mailman (input) for mailman id 6454; Wed, 14 Oct 2020 07:05:42 +0000 Received: from us1-rack-iad1.inumbo.com ([172.99.69.81]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1kSar0-0000Pi-H8 for xen-devel@lists.xenproject.org; Wed, 14 Oct 2020 07:05:42 +0000 Received: from mx2.suse.de (unknown [195.135.220.15]) by us1-rack-iad1.inumbo.com (Halon) with ESMTPS id 1363ac7b-77ba-4f62-b021-16281843ecfb; Wed, 14 Oct 2020 07:05:41 +0000 (UTC) Received: from relay2.suse.de (unknown [195.135.221.27]) by mx2.suse.de (Postfix) with ESMTP id EC8B2B169; Wed, 14 Oct 2020 07:05:40 +0000 (UTC) Received: from us1-rack-iad1.inumbo.com ([172.99.69.81]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1kSar0-0000Pi-H8 for xen-devel@lists.xenproject.org; Wed, 14 Oct 2020 07:05:42 +0000 X-Inumbo-ID: 1363ac7b-77ba-4f62-b021-16281843ecfb Received: from mx2.suse.de (unknown [195.135.220.15]) by us1-rack-iad1.inumbo.com (Halon) with ESMTPS id 1363ac7b-77ba-4f62-b021-16281843ecfb; Wed, 14 Oct 2020 07:05:41 +0000 (UTC) X-Virus-Scanned: by amavisd-new at test-mx.suse.de DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.com; s=susede1; t=1602659141; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=buQ33p2+rSRUtvOyS1U4qMMS2XBpZyaV3p+/tEWXhHU=; b=OJ4POUJQC6kBOwBh7vNmDpuf6vob77ZMGdYHEf+jRoxqS58RwMal0k32mheldvQ4Fm1ml5 eKTppyF6JyklGs1zWLlSFxnjH52U5yyQVL7jTLuyyPU/jJIIs894w9c2odu4hS4yWAhyAj I3AtjDZroKMr5auZUSHSnoUzrrDVSp0= Received: from relay2.suse.de (unknown [195.135.221.27]) by mx2.suse.de (Postfix) with ESMTP id EC8B2B169; Wed, 14 Oct 2020 07:05:40 +0000 (UTC) To: "xen-devel@lists.xenproject.org" Cc: Andrew Cooper , Wei Liu , =?UTF-8?Q?Roger_Pau_Monn=c3=a9?= From: Jan Beulich Subject: [PATCH] kexec: some #include adjustments Message-ID: Date: Wed, 14 Oct 2020 09:05:40 +0200 User-Agent: Mozilla/5.0 (Windows NT 6.1; WOW64; rv:68.0) Gecko/20100101 Thunderbird/68.12.1 MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Language: en-US Content-Transfer-Encoding: 7bit In the context of working on x86's elf_core_save_regs() I noticed there were far more source files getting rebuilt than I would have expected. While the main offender looks to have been fixmap.h including kexec.h, also drop use of elfcore.h from kexec.h. While adjusting machine_kexec.c also replace use of guest_access.h by domain_page.h. Signed-off-by: Jan Beulich --- a/xen/arch/x86/machine_kexec.c +++ b/xen/arch/x86/machine_kexec.c @@ -16,8 +16,9 @@ */ #include +#include +#include #include -#include #include #include #include --- a/xen/common/kexec.c +++ b/xen/common/kexec.c @@ -10,6 +10,7 @@ #include #include #include +#include #include #include #include --- a/xen/include/asm-x86/fixmap.h +++ b/xen/include/asm-x86/fixmap.h @@ -21,7 +21,6 @@ #include #include -#include #include #include #include --- a/xen/include/xen/elfcore.h +++ b/xen/include/xen/elfcore.h @@ -56,7 +56,7 @@ typedef struct int pr_fpvalid; /* True if math co-processor being used. */ } ELF_Prstatus; -typedef struct { +typedef struct crash_xen_info { unsigned long xen_major_version; unsigned long xen_minor_version; unsigned long xen_extra_version; --- a/xen/include/xen/kexec.h +++ b/xen/include/xen/kexec.h @@ -5,7 +5,6 @@ #include -#include #include typedef struct xen_kexec_reserve { @@ -51,7 +50,7 @@ void machine_reboot_kexec(struct kexec_i void machine_kexec(struct kexec_image *image); void kexec_crash(void); void kexec_crash_save_cpu(void); -crash_xen_info_t *kexec_crash_save_info(void); +struct crash_xen_info *kexec_crash_save_info(void); void machine_crash_shutdown(void); int machine_kexec_get(xen_kexec_range_t *range); int machine_kexec_get_xen(xen_kexec_range_t *range);