[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index] [Xen-changelog] [xen stable-4.10] Merge tag '4.10.0-shim-comet-3' into staging-4.10
commit da3a46d017d6c786230cc74589ef3ed35b96cfa9 Merge: b6a6458b13dc6f04e17620447a760ff70b1eb4c6 fa23f2aaa24c603f748b49b32378b738d18cc68f Author: Wei Liu <wei.liu2@xxxxxxxxxx> AuthorDate: Mon Mar 5 11:15:16 2018 +0000 Commit: Wei Liu <wei.liu2@xxxxxxxxxx> CommitDate: Mon Mar 5 11:15:16 2018 +0000 Merge tag '4.10.0-shim-comet-3' into staging-4.10 Xen 4.10.0 "Comet" shim v3 Fixed trivial merge conflicts of comet and spec ctrl series. Signed-off-by: Wei Liu <wei.liu2@xxxxxxxxxx> .gitignore | 5 + docs/man/xl.cfg.pod.5.in | 35 ++ docs/misc/xen-command-line.markdown | 36 +- stubdom/grub/kexec.c | 7 +- tools/firmware/Makefile | 9 + tools/firmware/xen-dir/Makefile | 60 +++ tools/firmware/xen-dir/shim.config | 86 +++ tools/helpers/init-xenstore-domain.c | 4 +- tools/libxc/include/xc_dom.h | 48 +- tools/libxc/include/xenctrl.h | 1 + tools/libxc/xc_dom_compat_linux.c | 2 +- tools/libxc/xc_dom_core.c | 154 ++++-- tools/libxc/xc_dom_x86.c | 65 +-- tools/libxc/xc_domain.c | 1 + tools/libxl/libxl.h | 8 + tools/libxl/libxl_create.c | 18 + tools/libxl/libxl_dm.c | 2 +- tools/libxl/libxl_dom.c | 67 ++- tools/libxl/libxl_internal.h | 4 + tools/libxl/libxl_types.idl | 6 +- tools/ocaml/libs/xc/xenctrl.ml | 31 +- tools/ocaml/libs/xc/xenctrl.mli | 30 +- tools/ocaml/libs/xc/xenctrl_stubs.c | 48 +- tools/xl/xl_parse.c | 14 + xen/Makefile | 16 +- xen/arch/x86/Kconfig | 40 +- xen/arch/x86/Makefile | 9 + xen/arch/x86/acpi/lib.c | 2 +- xen/arch/x86/apic.c | 38 +- xen/arch/x86/boot/build32.mk | 1 + xen/arch/x86/boot/cmdline.c | 5 +- xen/arch/x86/boot/head.S | 50 ++ xen/arch/x86/boot/trampoline.S | 7 + xen/arch/x86/boot/x86_64.S | 5 +- xen/arch/x86/compat.c | 4 +- xen/arch/x86/cpu/amd.c | 16 +- xen/arch/x86/cpu/common.c | 76 ++- xen/arch/x86/cpu/intel.c | 82 +-- xen/arch/x86/dom0_build.c | 48 +- xen/arch/x86/domctl.c | 2 + xen/arch/x86/e820.c | 7 +- xen/arch/x86/efi/efi-boot.h | 4 + xen/arch/x86/guest/Makefile | 4 + xen/arch/x86/guest/hypercall_page.S | 79 +++ xen/arch/x86/guest/pvh-boot.c | 139 +++++ xen/arch/x86/guest/xen.c | 389 ++++++++++++++ xen/arch/x86/hvm/dom0_build.c | 4 - xen/arch/x86/mm.c | 18 +- xen/arch/x86/mpparse.c | 2 +- xen/arch/x86/msi.c | 3 +- xen/arch/x86/platform_hypercall.c | 2 + xen/arch/x86/pv/Makefile | 1 + xen/arch/x86/pv/dom0_build.c | 58 ++- xen/arch/x86/pv/hypercall.c | 17 + xen/arch/x86/pv/shim.c | 957 ++++++++++++++++++++++++++++++++++ xen/arch/x86/setup.c | 84 ++- xen/arch/x86/shutdown.c | 39 +- xen/arch/x86/smpboot.c | 4 + xen/arch/x86/tboot.c | 4 +- xen/arch/x86/time.c | 124 ++++- xen/arch/x86/xen.lds.S | 82 ++- xen/common/domain.c | 53 +- xen/common/event_channel.c | 99 ++-- xen/common/libelf/libelf-dominfo.c | 9 +- xen/common/memory.c | 21 + xen/common/page_alloc.c | 15 + xen/common/rangeset.c | 52 ++ xen/common/schedule.c | 3 +- xen/drivers/acpi/apei/apei-io.c | 2 +- xen/drivers/acpi/tables/tbfadt.c | 5 +- xen/drivers/char/Makefile | 2 + xen/drivers/char/console.c | 72 +++ xen/drivers/char/consoled.c | 148 ++++++ xen/drivers/char/ehci-dbgp.c | 2 +- xen/drivers/char/ns16550.c | 2 +- xen/drivers/char/xen_pv_console.c | 208 ++++++++ xen/drivers/video/Kconfig | 8 +- xen/include/asm-x86/apicdef.h | 2 +- xen/include/asm-x86/asm_defns.h | 12 + xen/include/asm-x86/cpuid.h | 3 - xen/include/asm-x86/dom0_build.h | 4 + xen/include/asm-x86/e820.h | 1 + xen/include/asm-x86/fixmap.h | 6 +- xen/include/asm-x86/guest.h | 37 ++ xen/include/asm-x86/guest/hypercall.h | 206 ++++++++ xen/include/asm-x86/guest/pvh-boot.h | 57 ++ xen/include/asm-x86/guest/xen.h | 92 ++++ xen/include/asm-x86/hypercall.h | 3 + xen/include/asm-x86/processor.h | 4 +- xen/include/asm-x86/pv/shim.h | 107 ++++ xen/include/asm-x86/setup.h | 6 + xen/include/public/domctl.h | 3 +- xen/include/xen/consoled.h | 27 + xen/include/xen/domain.h | 1 + xen/include/xen/event.h | 15 + xen/include/xen/pv_console.h | 38 ++ xen/include/xen/rangeset.h | 4 +- xen/include/xen/sched.h | 4 +- 98 files changed, 4085 insertions(+), 411 deletions(-) diff --cc xen/arch/x86/setup.c index b2aa281d72,cf07e5045d..5e5cfaf5f8 --- a/xen/arch/x86/setup.c +++ b/xen/arch/x86/setup.c @@@ -51,7 -51,7 +51,8 @@@ #include <asm/alternative.h> #include <asm/mc146818rtc.h> #include <asm/cpuid.h> + #include <asm/guest.h> +#include <asm/spec_ctrl.h> /* opt_nosmp: If true, secondary processors are ignored. */ static bool __initdata opt_nosmp; diff --cc xen/arch/x86/smpboot.c index 005287c65c,5ed82b16a8..8a850c49c4 --- a/xen/arch/x86/smpboot.c +++ b/xen/arch/x86/smpboot.c @@@ -38,9 -38,9 +38,10 @@@ #include <asm/desc.h> #include <asm/div64.h> #include <asm/flushtlb.h> + #include <asm/guest.h> #include <asm/msr.h> #include <asm/mtrr.h> +#include <asm/spec_ctrl.h> #include <asm/time.h> #include <asm/tboot.h> #include <mach_apic.h> diff --cc xen/arch/x86/xen.lds.S index d3c984a463,509f176913..095298048f --- a/xen/arch/x86/xen.lds.S +++ b/xen/arch/x86/xen.lds.S @@@ -54,12 -58,14 +58,15 @@@ SECTION __2M_text_start = .; /* Start of 2M superpages, mapped RX. */ #endif + start_pa = ABSOLUTE(start - __XEN_VIRT_START); + . = __XEN_VIRT_START + XEN_IMG_OFFSET; _start = .; - .text : { + DECL_SECTION(.text) { _stext = .; /* Text and read-only data */ *(.text) + *(.text.__x86_indirect_thunk_*) + *(.text.page_aligned) *(.text.cold) *(.text.unlikely) *(.fixup) diff --cc xen/include/asm-x86/asm_defns.h index ba96b0e823,35a5d9ee03..88b775b3b3 --- a/xen/include/asm-x86/asm_defns.h +++ b/xen/include/asm-x86/asm_defns.h @@@ -375,6 -409,16 +375,18 @@@ static always_inline void stac(void #define REX64_PREFIX "rex64/" #endif + #define ELFNOTE(name, type, desc) \ + .pushsection .note.name, "a", @note ; \ + .p2align 2 ; \ + .long 2f - 1f /* namesz */ ; \ + .long 4f - 3f /* descsz */ ; \ + .long type /* type */ ; \ + 1: .asciz #name /* name */ ; \ + 2: .p2align 2 ; \ + 3: desc /* desc */ ; \ + 4: .p2align 2 ; \ + .popsection + +#include <asm/spec_ctrl_asm.h> + #endif /* __X86_ASM_DEFNS_H__ */ -- generated by git-patchbot for /home/xen/git/xen.git#stable-4.10 _______________________________________________ Xen-changelog mailing list Xen-changelog@xxxxxxxxxxxxxxxxxxxx https://lists.xenproject.org/xen-changelog
|
Lists.xenproject.org is hosted with RackSpace, monitoring our |