public inbox for kvm@vger.kernel.org
 help / color / mirror / Atom feed
From: Anup Patel <apatel@ventanamicro.com>
To: Will Deacon <will@kernel.org>,
	julien.thierry.kdev@gmail.com, maz@kernel.org
Cc: Paolo Bonzini <pbonzini@redhat.com>,
	Atish Patra <atishp@atishpatra.org>,
	Andrew Jones <ajones@ventanamicro.com>,
	Anup Patel <anup@brainfault.org>,
	kvm@vger.kernel.org, kvm-riscv@lists.infradead.org,
	Alexandru Elisei <alexandru.elisei@arm.com>,
	Anup Patel <apatel@ventanamicro.com>
Subject: [kvmtool PATCH v2 07/10] riscv: Fix no params with nodefault segfault
Date: Thu, 24 Apr 2025 21:01:56 +0530	[thread overview]
Message-ID: <20250424153159.289441-8-apatel@ventanamicro.com> (raw)
In-Reply-To: <20250424153159.289441-1-apatel@ventanamicro.com>

From: Andrew Jones <ajones@ventanamicro.com>

Fix segfault received when using --nodefault without --params.

Fixes: 7c9aac003925 ("riscv: Generate FDT at runtime for Guest/VM")
Suggested-by: Alexandru Elisei <alexandru.elisei@arm.com>
Signed-off-by: Andrew Jones <ajones@ventanamicro.com>
Reviewed-by: Alexandru Elisei <alexandru.elisei@arm.com>
Link: https://lore.kernel.org/r/20250123151339.185908-2-ajones@ventanamicro.com
Signed-off-by: Anup Patel <apatel@ventanamicro.com>
---
 riscv/fdt.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/riscv/fdt.c b/riscv/fdt.c
index 3ee20a9..251821e 100644
--- a/riscv/fdt.c
+++ b/riscv/fdt.c
@@ -263,9 +263,10 @@ static int setup_fdt(struct kvm *kvm)
 		if (kvm->cfg.kernel_cmdline)
 			_FDT(fdt_property_string(fdt, "bootargs",
 						 kvm->cfg.kernel_cmdline));
-	} else
+	} else if (kvm->cfg.real_cmdline) {
 		_FDT(fdt_property_string(fdt, "bootargs",
 					 kvm->cfg.real_cmdline));
+	}
 
 	_FDT(fdt_property_string(fdt, "stdout-path", "serial0"));
 
-- 
2.43.0


  parent reply	other threads:[~2025-04-24 15:32 UTC|newest]

Thread overview: 15+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2025-04-24 15:31 [kvmtool PATCH v2 00/10] Add SBI system suspend and cpu-type option Anup Patel
2025-04-24 15:31 ` [kvmtool PATCH v2 01/10] Sync-up headers with Linux-6.14 kernel Anup Patel
2025-04-24 15:31 ` [kvmtool PATCH v2 02/10] riscv: Add Svvptc extension support Anup Patel
2025-04-24 15:31 ` [kvmtool PATCH v2 03/10] riscv: Add Zabha " Anup Patel
2025-04-24 15:31 ` [kvmtool PATCH v2 04/10] riscv: Add Ziccrse " Anup Patel
2025-04-24 15:31 ` [kvmtool PATCH v2 05/10] riscv: Add SBI system suspend support Anup Patel
2025-04-24 15:31 ` [kvmtool PATCH v2 06/10] riscv: Make system suspend time configurable Anup Patel
2025-04-24 15:31 ` Anup Patel [this message]
2025-04-24 15:31 ` [kvmtool PATCH v2 08/10] riscv: Include single-letter extensions in isa_info_arr[] Anup Patel
2025-04-25 12:17   ` Andrew Jones
2025-04-24 15:31 ` [kvmtool PATCH v2 09/10] riscv: Add cpu-type command-line option Anup Patel
2025-04-25 12:25   ` Andrew Jones
2025-04-24 15:31 ` [kvmtool PATCH v2 10/10] riscv: Allow including extensions in the min CPU type using command-line Anup Patel
2025-04-25 12:43   ` Andrew Jones
2025-04-26  6:20     ` Anup Patel

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20250424153159.289441-8-apatel@ventanamicro.com \
    --to=apatel@ventanamicro.com \
    --cc=ajones@ventanamicro.com \
    --cc=alexandru.elisei@arm.com \
    --cc=anup@brainfault.org \
    --cc=atishp@atishpatra.org \
    --cc=julien.thierry.kdev@gmail.com \
    --cc=kvm-riscv@lists.infradead.org \
    --cc=kvm@vger.kernel.org \
    --cc=maz@kernel.org \
    --cc=pbonzini@redhat.com \
    --cc=will@kernel.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox