[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PULL for-2.1 11/24] qdev: drop iothread property type
From: |
Stefan Hajnoczi |
Subject: |
[Qemu-devel] [PULL for-2.1 11/24] qdev: drop iothread property type |
Date: |
Tue, 1 Jul 2014 10:48:44 +0200 |
The iothread property type is no longer used and can be removed.
Signed-off-by: Stefan Hajnoczi <address@hidden>
---
hw/core/qdev-properties-system.c | 50 ----------------------------------------
include/hw/qdev-properties.h | 3 ---
2 files changed, 53 deletions(-)
diff --git a/hw/core/qdev-properties-system.c b/hw/core/qdev-properties-system.c
index 52c2f8a..8e140af 100644
--- a/hw/core/qdev-properties-system.c
+++ b/hw/core/qdev-properties-system.c
@@ -385,56 +385,6 @@ 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(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 3726bf3..77fe3a1 100644
--- a/include/hw/qdev-properties.h
+++ b/include/hw/qdev-properties.h
@@ -22,7 +22,6 @@ 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;
@@ -143,8 +142,6 @@ 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) \
--
1.9.3
- [Qemu-devel] [PULL for-2.1 01/24] qom: add object_property_add_alias(), (continued)
- [Qemu-devel] [PULL for-2.1 01/24] qom: add object_property_add_alias(), Stefan Hajnoczi, 2014/07/01
- [Qemu-devel] [PULL for-2.1 02/24] virtio-blk: avoid qdev property definition duplication, Stefan Hajnoczi, 2014/07/01
- [Qemu-devel] [PULL for-2.1 04/24] virtio-blk: move x-data-plane qdev property to virtio-blk.h, Stefan Hajnoczi, 2014/07/01
- [Qemu-devel] [PULL for-2.1 05/24] qdev: add qdev_alias_all_properties(), Stefan Hajnoczi, 2014/07/01
- [Qemu-devel] [PULL for-2.1 03/24] dataplane: bail out on unsupported transport, Stefan Hajnoczi, 2014/07/01
- [Qemu-devel] [PULL for-2.1 06/24] virtio-blk: use aliases instead of duplicate qdev properties, Stefan Hajnoczi, 2014/07/01
- [Qemu-devel] [PULL for-2.1 07/24] virtio-blk: drop virtio_blk_set_conf(), Stefan Hajnoczi, 2014/07/01
- [Qemu-devel] [PULL for-2.1 08/24] virtio: fix virtio-blk child refcount in transports, Stefan Hajnoczi, 2014/07/01
- [Qemu-devel] [PULL for-2.1 09/24] virtio-blk: move qdev properties into virtio-blk.c, Stefan Hajnoczi, 2014/07/01
- [Qemu-devel] [PULL for-2.1 10/24] virtio-blk: replace x-iothread with iothread link property, Stefan Hajnoczi, 2014/07/01
- [Qemu-devel] [PULL for-2.1 11/24] qdev: drop iothread property type,
Stefan Hajnoczi <=
- [Qemu-devel] [PULL for-2.1 12/24] virtio-blk: remove need for explicit x-data-plane=on option, Stefan Hajnoczi, 2014/07/01
- [Qemu-devel] [PULL for-2.1 13/24] qemu-img create: add 'nocow' option, Stefan Hajnoczi, 2014/07/01
- [Qemu-devel] [PULL for-2.1 14/24] iotests: Simplify qemu-iotests-quick.sh, Stefan Hajnoczi, 2014/07/01
- [Qemu-devel] [PULL for-2.1 15/24] iotests: Add qemu tests to quick group, Stefan Hajnoczi, 2014/07/01
- [Qemu-devel] [PULL for-2.1 17/24] block: make 'top' argument to block-commit optional, Stefan Hajnoczi, 2014/07/01
- [Qemu-devel] [PULL for-2.1 16/24] iotests: Add more tests to quick group, Stefan Hajnoczi, 2014/07/01
- [Qemu-devel] [PULL for-2.1 18/24] block: simplify bdrv_find_base() and bdrv_find_overlay(), Stefan Hajnoczi, 2014/07/01
- [Qemu-devel] [PULL for-2.1 19/24] block/cow: Avoid use of uninitialized cow_bs in error path, Stefan Hajnoczi, 2014/07/01