 23120b13c6
			
		
	
	
		23120b13c6
		
	
	
	
	
		
			
			Commit 1ceef9f27359cbe92ef124bf74de6f792e71f6fb (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: Jason Wang <jasowang@redhat.com> Reviewed-by: Markus Armbruster <armbru@redhat.com> Signed-off-by: Stefan Hajnoczi <stefanha@redhat.com>
		
			
				
	
	
		
			411 lines
		
	
	
		
			10 KiB
		
	
	
	
		
			C
		
	
	
	
	
	
			
		
		
	
	
			411 lines
		
	
	
		
			10 KiB
		
	
	
	
		
			C
		
	
	
	
	
	
| /*
 | |
|  * qdev property parsing and global properties
 | |
|  * (parts specific for qemu-system-*)
 | |
|  *
 | |
|  * This file is based on code from hw/qdev-properties.c from
 | |
|  * commit 074a86fccd185616469dfcdc0e157f438aebba18,
 | |
|  * Copyright (c) Gerd Hoffmann <kraxel@redhat.com> and other contributors.
 | |
|  *
 | |
|  * This work is licensed under the terms of the GNU GPL, version 2 or later.
 | |
|  * See the COPYING file in the top-level directory.
 | |
|  */
 | |
| 
 | |
| #include "net/net.h"
 | |
| #include "hw/qdev.h"
 | |
| #include "qapi/qmp/qerror.h"
 | |
| #include "sysemu/block-backend.h"
 | |
| #include "sysemu/blockdev.h"
 | |
| #include "hw/block/block.h"
 | |
| #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,
 | |
|                         char *(*print)(void *ptr),
 | |
|                         const char *name, Error **errp)
 | |
| {
 | |
|     DeviceState *dev = DEVICE(obj);
 | |
|     void **ptr = qdev_get_prop_ptr(dev, prop);
 | |
|     char *p;
 | |
| 
 | |
|     p = *ptr ? print(*ptr) : g_strdup("");
 | |
|     visit_type_str(v, &p, name, errp);
 | |
|     g_free(p);
 | |
| }
 | |
| 
 | |
| static void set_pointer(Object *obj, Visitor *v, Property *prop,
 | |
|                         int (*parse)(DeviceState *dev, const char *str,
 | |
|                                      void **ptr),
 | |
|                         const char *name, Error **errp)
 | |
| {
 | |
|     DeviceState *dev = DEVICE(obj);
 | |
|     Error *local_err = NULL;
 | |
|     void **ptr = qdev_get_prop_ptr(dev, prop);
 | |
|     char *str;
 | |
|     int ret;
 | |
| 
 | |
|     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;
 | |
|     }
 | |
|     if (!*str) {
 | |
|         g_free(str);
 | |
|         *ptr = NULL;
 | |
|         return;
 | |
|     }
 | |
|     ret = parse(dev, str, ptr);
 | |
|     error_set_from_qdev_prop_error(errp, ret, dev, prop, str);
 | |
|     g_free(str);
 | |
| }
 | |
| 
 | |
| /* --- drive --- */
 | |
| 
 | |
| static int parse_drive(DeviceState *dev, const char *str, void **ptr)
 | |
| {
 | |
|     BlockBackend *blk;
 | |
| 
 | |
|     blk = blk_by_name(str);
 | |
|     if (!blk) {
 | |
|         return -ENOENT;
 | |
|     }
 | |
|     if (blk_attach_dev(blk, dev) < 0) {
 | |
|         return -EEXIST;
 | |
|     }
 | |
|     *ptr = blk;
 | |
|     return 0;
 | |
| }
 | |
| 
 | |
| static void release_drive(Object *obj, const char *name, void *opaque)
 | |
| {
 | |
|     DeviceState *dev = DEVICE(obj);
 | |
|     Property *prop = opaque;
 | |
|     BlockBackend **ptr = qdev_get_prop_ptr(dev, prop);
 | |
| 
 | |
|     if (*ptr) {
 | |
|         blk_detach_dev(*ptr, dev);
 | |
|         blockdev_auto_del(*ptr);
 | |
|     }
 | |
| }
 | |
| 
 | |
| static char *print_drive(void *ptr)
 | |
| {
 | |
|     return g_strdup(blk_name(ptr));
 | |
| }
 | |
| 
 | |
| static void get_drive(Object *obj, Visitor *v, void *opaque,
 | |
|                       const char *name, Error **errp)
 | |
| {
 | |
|     get_pointer(obj, v, opaque, print_drive, name, errp);
 | |
| }
 | |
| 
 | |
| static void set_drive(Object *obj, Visitor *v, void *opaque,
 | |
|                       const char *name, Error **errp)
 | |
| {
 | |
|     set_pointer(obj, v, opaque, parse_drive, name, errp);
 | |
| }
 | |
| 
 | |
| PropertyInfo qdev_prop_drive = {
 | |
|     .name  = "str",
 | |
|     .description = "ID of a drive to use as a backend",
 | |
|     .get   = get_drive,
 | |
|     .set   = set_drive,
 | |
|     .release = release_drive,
 | |
| };
 | |
| 
 | |
| /* --- character device --- */
 | |
| 
 | |
| static int parse_chr(DeviceState *dev, const char *str, void **ptr)
 | |
| {
 | |
|     CharDriverState *chr = qemu_chr_find(str);
 | |
|     if (chr == NULL) {
 | |
|         return -ENOENT;
 | |
|     }
 | |
|     if (qemu_chr_fe_claim(chr) != 0) {
 | |
|         return -EEXIST;
 | |
|     }
 | |
|     *ptr = chr;
 | |
|     return 0;
 | |
| }
 | |
| 
 | |
| static void release_chr(Object *obj, const char *name, void *opaque)
 | |
| {
 | |
|     DeviceState *dev = DEVICE(obj);
 | |
|     Property *prop = opaque;
 | |
|     CharDriverState **ptr = qdev_get_prop_ptr(dev, prop);
 | |
|     CharDriverState *chr = *ptr;
 | |
| 
 | |
|     if (chr) {
 | |
|         qemu_chr_add_handlers(chr, NULL, NULL, NULL, NULL);
 | |
|         qemu_chr_fe_release(chr);
 | |
|     }
 | |
| }
 | |
| 
 | |
| 
 | |
| static char *print_chr(void *ptr)
 | |
| {
 | |
|     CharDriverState *chr = ptr;
 | |
|     const char *val = chr->label ? chr->label : "";
 | |
| 
 | |
|     return g_strdup(val);
 | |
| }
 | |
| 
 | |
| static void get_chr(Object *obj, Visitor *v, void *opaque,
 | |
|                     const char *name, Error **errp)
 | |
| {
 | |
|     get_pointer(obj, v, opaque, print_chr, name, errp);
 | |
| }
 | |
| 
 | |
| static void set_chr(Object *obj, Visitor *v, void *opaque,
 | |
|                     const char *name, Error **errp)
 | |
| {
 | |
|     set_pointer(obj, v, opaque, parse_chr, name, errp);
 | |
| }
 | |
| 
 | |
| PropertyInfo qdev_prop_chr = {
 | |
|     .name  = "str",
 | |
|     .description = "ID of a chardev to use as a backend",
 | |
|     .get   = get_chr,
 | |
|     .set   = set_chr,
 | |
|     .release = release_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 : "");
 | |
| 
 | |
|     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)
 | |
| {
 | |
|     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];
 | |
|     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) {
 | |
|         err = -ENOENT;
 | |
|         goto out;
 | |
|     }
 | |
| 
 | |
|     if (queues > MAX_QUEUE_NUM) {
 | |
|         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) {
 | |
|             err = -ENOENT;
 | |
|             goto out;
 | |
|         }
 | |
| 
 | |
|         if (peers[i]->peer) {
 | |
|             err = -EEXIST;
 | |
|             goto out;
 | |
|         }
 | |
| 
 | |
|         if (ncs[i]) {
 | |
|             err = -EINVAL;
 | |
|             goto out;
 | |
|         }
 | |
| 
 | |
|         ncs[i] = peers[i];
 | |
|         ncs[i]->queue_index = i;
 | |
|     }
 | |
| 
 | |
|     peers_ptr->queues = queues;
 | |
| 
 | |
| out:
 | |
|     error_set_from_qdev_prop_error(errp, err, dev, prop, str);
 | |
|     g_free(str);
 | |
| }
 | |
| 
 | |
| PropertyInfo qdev_prop_netdev = {
 | |
|     .name  = "str",
 | |
|     .description = "ID of a netdev to use as a backend",
 | |
|     .get   = get_netdev,
 | |
|     .set   = set_netdev,
 | |
| };
 | |
| 
 | |
| /* --- vlan --- */
 | |
| 
 | |
| static int print_vlan(DeviceState *dev, Property *prop, char *dest, size_t len)
 | |
| {
 | |
|     NetClientState **ptr = qdev_get_prop_ptr(dev, prop);
 | |
| 
 | |
|     if (*ptr) {
 | |
|         int id;
 | |
|         if (!net_hub_id_for_client(*ptr, &id)) {
 | |
|             return snprintf(dest, len, "%d", id);
 | |
|         }
 | |
|     }
 | |
| 
 | |
|     return snprintf(dest, len, "<null>");
 | |
| }
 | |
| 
 | |
| static void get_vlan(Object *obj, Visitor *v, void *opaque,
 | |
|                      const char *name, Error **errp)
 | |
| {
 | |
|     DeviceState *dev = DEVICE(obj);
 | |
|     Property *prop = opaque;
 | |
|     NetClientState **ptr = qdev_get_prop_ptr(dev, prop);
 | |
|     int32_t id = -1;
 | |
| 
 | |
|     if (*ptr) {
 | |
|         int hub_id;
 | |
|         if (!net_hub_id_for_client(*ptr, &hub_id)) {
 | |
|             id = hub_id;
 | |
|         }
 | |
|     }
 | |
| 
 | |
|     visit_type_int32(v, &id, name, errp);
 | |
| }
 | |
| 
 | |
| static void set_vlan(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);
 | |
|     NetClientState **ptr = &peers_ptr->ncs[0];
 | |
|     Error *local_err = NULL;
 | |
|     int32_t id;
 | |
|     NetClientState *hubport;
 | |
| 
 | |
|     if (dev->realized) {
 | |
|         qdev_prop_set_after_realize(dev, name, errp);
 | |
|         return;
 | |
|     }
 | |
| 
 | |
|     visit_type_int32(v, &id, name, &local_err);
 | |
|     if (local_err) {
 | |
|         error_propagate(errp, local_err);
 | |
|         return;
 | |
|     }
 | |
|     if (id == -1) {
 | |
|         *ptr = NULL;
 | |
|         return;
 | |
|     }
 | |
|     if (*ptr) {
 | |
|         error_set_from_qdev_prop_error(errp, -EINVAL, dev, prop, name);
 | |
|         return;
 | |
|     }
 | |
| 
 | |
|     hubport = net_hub_port_find(id);
 | |
|     if (!hubport) {
 | |
|         error_set(errp, QERR_INVALID_PARAMETER_VALUE,
 | |
|                   name, prop->info->name);
 | |
|         return;
 | |
|     }
 | |
|     *ptr = hubport;
 | |
| }
 | |
| 
 | |
| PropertyInfo qdev_prop_vlan = {
 | |
|     .name  = "int32",
 | |
|     .description = "Integer VLAN id to connect to",
 | |
|     .print = print_vlan,
 | |
|     .get   = get_vlan,
 | |
|     .set   = set_vlan,
 | |
| };
 | |
| 
 | |
| int qdev_prop_set_drive(DeviceState *dev, const char *name,
 | |
|                         BlockBackend *value)
 | |
| {
 | |
|     Error *err = NULL;
 | |
|     object_property_set_str(OBJECT(dev),
 | |
|                             value ? blk_name(value) : "", name, &err);
 | |
|     if (err) {
 | |
|         qerror_report_err(err);
 | |
|         error_free(err);
 | |
|         return -1;
 | |
|     }
 | |
|     return 0;
 | |
| }
 | |
| 
 | |
| void qdev_prop_set_drive_nofail(DeviceState *dev, const char *name,
 | |
|                                 BlockBackend *value)
 | |
| {
 | |
|     if (qdev_prop_set_drive(dev, name, value) < 0) {
 | |
|         exit(1);
 | |
|     }
 | |
| }
 | |
| void qdev_prop_set_chr(DeviceState *dev, const char *name,
 | |
|                        CharDriverState *value)
 | |
| {
 | |
|     assert(!value || value->label);
 | |
|     object_property_set_str(OBJECT(dev),
 | |
|                             value ? value->label : "", name, &error_abort);
 | |
| }
 | |
| 
 | |
| void qdev_prop_set_netdev(DeviceState *dev, const char *name,
 | |
|                           NetClientState *value)
 | |
| {
 | |
|     assert(!value || value->name);
 | |
|     object_property_set_str(OBJECT(dev),
 | |
|                             value ? value->name : "", name, &error_abort);
 | |
| }
 | |
| 
 | |
| void qdev_set_nic_properties(DeviceState *dev, NICInfo *nd)
 | |
| {
 | |
|     qdev_prop_set_macaddr(dev, "mac", nd->macaddr.a);
 | |
|     if (nd->netdev) {
 | |
|         qdev_prop_set_netdev(dev, "netdev", nd->netdev);
 | |
|     }
 | |
|     if (nd->nvectors != DEV_NVECTORS_UNSPECIFIED &&
 | |
|         object_property_find(OBJECT(dev), "vectors", NULL)) {
 | |
|         qdev_prop_set_uint32(dev, "vectors", nd->nvectors);
 | |
|     }
 | |
|     nd->instantiated = 1;
 | |
| }
 | |
| 
 | |
| static int qdev_add_one_global(QemuOpts *opts, void *opaque)
 | |
| {
 | |
|     GlobalProperty *g;
 | |
| 
 | |
|     g = g_malloc0(sizeof(*g));
 | |
|     g->driver   = qemu_opt_get(opts, "driver");
 | |
|     g->property = qemu_opt_get(opts, "property");
 | |
|     g->value    = qemu_opt_get(opts, "value");
 | |
|     g->user_provided = true;
 | |
|     qdev_prop_register_global(g);
 | |
|     return 0;
 | |
| }
 | |
| 
 | |
| void qemu_add_globals(void)
 | |
| {
 | |
|     qemu_opts_foreach(qemu_find_opts("global"), qdev_add_one_global, NULL, 0);
 | |
| }
 |