[Pkg-libvirt-commits] [libguestfs] 18/156: ppc64: Use console=hvc0 console=ttyS0.

[Hilko Bengen]

This is an automated email from the git hooks/post-receive script.

bengen pushed a commit to branch master
in repository libguestfs.

commit f11d5bfb45b61bb3cfd618dc4f9dd03c35d7c6e2
Author: Richard W.M. Jones <rjones at redhat.com>
Date:   Wed May 21 09:36:34 2014 +0100

    ppc64: Use console=hvc0 console=ttyS0.
    
    console=ttyS0 used to work.  Now it's broken again, and the correct
    setting appears to be console=hvc0.  Since we can pass multiple
    console settings, do that to try and catch the right console.
    
    (cherry picked from commit 865f64006e9bab5c1c5efdfd9e8ceee140c8d998)
---
 src/launch.c | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/src/launch.c b/src/launch.c
index 3851b6a..e172860 100644
--- a/src/launch.c
+++ b/src/launch.c
@@ -326,10 +326,12 @@ guestfs__config (guestfs_h *g,
  * Note that this returns a newly allocated buffer which must be freed
  * by the caller.
  */
-#if defined(__arm__)
-#define SERIAL_CONSOLE "ttyAMA0"
+#if defined(__powerpc64__)
+#define SERIAL_CONSOLE "console=hvc0 console=ttyS0"
+#elif defined(__arm__)
+#define SERIAL_CONSOLE "console=ttyAMA0"
 #else
-#define SERIAL_CONSOLE "ttyS0"
+#define SERIAL_CONSOLE "console=ttyS0"
 #endif
 
 char *
@@ -363,7 +365,7 @@ guestfs___appliance_command_line (guestfs_h *g, const char *appliance_dev,
 #ifdef __i386__
      " noapic"                  /* workaround for RHBZ#857026 */
 #endif
-     " console=" SERIAL_CONSOLE /* serial console */
+     " " SERIAL_CONSOLE /* serial console */
      " udevtimeout=600" /* good for very slow systems (RHBZ#480319) */
      " no_timer_check"  /* fix for RHBZ#502058 */
      "%s"               /* lpj */

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-libvirt/libguestfs.git