From: Vitaly Kuznetsov <vkuznets@redhat.com>
To: xen-devel@lists.xenproject.org
Cc: x86@kernel.org, linux-kernel@vger.kernel.org,
Boris Ostrovsky <boris.ostrovsky@oracle.com>,
Juergen Gross <jgross@suse.com>,
Andrew Jones <drjones@redhat.com>
Subject: [PATCH v3 16/21] x86/xen: define startup_xen for XEN PV only
Date: Tue, 14 Mar 2017 18:35:51 +0100 [thread overview]
Message-ID: <20170314173556.2249-17-vkuznets@redhat.com> (raw)
In-Reply-To: <20170314173556.2249-1-vkuznets@redhat.com>
startup_xen references PV-only code, decorate it with #ifdef CONFIG_XEN_PV
to make PV-free builds possible.
Signed-off-by: Vitaly Kuznetsov <vkuznets@redhat.com>
Reviewed-by: Juergen Gross <jgross@suse.com>
---
arch/x86/xen/xen-head.S | 4 ++++
1 file changed, 4 insertions(+)
diff --git a/arch/x86/xen/xen-head.S b/arch/x86/xen/xen-head.S
index 37794e4..72a8e6a 100644
--- a/arch/x86/xen/xen-head.S
+++ b/arch/x86/xen/xen-head.S
@@ -16,6 +16,7 @@
#include <xen/interface/xen-mca.h>
#include <asm/xen/interface.h>
+#ifdef CONFIG_XEN_PV
__INIT
ENTRY(startup_xen)
cld
@@ -34,6 +35,7 @@ ENTRY(startup_xen)
jmp xen_start_kernel
__FINIT
+#endif
.pushsection .text
.balign PAGE_SIZE
@@ -58,7 +60,9 @@ ENTRY(hypercall_page)
/* Map the p2m table to a 512GB-aligned user address. */
ELFNOTE(Xen, XEN_ELFNOTE_INIT_P2M, .quad PGDIR_SIZE)
#endif
+#ifdef CONFIG_XEN_PV
ELFNOTE(Xen, XEN_ELFNOTE_ENTRY, _ASM_PTR startup_xen)
+#endif
ELFNOTE(Xen, XEN_ELFNOTE_HYPERCALL_PAGE, _ASM_PTR hypercall_page)
ELFNOTE(Xen, XEN_ELFNOTE_FEATURES,
.ascii "!writable_page_tables|pae_pgdir_above_4gb")
--
2.9.3
next prev parent reply other threads:[~2017-03-14 17:36 UTC|newest]
Thread overview: 28+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-03-14 17:35 [PATCH v3 00/21] x86/xen: untangle PV and PVHVM guest support code Vitaly Kuznetsov
2017-03-14 17:35 ` [PATCH v3 01/21] x86/xen: separate PV and HVM hypervisors Vitaly Kuznetsov
2017-03-15 9:39 ` Juergen Gross
2017-03-14 17:35 ` [PATCH v3 02/21] x86/xen: globalize have_vcpu_info_placement Vitaly Kuznetsov
2017-03-14 17:35 ` [PATCH v3 03/21] x86/xen: add CONFIG_XEN_PV to Kconfig Vitaly Kuznetsov
2017-03-15 9:39 ` Juergen Gross
2017-03-14 17:35 ` [PATCH v3 04/21] x86/xen: split off enlighten_pvh.c Vitaly Kuznetsov
2017-03-14 17:35 ` [PATCH v3 05/21] x86/xen: split off enlighten_hvm.c Vitaly Kuznetsov
2017-03-14 17:35 ` [PATCH v3 06/21] x86/xen: split off enlighten_pv.c Vitaly Kuznetsov
2017-03-14 17:35 ` [PATCH v3 07/21] x86/xen: split xen_smp_intr_init()/xen_smp_intr_free() Vitaly Kuznetsov
2017-03-14 17:35 ` [PATCH v3 08/21] x86/xen: split xen_smp_prepare_boot_cpu() Vitaly Kuznetsov
2017-03-14 17:35 ` [PATCH v3 09/21] x86/xen: split xen_cpu_die() Vitaly Kuznetsov
2017-03-14 17:35 ` [PATCH v3 10/21] x86/xen: split off smp_hvm.c Vitaly Kuznetsov
2017-03-14 17:35 ` [PATCH v3 11/21] x86/xen: split off smp_pv.c Vitaly Kuznetsov
2017-03-14 17:35 ` [PATCH v3 12/21] x86/xen: split off mmu_hvm.c Vitaly Kuznetsov
2017-03-14 17:35 ` [PATCH v3 13/21] x86/xen: split off mmu_pv.c Vitaly Kuznetsov
2017-03-14 17:35 ` [PATCH v3 14/21] x86/xen: split suspend.c for PV and PVHVM guests Vitaly Kuznetsov
2017-03-14 17:35 ` [PATCH v3 15/21] x86/xen: put setup.c, pmu.c and apic.c under CONFIG_XEN_PV Vitaly Kuznetsov
2017-03-14 17:35 ` Vitaly Kuznetsov [this message]
2017-03-14 17:35 ` [PATCH v3 17/21] x86/xen: create stubs for HVM-only builds in page.h Vitaly Kuznetsov
2017-03-14 17:35 ` [PATCH v3 18/21] xen/balloon: decorate PV-only parts with #ifdef CONFIG_XEN_PV Vitaly Kuznetsov
2017-03-14 17:35 ` [PATCH v3 19/21] xen: create xen_create/destroy_contiguous_region() stubs for PVHVM only builds Vitaly Kuznetsov
2017-03-14 17:35 ` [PATCH v3 20/21] x86/xen: enable PVHVM-only builds Vitaly Kuznetsov
2017-03-14 17:35 ` [PATCH v3 21/21] x86/xen: rename some PV-only functions in smp_pv.c Vitaly Kuznetsov
2017-03-15 9:42 ` [PATCH v3 00/21] x86/xen: untangle PV and PVHVM guest support code Juergen Gross
2017-03-15 16:54 ` Boris Ostrovsky
2017-03-28 9:05 ` Juergen Gross
2017-03-28 11:27 ` Vitaly Kuznetsov
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20170314173556.2249-17-vkuznets@redhat.com \
--to=vkuznets@redhat.com \
--cc=boris.ostrovsky@oracle.com \
--cc=drjones@redhat.com \
--cc=jgross@suse.com \
--cc=linux-kernel@vger.kernel.org \
--cc=x86@kernel.org \
--cc=xen-devel@lists.xenproject.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox
Powered by JetHome