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 027514f75a3b1b11b2dd9f1c50ae8f90b67f8167..a11eb5c3023050d9bd3a4a4cad30f9a6bfb79090 100644 (file)
--- 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. */