[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PULL 03/13] x86-iommu: use DeviceClass properties
From: |
Michael S. Tsirkin |
Subject: |
[Qemu-devel] [PULL 03/13] x86-iommu: use DeviceClass properties |
Date: |
Mon, 29 May 2017 03:18:40 +0300 |
From: Peter Xu <address@hidden>
No reason to keep tens of lines if we can do it actually far shorter.
Signed-off-by: Peter Xu <address@hidden>
Reviewed-by: Michael S. Tsirkin <address@hidden>
Signed-off-by: Michael S. Tsirkin <address@hidden>
Reviewed-by: Jason Wang <address@hidden>
---
hw/i386/x86-iommu.c | 47 +++++++----------------------------------------
1 file changed, 7 insertions(+), 40 deletions(-)
diff --git a/hw/i386/x86-iommu.c b/hw/i386/x86-iommu.c
index 23dcd3f..02b8825 100644
--- a/hw/i386/x86-iommu.c
+++ b/hw/i386/x86-iommu.c
@@ -88,55 +88,22 @@ static void x86_iommu_realize(DeviceState *dev, Error
**errp)
x86_iommu_set_default(X86_IOMMU_DEVICE(dev));
}
+static Property x86_iommu_properties[] = {
+ DEFINE_PROP_BOOL("intremap", X86IOMMUState, intr_supported, false),
+ DEFINE_PROP_BOOL("device-iotlb", X86IOMMUState, dt_supported, false),
+ DEFINE_PROP_END_OF_LIST(),
+};
+
static void x86_iommu_class_init(ObjectClass *klass, void *data)
{
DeviceClass *dc = DEVICE_CLASS(klass);
dc->realize = x86_iommu_realize;
-}
-
-static bool x86_iommu_intremap_prop_get(Object *o, Error **errp)
-{
- X86IOMMUState *s = X86_IOMMU_DEVICE(o);
- return s->intr_supported;
-}
-
-static void x86_iommu_intremap_prop_set(Object *o, bool value, Error **errp)
-{
- X86IOMMUState *s = X86_IOMMU_DEVICE(o);
- s->intr_supported = value;
-}
-
-static bool x86_iommu_device_iotlb_prop_get(Object *o, Error **errp)
-{
- X86IOMMUState *s = X86_IOMMU_DEVICE(o);
- return s->dt_supported;
-}
-
-static void x86_iommu_device_iotlb_prop_set(Object *o, bool value, Error
**errp)
-{
- X86IOMMUState *s = X86_IOMMU_DEVICE(o);
- s->dt_supported = value;
-}
-
-static void x86_iommu_instance_init(Object *o)
-{
- X86IOMMUState *s = X86_IOMMU_DEVICE(o);
-
- /* By default, do not support IR */
- s->intr_supported = false;
- object_property_add_bool(o, "intremap", x86_iommu_intremap_prop_get,
- x86_iommu_intremap_prop_set, NULL);
- s->dt_supported = false;
- object_property_add_bool(o, "device-iotlb",
- x86_iommu_device_iotlb_prop_get,
- x86_iommu_device_iotlb_prop_set,
- NULL);
+ dc->props = x86_iommu_properties;
}
static const TypeInfo x86_iommu_info = {
.name = TYPE_X86_IOMMU_DEVICE,
.parent = TYPE_SYS_BUS_DEVICE,
- .instance_init = x86_iommu_instance_init,
.instance_size = sizeof(X86IOMMUState),
.class_init = x86_iommu_class_init,
.class_size = sizeof(X86IOMMUClass),
--
MST
- Re: [Qemu-devel] [PULL 00/13] pci, virtio, vhost: fixes, (continued)
- Re: [Qemu-devel] [PULL 00/13] pci, virtio, vhost: fixes, no-reply, 2017/05/17
- Re: [Qemu-devel] [PULL 00/13] pci, virtio, vhost: fixes, Stefan Hajnoczi, 2017/05/18
- [Qemu-devel] [PULL 00/13] pci, virtio, vhost: fixes, Michael S. Tsirkin, 2017/05/28
- [Qemu-devel] [PULL 01/13] memory: tune last param of iommu_ops.translate(), Michael S. Tsirkin, 2017/05/28
- [Qemu-devel] [PULL 02/13] memory: remove the last param in memory_region_iommu_replay(), Michael S. Tsirkin, 2017/05/28
- [Qemu-devel] [PULL 06/13] intel_iommu: use IOMMU_ACCESS_FLAG(), Michael S. Tsirkin, 2017/05/28
- [Qemu-devel] [PULL 05/13] intel_iommu: provide vtd_ce_get_type(), Michael S. Tsirkin, 2017/05/28
- [Qemu-devel] [PULL 04/13] intel_iommu: renaming context entry helpers, Michael S. Tsirkin, 2017/05/28
- [Qemu-devel] [PULL 07/13] intel_iommu: allow dev-iotlb context entry conditionally, Michael S. Tsirkin, 2017/05/28
- [Qemu-devel] [PULL 03/13] x86-iommu: use DeviceClass properties,
Michael S. Tsirkin <=
- [Qemu-devel] [PULL 09/13] intel_iommu: turn off pt before 2.9, Michael S. Tsirkin, 2017/05/28
- [Qemu-devel] [PULL 10/13] virtio_net: Bypass backends for MTU feature negotiation, Michael S. Tsirkin, 2017/05/28
- [Qemu-devel] [PULL 11/13] vhost-user: pass message as a pointer to process_message_reply(), Michael S. Tsirkin, 2017/05/28
- [Qemu-devel] [PULL 13/13] acpi-test: update expected files, Michael S. Tsirkin, 2017/05/28
- [Qemu-devel] [PULL 12/13] pc: ACPI BIOS: use highest NUMA node for hotplug mem hole SRAT entry, Michael S. Tsirkin, 2017/05/28
- [Qemu-devel] [PULL 08/13] intel_iommu: support passthrough (PT), Michael S. Tsirkin, 2017/05/28
- Re: [Qemu-devel] [PULL 00/13] pci, virtio, vhost: fixes, Stefan Hajnoczi, 2017/05/30