[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH] hw/net: convert "dma" property type from ptr to lin
From: |
Suramya Shah |
Subject: |
[Qemu-devel] [PATCH] hw/net: convert "dma" property type from ptr to link |
Date: |
Mon, 3 Apr 2017 13:05:50 +0530 |
The lance device needs pointer to ISA DMA device to operate. But according to
qdev-properties.h, properties of pointer type should be avoided.
A link type property is a good substitution.
Signed-off-by: Suramya Shah <address@hidden>
---
hw/net/lance.c | 8 ++++++--
1 file changed, 6 insertions(+), 2 deletions(-)
diff --git a/hw/net/lance.c b/hw/net/lance.c
index 573d724..3996b9c 100644
--- a/hw/net/lance.c
+++ b/hw/net/lance.c
@@ -44,6 +44,7 @@
#include "pcnet.h"
#include "trace.h"
#include "sysemu/sysemu.h"
+#include "qapi/error.h"
#define TYPE_LANCE "lance"
#define SYSBUS_PCNET(obj) \
@@ -145,10 +146,14 @@ static void lance_instance_init(Object *obj)
device_add_bootindex_property(obj, &s->conf.bootindex,
"bootindex", "/address@hidden",
DEVICE(obj), NULL);
+
+ object_property_add_link(obj, "dma", TYPE_LANCE,
+ (Object **)&d->state.dma_opaque,
+ qdev_prop_allow_set_link_before_realize,
+ 0, &error_abort);
}
static Property lance_properties[] = {
- DEFINE_PROP_PTR("dma", SysBusPCNetState, state.dma_opaque),
DEFINE_NIC_PROPERTIES(SysBusPCNetState, state.conf),
DEFINE_PROP_END_OF_LIST(),
};
@@ -164,7 +169,6 @@ static void lance_class_init(ObjectClass *klass, void *data)
dc->reset = lance_reset;
dc->vmsd = &vmstate_lance;
dc->props = lance_properties;
- /* Reason: pointer property "dma" */
dc->cannot_instantiate_with_device_add_yet = true;
}
--
2.9.3
- [Qemu-devel] [PATCH] hw/net: convert "dma" property type from ptr to link,
Suramya Shah <=