On Fri, 23 Nov 2012 16:56:18 +0100
Paolo Bonzini <pbonz...@redhat.com> wrote:
> Commit 0d93692 (qdev: Convert busses to QEMU Object Model, 2012-05-02)
> removed a check on the type of the bus where a SCSI disk is hotplugged.
> However, hot-plugging to the wrong kind of device now causes a crash
> due to either a NULL pointer dereference (avoided by the previous patch)
> or a failed QOM cast.
>
> Instead, in this case we need to use object_dynamic_cast and check for
> the result, similar to what was done before that commit.
>
> Reported-by: Markus Armbruster <arm...@redhat.com>
> Signed-off-by: Paolo Bonzini <pbonz...@redhat.com>
As far as HMP is concerned this looks good.
> ---
> hw/pci-hotplug.c | 8 +++++++-
> 1 file changed, 7 insertions(+), 1 deletion(-)
>
> diff --git a/hw/pci-hotplug.c b/hw/pci-hotplug.c
> index e7fb780..0ca5546 100644
> --- a/hw/pci-hotplug.c
> +++ b/hw/pci-hotplug.c
> @@ -80,7 +80,13 @@ static int scsi_hot_add(Monitor *mon, DeviceState *adapter,
> SCSIBus *scsibus;
> SCSIDevice *scsidev;
>
> - scsibus = SCSI_BUS(QLIST_FIRST(&adapter->child_bus));
> + scsibus = (SCSIBus *)
> + object_dynamic_cast(OBJECT(QLIST_FIRST(&adapter->child_bus)),
> + TYPE_SCSI_BUS);
> + if (!scsibus) {
> + error_report("Device is not a SCSI adapter");
> + return -1;
> + }
>
> /*
> * drive_init() tries to find a default for dinfo->unit. Doesn't
