[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
Re: [Qemu-arm] [Qemu-devel] [PATCH 1/4] qdev: Have qdev_set_parent_bus()
From: |
Igor Mammedov |
Subject: |
Re: [Qemu-arm] [Qemu-devel] [PATCH 1/4] qdev: Have qdev_set_parent_bus() handle devices already on a bus |
Date: |
Tue, 28 Feb 2017 16:55:33 +0100 |
On Tue, 28 Feb 2017 14:55:08 +0000
Peter Maydell <address@hidden> wrote:
> Instead of qdev_set_parent_bus() silently doing the wrong
> thing if it's handed a device that's already on a bus,
> have it remove the device from the old bus and add it to
> the new one. This is useful for the raspi2 sdcard.
>
> Signed-off-by: Peter Maydell <address@hidden>
Reviewed-by: Igor Mammedov <address@hidden>
> ---
> hw/core/qdev.c | 14 ++++++++++++++
> 1 file changed, 14 insertions(+)
>
> diff --git a/hw/core/qdev.c b/hw/core/qdev.c
> index 06ba02e..923e626 100644
> --- a/hw/core/qdev.c
> +++ b/hw/core/qdev.c
> @@ -102,9 +102,23 @@ static void bus_add_child(BusState *bus, DeviceState
> *child)
>
> void qdev_set_parent_bus(DeviceState *dev, BusState *bus)
> {
> + bool replugging = dev->parent_bus != NULL;
> +
> + if (replugging) {
> + /* Keep a reference to the device while it's not plugged into
> + * any bus, to avoid it potentially evaporating when it is
> + * dereffed in bus_remove_child().
> + */
> + object_ref(OBJECT(dev));
> + bus_remove_child(dev->parent_bus, dev);
> + object_unref(OBJECT(dev->parent_bus));
> + }
> dev->parent_bus = bus;
> object_ref(OBJECT(bus));
> bus_add_child(bus, dev);
> + if (replugging) {
> + object_unref(OBJECT(dev));
> + }
> }
>
> /* Create a new device. This only initializes the device state
- [Qemu-arm] [PATCH 0/4] handle reparenting of SD cards for rpi2, Peter Maydell, 2017/02/28
- [Qemu-arm] [PATCH 1/4] qdev: Have qdev_set_parent_bus() handle devices already on a bus, Peter Maydell, 2017/02/28
- Re: [Qemu-arm] [Qemu-devel] [PATCH 1/4] qdev: Have qdev_set_parent_bus() handle devices already on a bus,
Igor Mammedov <=
- [Qemu-arm] [PATCH 4/4] bcm2835: add sdhost and gpio controllers, Peter Maydell, 2017/02/28
- [Qemu-arm] [PATCH 3/4] bcm2835_gpio: add bcm2835 gpio controller, Peter Maydell, 2017/02/28
- [Qemu-arm] [PATCH 2/4] hw/sd: add card-reparenting function, Peter Maydell, 2017/02/28
- Re: [Qemu-arm] [PATCH 0/4] handle reparenting of SD cards for rpi2, Paolo Bonzini, 2017/02/28