aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPeter Maydell <peter.maydell@linaro.org>2025-03-07 19:00:51 +0000
committerPaolo Bonzini <pbonzini@redhat.com>2025-03-09 11:25:10 +0100
commit816945364f698ae750aa665fce3d121c98e37a6f (patch)
treeed9c5e1fa30c4900f2d3f9fe6032b0822eb5b53f
parent563b1a35ed1f1151505d4fe5f723827d1b3fd4bc (diff)
downloadqemu-816945364f698ae750aa665fce3d121c98e37a6f.zip
qemu-816945364f698ae750aa665fce3d121c98e37a6f.tar.gz
qemu-816945364f698ae750aa665fce3d121c98e37a6f.tar.bz2
rust: pl011: Allow NULL chardev argument to pl011_create()
It's valid for the caller to pass a NULL chardev to pl011_create(); this means "don't set the chardev property on the device", which in turn means "act like there's no chardev". All the chardev frontend APIs (in C, at least) accept a NULL pointer to mean "do nothing". This fixes some failures in 'make check-functional' when Rust support is enabled. Signed-off-by: Peter Maydell <peter.maydell@linaro.org> Reviewed-by: Philippe Mathieu-Daudé <philmd@linaro.org> Link: https://lore.kernel.org/r/20250307190051.3274226-1-peter.maydell@linaro.org Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
-rw-r--r--rust/hw/char/pl011/src/device.rs6
1 files changed, 4 insertions, 2 deletions
diff --git a/rust/hw/char/pl011/src/device.rs b/rust/hw/char/pl011/src/device.rs
index af93ae8..f137b49 100644
--- a/rust/hw/char/pl011/src/device.rs
+++ b/rust/hw/char/pl011/src/device.rs
@@ -648,10 +648,12 @@ pub unsafe extern "C" fn pl011_create(
// SAFETY: The callers promise that they have owned references.
// They do not gift them to pl011_create, so use `Owned::from`.
let irq = unsafe { Owned::<IRQState>::from(&*irq) };
- let chr = unsafe { Owned::<Chardev>::from(&*chr) };
let dev = PL011State::new();
- dev.prop_set_chr("chardev", &chr);
+ if !chr.is_null() {
+ let chr = unsafe { Owned::<Chardev>::from(&*chr) };
+ dev.prop_set_chr("chardev", &chr);
+ }
dev.sysbus_realize();
dev.mmio_map(0, addr);
dev.connect_irq(0, &irq);