This is a note to let you know that I've just added the patch titled

    x86/xen: Fix boot loader version reported for PVH guests

to the 4.19-stable tree which can be found at:
    
http://www.kernel.org/git/?p=linux/kernel/git/stable/stable-queue.git;a=summary

The filename of the patch is:
     x86-xen-fix-boot-loader-version-reported-for-pvh-guests.patch
and it can be found in the queue-4.19 subdirectory.

If you, or anyone else, feels it should not be added to the stable tree,
please let <sta...@vger.kernel.org> know about it.


From 357d291ce035d1b757568058f3c9898c60d125b1 Mon Sep 17 00:00:00 2001
From: Juergen Gross <jgr...@suse.com>
Date: Wed, 10 Oct 2018 08:14:54 +0200
Subject: x86/xen: Fix boot loader version reported for PVH guests

From: Juergen Gross <jgr...@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 <jgr...@suse.com>
Cc: <sta...@vger.kernel.org> # 4.12
Cc: Linus Torvalds <torva...@linux-foundation.org>
Cc: Peter Zijlstra <pet...@infradead.org>
Cc: Thomas Gleixner <t...@linutronix.de>
Cc: boris.ostrov...@oracle.com
Cc: b...@alien8.de
Cc: cor...@lwn.net
Cc: linux-...@vger.kernel.org
Cc: xen-devel@lists.xenproject.org
Link: http://lkml.kernel.org/r/20181010061456.22238-2-jgr...@suse.com
Signed-off-by: Ingo Molnar <mi...@kernel.org>
Signed-off-by: Greg Kroah-Hartman <gre...@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;


Patches currently in stable-queue which might be from jgr...@suse.com are

queue-4.19/x86-xen-fix-boot-loader-version-reported-for-pvh-guests.patch

_______________________________________________
Xen-devel mailing list
Xen-devel@lists.xenproject.org
https://lists.xenproject.org/mailman/listinfo/xen-devel

Reply via email to