From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:56020) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1WGTCl-0002Yg-Iw for qemu-devel@nongnu.org; Thu, 20 Feb 2014 07:58:25 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1WGTCf-0003sg-DS for qemu-devel@nongnu.org; Thu, 20 Feb 2014 07:58:19 -0500 Received: from mx1.redhat.com ([209.132.183.28]:43907) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1WGTCf-0003sZ-3P for qemu-devel@nongnu.org; Thu, 20 Feb 2014 07:58:13 -0500 Message-ID: <5305FBDE.8030004@redhat.com> Date: Thu, 20 Feb 2014 13:58:06 +0100 From: Paolo Bonzini MIME-Version: 1.0 References: <1392900630-17608-1-git-send-email-stefanha@redhat.com> <1392900630-17608-6-git-send-email-stefanha@redhat.com> In-Reply-To: <1392900630-17608-6-git-send-email-stefanha@redhat.com> Content-Type: text/plain; charset=ISO-8859-15; format=flowed Content-Transfer-Encoding: 7bit Subject: Re: [Qemu-devel] [PATCH v3 5/6] iothread: add "iothread" qdev property type List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: Stefan Hajnoczi , qemu-devel@nongnu.org Cc: Kevin Wolf , Fam Zheng , Michael Roth Il 20/02/2014 13:50, Stefan Hajnoczi ha scritto: > Add a "iothread" qdev property type so devices can be hooked up to an > IOThread from the comand-line: > > qemu -object iothread,id=iothread0 \ > -device some-device,iothread=iothread0 > > Signed-off-by: Stefan Hajnoczi > --- > hw/core/qdev-properties-system.c | 51 ++++++++++++++++++++++++++++++++++++++++ > include/hw/qdev-properties.h | 3 +++ > 2 files changed, 54 insertions(+) > > diff --git a/hw/core/qdev-properties-system.c b/hw/core/qdev-properties-system.c > index aaebb87..82f2514 100644 > --- a/hw/core/qdev-properties-system.c > +++ b/hw/core/qdev-properties-system.c > @@ -18,6 +18,7 @@ > #include "net/hub.h" > #include "qapi/visitor.h" > #include "sysemu/char.h" > +#include "sysemu/iothread.h" > > static void get_pointer(Object *obj, Visitor *v, Property *prop, > const char *(*print)(void *ptr), > @@ -392,6 +393,56 @@ void qdev_set_nic_properties(DeviceState *dev, NICInfo *nd) > nd->instantiated = 1; > } > > +/* --- iothread --- */ > + > +static char *print_iothread(void *ptr) > +{ > + return iothread_get_id(ptr); > +} > + > +static int parse_iothread(DeviceState *dev, const char *str, void **ptr) > +{ > + IOThread *iothread; > + > + iothread = iothread_find(str); > + if (!iothread) { > + return -ENOENT; > + } > + object_ref(OBJECT(iothread)); > + *ptr = iothread; > + return 0; > +} > + > +static void get_iothread(Object *obj, struct Visitor *v, void *opaque, > + const char *name, Error **errp) > +{ > + get_pointer_and_free(obj, v, opaque, print_iothread, name, errp); > +} > + > +static void set_iothread(Object *obj, struct Visitor *v, void *opaque, > + const char *name, Error **errp) > +{ > + set_pointer(obj, v, opaque, parse_iothread, name, errp); > +} > + > +static void release_iothread(Object *obj, const char *name, void *opaque) > +{ > + DeviceState *dev = DEVICE(obj); > + Property *prop = opaque; > + IOThread **ptr = qdev_get_prop_ptr(dev, prop); > + > + if (*ptr) { > + object_unref(OBJECT(*ptr)); > + } > +} > + > +PropertyInfo qdev_prop_iothread = { > + .name = "iothread", > + .get = get_iothread, > + .set = set_iothread, > + .release = release_iothread, > +}; > + > static int qdev_add_one_global(QemuOpts *opts, void *opaque) > { > GlobalProperty *g; > diff --git a/include/hw/qdev-properties.h b/include/hw/qdev-properties.h > index 77c6f7c..d0ab148 100644 > --- a/include/hw/qdev-properties.h > +++ b/include/hw/qdev-properties.h > @@ -25,6 +25,7 @@ extern PropertyInfo qdev_prop_bios_chs_trans; > extern PropertyInfo qdev_prop_drive; > extern PropertyInfo qdev_prop_netdev; > extern PropertyInfo qdev_prop_vlan; > +extern PropertyInfo qdev_prop_iothread; > extern PropertyInfo qdev_prop_pci_devfn; > extern PropertyInfo qdev_prop_blocksize; > extern PropertyInfo qdev_prop_pci_host_devaddr; > @@ -151,6 +152,8 @@ extern PropertyInfo qdev_prop_arraylen; > DEFINE_PROP(_n, _s, _f, qdev_prop_vlan, NICPeers) > #define DEFINE_PROP_DRIVE(_n, _s, _f) \ > DEFINE_PROP(_n, _s, _f, qdev_prop_drive, BlockDriverState *) > +#define DEFINE_PROP_IOTHREAD(_n, _s, _f) \ > + DEFINE_PROP(_n, _s, _f, qdev_prop_iothread, IOThread *) > #define DEFINE_PROP_MACADDR(_n, _s, _f) \ > DEFINE_PROP(_n, _s, _f, qdev_prop_macaddr, MACAddr) > #define DEFINE_PROP_LOSTTICKPOLICY(_n, _s, _f, _d) \ > Should become a link sooner rather than later, but I'm not holding the series for this. Paolo