From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:46200) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1WWzGk-0006cW-NU for qemu-devel@nongnu.org; Sun, 06 Apr 2014 22:26:50 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1WWzGd-0000ry-7r for qemu-devel@nongnu.org; Sun, 06 Apr 2014 22:26:42 -0400 Received: from mail-pa0-f48.google.com ([209.85.220.48]:63128) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1WWzGd-0000rp-1c for qemu-devel@nongnu.org; Sun, 06 Apr 2014 22:26:35 -0400 Received: by mail-pa0-f48.google.com with SMTP id hz1so6055564pad.35 for ; Sun, 06 Apr 2014 19:26:33 -0700 (PDT) Message-ID: <53420CCF.2070206@ozlabs.ru> Date: Mon, 07 Apr 2014 12:26:23 +1000 From: Alexey Kardashevskiy MIME-Version: 1.0 References: <1396618620-27823-1-git-send-email-imammedo@redhat.com> <1396618620-27823-9-git-send-email-imammedo@redhat.com> In-Reply-To: <1396618620-27823-9-git-send-email-imammedo@redhat.com> Content-Type: text/plain; charset=KOI8-R Content-Transfer-Encoding: 7bit Subject: Re: [Qemu-devel] [PATCH 08/35] qdev: hotplug for buss-less devices List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: Igor Mammedov , qemu-devel@nongnu.org Cc: peter.maydell@linaro.org, mst@redhat.com, hutao@cn.fujitsu.com, mjt@tls.msk.ru, lcapitulino@redhat.com, kraxel@redhat.com, akong@redhat.com, quintela@redhat.com, armbru@redhat.com, aliguori@amazon.com, jan.kiszka@siemens.com, lersek@redhat.com, ehabkost@redhat.com, marcel.a@redhat.com, stefanha@redhat.com, chegu_vinod@hp.com, rth@twiddle.net, kwolf@redhat.com, s.priebe@profihost.ag, mreitz@redhat.com, vasilis.liaskovitis@profitbricks.com, pbonzini@redhat.com, afaerber@suse.de On 04/05/2014 12:36 AM, Igor Mammedov wrote: > Adds get_hotplug_handler() method to machine, and > makes bus-less device to use it during hotplug > as a means to discover hotplug handler controller. > Returned controller is used to permorm a hotplug > action. "returned controller" is a machine here? Why not to make a memory controller + bus instead? I thought this is the preferred approach in qom'ed QEMU :) > Signed-off-by: Igor Mammedov > --- > hw/core/qdev.c | 13 +++++++++++++ > include/hw/boards.h | 8 ++++++++ > 2 files changed, 21 insertions(+) > > diff --git a/hw/core/qdev.c b/hw/core/qdev.c > index 60f9df1..50bb8f5 100644 > --- a/hw/core/qdev.c > +++ b/hw/core/qdev.c > @@ -34,6 +34,7 @@ > #include "qapi/qmp/qjson.h" > #include "monitor/monitor.h" > #include "hw/hotplug.h" > +#include "hw/boards.h" > > int qdev_hotplug = 0; > static bool qdev_hot_added = false; > @@ -761,6 +762,18 @@ static void device_set_realized(Object *obj, bool value, Error **err) > local_err == NULL) { > hotplug_handler_plug(dev->parent_bus->hotplug_handler, > dev, &local_err); > + } else if (local_err == NULL && > + object_dynamic_cast(qdev_get_machine(), TYPE_MACHINE)) { > + HotplugHandler *hotplug_ctrl; > + MachineState *machine = MACHINE(qdev_get_machine()); > + MachineClass *mc = MACHINE_GET_CLASS(machine); > + > + if (mc->get_hotplug_handler) { > + hotplug_ctrl = mc->get_hotplug_handler(machine, dev); > + if (hotplug_ctrl) { > + hotplug_handler_plug(hotplug_ctrl, dev, &local_err); > + } > + } > } > > if (qdev_get_vmsd(dev) && local_err == NULL) { > diff --git a/include/hw/boards.h b/include/hw/boards.h > index 3567190..67750b5 100644 > --- a/include/hw/boards.h > +++ b/include/hw/boards.h > @@ -73,6 +73,11 @@ extern MachineState *current_machine; > /** > * MachineClass: > * @qemu_machine: #QEMUMachine > + * @get_hotplug_handler: this function is called during bus-less > + * device hotplug. If defined it returns pointer to an instance > + * of HotplugHandler object, which handles hotplug operation > + * for a given @dev. It may return NULL if @dev doesn't require > + * any actions to be performed by hotplug handler. > */ > struct MachineClass { > /*< private >*/ > @@ -80,6 +85,9 @@ struct MachineClass { > /*< public >*/ > > QEMUMachine *qemu_machine; > + > + HotplugHandler *(*get_hotplug_handler)(MachineState *machine, > + DeviceState *dev); > }; > > /** > -- Alexey