cip-dev@lists.cip-project.org | [PATCH] start-qemu.sh: Set console when using qemu-amd64 with nographic

Home Messages Hashtags Subgroups

Date Date 1 - 4 of 4

[PATCH] start-qemu.sh: Set console when using qemu-amd64 with nographic

Akihiro Suzuki #2029 Signed-off-by: Akihiro Suzuki <akihiro27.suzuki@...> --- start-qemu.sh \| 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/start-qemu.sh b/start-qemu.sh index b71ba32..46b7961 100755 --- a/start-qemu.sh +++ b/start-qemu.sh @@ -83,8 +83,15 @@ fi shift 1 +QEMU_EXTRA_ARGS="${QEMU_EXTRA_ARGS} $@" +if [ -n "`echo ${QEMU_EXTRA_ARGS} \| grep -- -nographic`" ]; then + if [ ${DISTRO_ARCH} = "amd64" ]; then + KERNEL_CMDLINE="${KERNEL_CMDLINE} console=ttyS0" + fi +fi + ${QEMU_PATH}${QEMU} \ -drive file=${IMAGE_FILE},discard=unmap,if=none,id=disk,format=raw \ -m 1G -serial mon:stdio -netdev user,id=net \ -kernel ${KERNEL_FILE} -append "${KERNEL_CMDLINE}" \ - -initrd ${INITRD_FILE} ${QEMU_EXTRA_ARGS} "$@" + -initrd ${INITRD_FILE} ${QEMU_EXTRA_ARGS} -- 2.17.1
More All Messages By This Member
Jan Kiszka #2031 On 03.04.19 10:33, Akihiro Suzuki wrote: Signed-off-by: Akihiro Suzuki <akihiro27.suzuki@...> --- start-qemu.sh \| 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/start-qemu.sh b/start-qemu.sh index b71ba32..46b7961 100755 --- a/start-qemu.sh +++ b/start-qemu.sh @@ -83,8 +83,15 @@ fi shift 1 +QEMU_EXTRA_ARGS="${QEMU_EXTRA_ARGS} $@" +if [ -n "`echo ${QEMU_EXTRA_ARGS} \| grep -- -nographic`" ]; then + if [ ${DISTRO_ARCH} = "amd64" ]; then + KERNEL_CMDLINE="${KERNEL_CMDLINE} console=ttyS0" + fi +fi + ${QEMU_PATH}${QEMU} \ -drive file=${IMAGE_FILE},discard=unmap,if=none,id=disk,format=raw \ -m 1G -serial mon:stdio -netdev user,id=net \ -kernel ${KERNEL_FILE} -append "${KERNEL_CMDLINE}" \ - -initrd ${INITRD_FILE} ${QEMU_EXTRA_ARGS} "$@" + -initrd ${INITRD_FILE} ${QEMU_EXTRA_ARGS} This is not what I meant. I was rather thinking of diff --git a/start-qemu.sh b/start-qemu.sh index b71ba32..62522db 100755 --- a/start-qemu.sh +++ b/start-qemu.sh @@ -32,7 +32,7 @@ case "$1" in -device ide-hd,drive=disk \ -device virtio-net-pci,netdev=net" KERNEL_CMDLINE=" \ - root=/dev/sda vga=0x305" + root=/dev/sda vga=0x305 console=ttyS0" ;; arm64\|aarch64) DISTRO_ARCH=arm64 As mentioned before, there is no reason to confine this to -nographic mode. Jan -- Siemens AG, Corporate Technology, CT RDA IOT SES-DE Corporate Competence Center Embedded Linux
More All Messages By This Member
Akihiro Suzuki #2032 Hi Jan, Signed-off-by: Akihiro Suzuki <akihiro27.suzuki@...> --- start-qemu.sh \| 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/start-qemu.sh b/start-qemu.sh index b71ba32..46b7961 100755 --- a/start-qemu.sh +++ b/start-qemu.sh @@ -83,8 +83,15 @@ fi shift 1 +QEMU_EXTRA_ARGS="${QEMU_EXTRA_ARGS} $@" +if [ -n "`echo ${QEMU_EXTRA_ARGS} \| grep -- -nographic`" ]; then + if [ ${DISTRO_ARCH} = "amd64" ]; then + KERNEL_CMDLINE="${KERNEL_CMDLINE} console=ttyS0" + fi +fi + ${QEMU_PATH}${QEMU} \ -drive file=${IMAGE_FILE},discard=unmap,if=none,id=disk,format=raw \ -m 1G -serial mon:stdio -netdev user,id=net \ -kernel ${KERNEL_FILE} -append "${KERNEL_CMDLINE}" \ - -initrd ${INITRD_FILE} ${QEMU_EXTRA_ARGS} "$@" + -initrd ${INITRD_FILE} ${QEMU_EXTRA_ARGS} This is not what I meant. I was rather thinking of diff --git a/start-qemu.sh b/start-qemu.sh index b71ba32..62522db 100755 --- a/start-qemu.sh +++ b/start-qemu.sh @@ -32,7 +32,7 @@ case "$1" in -device ide-hd,drive=disk \ -device virtio-net-pci,netdev=net" KERNEL_CMDLINE=" \ - root=/dev/sda vga=0x305" + root=/dev/sda vga=0x305 console=ttyS0" ;; arm64\|aarch64) DISTRO_ARCH=arm64 As mentioned before, there is no reason to confine this to -nographic mode. I'm sorry, I misunderstood. The changes you have shown are enough to solve the issue. Could you commit and push it for me instead? Best regards, Suzuki -----Original Message----- From: Jan Kiszka [mailto:jan.kiszka@...] Sent: Wednesday, April 03, 2019 6:15 PM To: suzuki akihiro(鈴木章浩 ○ＳＷＣ□ＯＳＴ) <akihiro27.suzuki@...> Cc: cip-dev@... Subject: Re: [PATCH] start-qemu.sh: Set console when using qemu-amd64 with nographic On 03.04.19 10:33, Akihiro Suzuki wrote: Signed-off-by: Akihiro Suzuki <akihiro27.suzuki@...> --- start-qemu.sh \| 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/start-qemu.sh b/start-qemu.sh index b71ba32..46b7961 100755 --- a/start-qemu.sh +++ b/start-qemu.sh @@ -83,8 +83,15 @@ fi shift 1 +QEMU_EXTRA_ARGS="${QEMU_EXTRA_ARGS} $@" +if [ -n "`echo ${QEMU_EXTRA_ARGS} \| grep -- -nographic`" ]; then + if [ ${DISTRO_ARCH} = "amd64" ]; then + KERNEL_CMDLINE="${KERNEL_CMDLINE} console=ttyS0" + fi +fi + ${QEMU_PATH}${QEMU} \ -drive file=${IMAGE_FILE},discard=unmap,if=none,id=disk,format=raw \ -m 1G -serial mon:stdio -netdev user,id=net \ -kernel ${KERNEL_FILE} -append "${KERNEL_CMDLINE}" \ - -initrd ${INITRD_FILE} ${QEMU_EXTRA_ARGS} "$@" + -initrd ${INITRD_FILE} ${QEMU_EXTRA_ARGS} This is not what I meant. I was rather thinking of diff --git a/start-qemu.sh b/start-qemu.sh index b71ba32..62522db 100755 --- a/start-qemu.sh +++ b/start-qemu.sh @@ -32,7 +32,7 @@ case "$1" in -device ide-hd,drive=disk \ -device virtio-net-pci,netdev=net" KERNEL_CMDLINE=" \ - root=/dev/sda vga=0x305" + root=/dev/sda vga=0x305 console=ttyS0" ;; arm64\|aarch64) DISTRO_ARCH=arm64 As mentioned before, there is no reason to confine this to -nographic mode. Jan -- Siemens AG, Corporate Technology, CT RDA IOT SES-DE Corporate Competence Center Embedded Linux
More All Messages By This Member
Jan Kiszka #2034 On 03.04.19 11:54, akihiro27.suzuki@... wrote: Hi Jan, Signed-off-by: Akihiro Suzuki <akihiro27.suzuki@...> --- start-qemu.sh \| 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/start-qemu.sh b/start-qemu.sh index b71ba32..46b7961 100755 --- a/start-qemu.sh +++ b/start-qemu.sh @@ -83,8 +83,15 @@ fi shift 1 +QEMU_EXTRA_ARGS="${QEMU_EXTRA_ARGS} $@" +if [ -n "`echo ${QEMU_EXTRA_ARGS} \| grep -- -nographic`" ]; then + if [ ${DISTRO_ARCH} = "amd64" ]; then + KERNEL_CMDLINE="${KERNEL_CMDLINE} console=ttyS0" + fi +fi + ${QEMU_PATH}${QEMU} \ -drive file=${IMAGE_FILE},discard=unmap,if=none,id=disk,format=raw \ -m 1G -serial mon:stdio -netdev user,id=net \ -kernel ${KERNEL_FILE} -append "${KERNEL_CMDLINE}" \ - -initrd ${INITRD_FILE} ${QEMU_EXTRA_ARGS} "$@" + -initrd ${INITRD_FILE} ${QEMU_EXTRA_ARGS} This is not what I meant. I was rather thinking of diff --git a/start-qemu.sh b/start-qemu.sh index b71ba32..62522db 100755 --- a/start-qemu.sh +++ b/start-qemu.sh @@ -32,7 +32,7 @@ case "$1" in -device ide-hd,drive=disk \ -device virtio-net-pci,netdev=net" KERNEL_CMDLINE=" \ - root=/dev/sda vga=0x305" + root=/dev/sda vga=0x305 console=ttyS0" ;; arm64\|aarch64) DISTRO_ARCH=arm64 As mentioned before, there is no reason to confine this to -nographic mode. I'm sorry, I misunderstood. The changes you have shown are enough to solve the issue. Could you commit and push it for me instead? Sure, patch pushed into next branch. Jan -- Siemens AG, Corporate Technology, CT RDA IOT SES-DE Corporate Competence Center Embedded Linux
More All Messages By This Member

1 - 4 of 4

1

Previous Topic Next Topic

Home Hashtags Subgroups Terms