From: Wei Liu <wei.liu2@citrix.com>
Date: Thu, 11 Jan 2018 13:45:48 +0000 (+0000)
Subject: x86: don't swallow the first command line item in guest mode
X-Git-Tag: archive/raspbian/4.11.1-1+rpi1~1^2~66^2~793
X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=1557ebd8633e7be8ea3c1738a686463b6b1666ac;p=xen.git

x86: don't swallow the first command line item in guest mode

Signed-off-by: Wei Liu <wei.liu2@citrix.com>
---

diff --git a/xen/arch/x86/setup.c b/xen/arch/x86/setup.c
index 027514f75a..a11eb5c302 100644
--- a/xen/arch/x86/setup.c
+++ b/xen/arch/x86/setup.c
@@ -633,8 +633,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. */