michaelh/zephyr
1
0
Fork 0
Code Releases Activity

ivshmem: shell: Fix crashing when device is not ready

Browse source 
Fix crash when device is not ready but ivshmem is not NULL.

Signed-off-by: Andrei Emeltchenko <andrei.emeltchenko@intel.com>
This commit is contained in:
Andrei Emeltchenko 2023-08-29 15:43:39 +03:00 • committed by Anas Nashif
commit f6d57e5210
1 changed files with 5 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

8
drivers/virtualization/virt_ivshmem_shell.c
View file

@ -8,7 +8,7 @@
#include <stdlib.h> #include <stdlib.h>
#include <zephyr/drivers/virtualization/ivshmem.h> #include <zephyr/drivers/virtualization/ivshmem.h>
static const struct device *ivshmem; static const struct device *ivshmem = DEVICE_DT_GET_ONE(qemu_ivshmem);
#ifdef CONFIG_IVSHMEM_DOORBELL #ifdef CONFIG_IVSHMEM_DOORBELL
@ -48,14 +48,12 @@ static void doorbell_notification_thread(const struct shell *sh)
static bool get_ivshmem(const struct shell *sh) static bool get_ivshmem(const struct shell *sh)
{ {
if (ivshmem == NULL) {
ivshmem = DEVICE_DT_GET_ONE(qemu_ivshmem);
if (!device_is_ready(ivshmem)) { if (!device_is_ready(ivshmem)) {
shell_error(sh, "IVshmem device is not ready"); shell_error(sh, "IVshmem device is not ready");
} return false;
} }
return ivshmem != NULL ? true : false; return true;
} }
static int cmd_ivshmem_shmem(const struct shell *sh, static int cmd_ivshmem_shmem(const struct shell *sh,