motorhead/qemu
1
0
Fork 0
mirror of https://github.com/Motorhead1991/qemu.git synced 2025-08-05 00:33:55 -06:00
Code Issues Projects Releases Packages Wiki Activity Actions

sd/pxa2xx_mmci: Don't crash on pxa2xx_mmci_init() error

Browse source 
On error, pxa2xx_mmci_init() reports to stderr and returns NULL.
Callers don't check for errors.  Machines akita, borzoi, mainstone,
spitz, terrier, tosa, and z2 crash shortly after, like this:

    $ qemu-system-aarch64 -M akita -drive if=sd,readonly=on
    qemu-system-aarch64: failed to init SD card: Cannot use read-only drive as SD card
    Segmentation fault (core dumped)

Machines connex and verdex reach the check for orphaned drives first:

    $ aarch64-softmmu/qemu-system-aarch64 -M connex -drive if=sd,readonly=on -accel qtest
    qemu-system-aarch64: failed to init SD card: Cannot use read-only drive as SD card
    qemu-system-aarch64: -drive if=sd,readonly=on: machine type does not support if=sd,bus=0,unit=0

Make pxa2xx_mmci_init() fail cleanly right away.

Cc: Andrzej Zaborowski <balrogg@gmail.com>
Cc: Peter Maydell <peter.maydell@linaro.org>
Cc: qemu-arm@nongnu.org
Signed-off-by: Markus Armbruster <armbru@redhat.com>
Reviewed-by: Philippe Mathieu-Daudé <philmd@redhat.com>
Message-Id: <20200622094227.1271650-16-armbru@redhat.com>
This commit is contained in:
Markus Armbruster 2020-06-22 11:42:26 +02:00
parent c20b4ccce0
commit 17d26ac61e
1 changed files with 3 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

15
hw/sd/pxa2xx_mmci.c
View file

@ -18,7 +18,6 @@
#include "hw/arm/pxa.h" #include "hw/arm/pxa.h"
#include "hw/sd/sd.h" #include "hw/sd/sd.h"
#include "hw/qdev-properties.h" #include "hw/qdev-properties.h"
#include "qemu/error-report.h"
#include "qemu/log.h" #include "qemu/log.h"
#include "qemu/module.h" #include "qemu/module.h"
#include "trace.h" #include "trace.h"
@ -483,7 +482,6 @@ PXA2xxMMCIState *pxa2xx_mmci_init(MemoryRegion *sysmem,
DeviceState *dev, *carddev; DeviceState *dev, *carddev;
SysBusDevice *sbd; SysBusDevice *sbd;
PXA2xxMMCIState *s; PXA2xxMMCIState *s;
Error *err = NULL;
dev = qdev_new(TYPE_PXA2XX_MMCI); dev = qdev_new(TYPE_PXA2XX_MMCI);
s = PXA2XX_MMCI(dev); s = PXA2XX_MMCI(dev);
@ -496,16 +494,9 @@ PXA2xxMMCIState *pxa2xx_mmci_init(MemoryRegion *sysmem,
/* Create and plug in the sd card */ /* Create and plug in the sd card */
carddev = qdev_new(TYPE_SD_CARD); carddev = qdev_new(TYPE_SD_CARD);
qdev_prop_set_drive_err(carddev, "drive", blk, &err); qdev_prop_set_drive_err(carddev, "drive", blk, &error_fatal);
if (err) { qdev_realize_and_unref(carddev, qdev_get_child_bus(dev, "sd-bus"),
error_reportf_err(err, "failed to init SD card: "); &error_fatal);
return NULL;
}
qdev_realize_and_unref(carddev, qdev_get_child_bus(dev, "sd-bus"), &err);
if (err) {
error_reportf_err(err, "failed to init SD card: ");
return NULL;
}
return s; return s;
} }