lkml.org 
[lkml]   [2018]   [Nov]   [12]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 4.19 042/361] x86/xen: Fix boot loader version reported for PVH guests
    Date
    4.19-stable review patch.  If anyone has any objections, please let me know.

    ------------------

    From: Juergen Gross <jgross@suse.com>

    commit 357d291ce035d1b757568058f3c9898c60d125b1 upstream.

    The boot loader version reported via sysfs is wrong in case of the
    kernel being booted via the Xen PVH boot entry. it should be 2.12
    (0x020c), but it is reported to be 2.18 (0x0212).

    As the current way to set the version is error prone use the more
    readable variant (2 << 8) | 12.

    Signed-off-by: Juergen Gross <jgross@suse.com>
    Cc: <stable@vger.kernel.org> # 4.12
    Cc: Linus Torvalds <torvalds@linux-foundation.org>
    Cc: Peter Zijlstra <peterz@infradead.org>
    Cc: Thomas Gleixner <tglx@linutronix.de>
    Cc: boris.ostrovsky@oracle.com
    Cc: bp@alien8.de
    Cc: corbet@lwn.net
    Cc: linux-doc@vger.kernel.org
    Cc: xen-devel@lists.xenproject.org
    Link: http://lkml.kernel.org/r/20181010061456.22238-2-jgross@suse.com
    Signed-off-by: Ingo Molnar <mingo@kernel.org>
    Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

    ---
    arch/x86/xen/enlighten_pvh.c | 2 +-
    1 file changed, 1 insertion(+), 1 deletion(-)

    --- a/arch/x86/xen/enlighten_pvh.c
    +++ b/arch/x86/xen/enlighten_pvh.c
    @@ -75,7 +75,7 @@ static void __init init_pvh_bootparams(v
    * Version 2.12 supports Xen entry point but we will use default x86/PC
    * environment (i.e. hardware_subarch 0).
    */
    - pvh_bootparams.hdr.version = 0x212;
    + pvh_bootparams.hdr.version = (2 << 8) | 12;
    pvh_bootparams.hdr.type_of_loader = (9 << 4) | 0; /* Xen loader */

    x86_init.acpi.get_root_pointer = pvh_get_root_pointer;

    \
     
     \ /
      Last update: 2018-11-12 01:18    [W:4.197 / U:0.128 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site