qdev: drop iothread property type
The iothread property type is no longer used and can be removed. Signed-off-by: Stefan Hajnoczi <stefanha@redhat.com>
This commit is contained in:
		
							parent
							
								
									467b3f33e9
								
							
						
					
					
						commit
						1351d1ec89
					
				| 
						 | 
					@ -385,56 +385,6 @@ void qdev_set_nic_properties(DeviceState *dev, NICInfo *nd)
 | 
				
			||||||
    nd->instantiated = 1;
 | 
					    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(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)
 | 
					static int qdev_add_one_global(QemuOpts *opts, void *opaque)
 | 
				
			||||||
{
 | 
					{
 | 
				
			||||||
    GlobalProperty *g;
 | 
					    GlobalProperty *g;
 | 
				
			||||||
| 
						 | 
					
 | 
				
			||||||
| 
						 | 
					@ -22,7 +22,6 @@ extern PropertyInfo qdev_prop_bios_chs_trans;
 | 
				
			||||||
extern PropertyInfo qdev_prop_drive;
 | 
					extern PropertyInfo qdev_prop_drive;
 | 
				
			||||||
extern PropertyInfo qdev_prop_netdev;
 | 
					extern PropertyInfo qdev_prop_netdev;
 | 
				
			||||||
extern PropertyInfo qdev_prop_vlan;
 | 
					extern PropertyInfo qdev_prop_vlan;
 | 
				
			||||||
extern PropertyInfo qdev_prop_iothread;
 | 
					 | 
				
			||||||
extern PropertyInfo qdev_prop_pci_devfn;
 | 
					extern PropertyInfo qdev_prop_pci_devfn;
 | 
				
			||||||
extern PropertyInfo qdev_prop_blocksize;
 | 
					extern PropertyInfo qdev_prop_blocksize;
 | 
				
			||||||
extern PropertyInfo qdev_prop_pci_host_devaddr;
 | 
					extern PropertyInfo qdev_prop_pci_host_devaddr;
 | 
				
			||||||
| 
						 | 
					@ -143,8 +142,6 @@ extern PropertyInfo qdev_prop_arraylen;
 | 
				
			||||||
    DEFINE_PROP(_n, _s, _f, qdev_prop_vlan, NICPeers)
 | 
					    DEFINE_PROP(_n, _s, _f, qdev_prop_vlan, NICPeers)
 | 
				
			||||||
#define DEFINE_PROP_DRIVE(_n, _s, _f) \
 | 
					#define DEFINE_PROP_DRIVE(_n, _s, _f) \
 | 
				
			||||||
    DEFINE_PROP(_n, _s, _f, qdev_prop_drive, BlockDriverState *)
 | 
					    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 DEFINE_PROP_MACADDR(_n, _s, _f)         \
 | 
				
			||||||
    DEFINE_PROP(_n, _s, _f, qdev_prop_macaddr, MACAddr)
 | 
					    DEFINE_PROP(_n, _s, _f, qdev_prop_macaddr, MACAddr)
 | 
				
			||||||
#define DEFINE_PROP_LOSTTICKPOLICY(_n, _s, _f, _d) \
 | 
					#define DEFINE_PROP_LOSTTICKPOLICY(_n, _s, _f, _d) \
 | 
				
			||||||
| 
						 | 
					
 | 
				
			||||||
		Loading…
	
		Reference in New Issue