Commit 23120b13 authored by Jason Wang's avatar Jason Wang Committed by Stefan Hajnoczi
Browse files

net: don't use set/get_pointer() in set/get_netdev() 



Commit 1ceef9f2 (net: multiqueue
support) tries to use set_pointer() and get_pointer() to set and get
NICPeers which is not a pointer defined in DEFINE_PROP_NETDEV. This
trick works but result a unclean and fragile implementation (e.g
print_netdev and parse_netdev).

This patch solves this issue by not using set/get_pinter() and set and
get netdev directly in set_netdev() and get_netdev(). After this the
parse_netdev() and print_netdev() were no longer used and dropped from
the source.

[Renamed 'err' label to 'out' as suggested by Markus Armbruster.
--Stefan]

Cc: Markus Armbruster <armbru@redhat.com>
Cc: Stefan Hajnoczi <stefanha@redhat.com>
Cc: Peter Maydell <peter.maydell@linaro.org>
Signed-off-by: default avatarJason Wang <jasowang@redhat.com>
Reviewed-by: default avatarMarkus Armbruster <armbru@redhat.com>
Signed-off-by: default avatarStefan Hajnoczi <stefanha@redhat.com>
parent 756ae78b

hw/core/qdev-properties-system.c

+44 −38
Original line number Diff line number Diff line
@@ -177,42 +177,69 @@ PropertyInfo qdev_prop_chr = { 
};



/* --- netdev device --- */

static void get_netdev(Object *obj, Visitor *v, void *opaque,

                       const char *name, Error **errp)

{

    DeviceState *dev = DEVICE(obj);

    Property *prop = opaque;

    NICPeers *peers_ptr = qdev_get_prop_ptr(dev, prop);

    char *p = g_strdup(peers_ptr->ncs[0] ? peers_ptr->ncs[0]->name : "");



static int parse_netdev(DeviceState *dev, const char *str, void **ptr)

    visit_type_str(v, &p, name, errp);

    g_free(p);

}



static void set_netdev(Object *obj, Visitor *v, void *opaque,

                       const char *name, Error **errp)

{

    NICPeers *peers_ptr = (NICPeers *)ptr;

    DeviceState *dev = DEVICE(obj);

    Property *prop = opaque;

    NICPeers *peers_ptr = qdev_get_prop_ptr(dev, prop);

    NetClientState **ncs = peers_ptr->ncs;

    NetClientState *peers[MAX_QUEUE_NUM];

    int queues, i = 0;

    int ret;

    Error *local_err = NULL;

    int queues, err = 0, i = 0;

    char *str;



    if (dev->realized) {

        qdev_prop_set_after_realize(dev, name, errp);

        return;

    }



    visit_type_str(v, &str, name, &local_err);

    if (local_err) {

        error_propagate(errp, local_err);

        return;

    }



    queues = qemu_find_net_clients_except(str, peers,

                                          NET_CLIENT_OPTIONS_KIND_NIC,

                                          MAX_QUEUE_NUM);

    if (queues == 0) {

        ret = -ENOENT;

        goto err;

        err = -ENOENT;

        goto out;

    }



    if (queues > MAX_QUEUE_NUM) {

        ret = -E2BIG;

        goto err;

        error_setg(errp, "queues of backend '%s'(%d) exceeds QEMU limitation(%d)",

                   str, queues, MAX_QUEUE_NUM);

        goto out;

    }



    for (i = 0; i < queues; i++) {

        if (peers[i] == NULL) {

            ret = -ENOENT;

            goto err;

            err = -ENOENT;

            goto out;

        }



        if (peers[i]->peer) {

            ret = -EEXIST;

            goto err;

            err = -EEXIST;

            goto out;

        }



        if (ncs[i]) {

            ret = -EINVAL;

            goto err;

            err = -EINVAL;

            goto out;

        }



        ncs[i] = peers[i];
@@ -221,30 +248,9 @@ static int parse_netdev(DeviceState *dev, const char *str, void **ptr) 


    peers_ptr->queues = queues;



    return 0;



err:

    return ret;

}



static char *print_netdev(void *ptr)

{

    NetClientState *netdev = ptr;

    const char *val = netdev->name ? netdev->name : "";



    return g_strdup(val);

}



static void get_netdev(Object *obj, Visitor *v, void *opaque,

                       const char *name, Error **errp)

{

    get_pointer(obj, v, opaque, print_netdev, name, errp);

}



static void set_netdev(Object *obj, Visitor *v, void *opaque,

                       const char *name, Error **errp)

{

    set_pointer(obj, v, opaque, parse_netdev, name, errp);

out:

    error_set_from_qdev_prop_error(errp, err, dev, prop, str);

    g_free(str);

}



PropertyInfo qdev_prop_netdev = {