[Xen-changelog] [xen stable-4.10] x86: don't swallow the first command line item in guest mode

[patchbot@xxxxxxx]

commit 3b058a3eabf24b4b31521a49a600438b6a511739
Author:     Wei Liu <wei.liu2@xxxxxxxxxx>
AuthorDate: Thu Jan 11 13:45:48 2018 +0000
Commit:     Roger Pau Monne <roger.pau@xxxxxxxxxx>
CommitDate: Thu Jan 11 17:51:19 2018 +0000

    x86: don't swallow the first command line item in guest mode
    
    Signed-off-by: Wei Liu <wei.liu2@xxxxxxxxxx>
---
 xen/arch/x86/setup.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/xen/arch/x86/setup.c b/xen/arch/x86/setup.c
index b9b97d68f5..c1f4184e06 100644
--- a/xen/arch/x86/setup.c
+++ b/xen/arch/x86/setup.c
@@ -632,8 +632,8 @@ static char * __init cmdline_cook(char *p, const char 
*loader_name)
     while ( *p == ' ' )
         p++;
 
-    /* GRUB2 does not include image name as first item on command line. */
-    if ( loader_is_grub2(loader_name) )
+    /* GRUB2 and PVH don't not include image name as first item on command 
line. */
+    if ( xen_guest || loader_is_grub2(loader_name) )
         return p;
 
     /* Strip image name plus whitespace. */
--
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