Re: [Qemu-devel] [PATCH v3 5/6] iothread: add "iothread" qdev property type

[Paolo Bonzini <pbonzini@redhat.com>]

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 <stefanha@redhat.com>
> ---
>  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