074a86fccd
Header file dependency is a frickin' nightmare right now. cpu.h tends to get included in our 'include everything' header files but qdev also needs to include those headers mainly for qdev-properties since it knows about CharDriverState and friends. We can solve this for now by splitting out qdev.h along the same lines that we previously split the C file. Then cpu.h just needs to include qdev-core.h. hw/qdev.h is split into following new headers: hw/qdev-core.h hw/qdev-properties.h hw/qdev-monitor.h Signed-off-by: Anthony Liguori <aliguori@us.ibm.com> [ehabkost: re-add DEFINE_PROP_PCI_HOST_DEVADDR, that was removed on the original patch (by mistake, I guess)] [ehabkost: kill qdev_prop_set_vlan() declaration] [ehabkost: moved get_fw_dev_path() comment to the original location (I don't know why it was moved)] [ehabkost: removed qdev_exists() declaration] [ehabkost: keep using 'QemuOpts' instead of 'struct QemuOpts', as qdev-core.h includes qemu-option.h] Signed-off-by: Eduardo Habkost <ehabkost@redhat.com> Signed-off-by: Andreas Färber <afaerber@suse.de>
78 lines
1.9 KiB
C
78 lines
1.9 KiB
C
#include "qdev.h"
|
|
#include "qdev-addr.h"
|
|
#include "hwaddr.h"
|
|
#include "qapi/qapi-visit-core.h"
|
|
|
|
/* --- target physical address --- */
|
|
|
|
static int parse_taddr(DeviceState *dev, Property *prop, const char *str)
|
|
{
|
|
hwaddr *ptr = qdev_get_prop_ptr(dev, prop);
|
|
|
|
*ptr = strtoull(str, NULL, 16);
|
|
return 0;
|
|
}
|
|
|
|
static int print_taddr(DeviceState *dev, Property *prop, char *dest, size_t len)
|
|
{
|
|
hwaddr *ptr = qdev_get_prop_ptr(dev, prop);
|
|
return snprintf(dest, len, "0x" TARGET_FMT_plx, *ptr);
|
|
}
|
|
|
|
static void get_taddr(Object *obj, Visitor *v, void *opaque,
|
|
const char *name, Error **errp)
|
|
{
|
|
DeviceState *dev = DEVICE(obj);
|
|
Property *prop = opaque;
|
|
hwaddr *ptr = qdev_get_prop_ptr(dev, prop);
|
|
int64_t value;
|
|
|
|
value = *ptr;
|
|
visit_type_int64(v, &value, name, errp);
|
|
}
|
|
|
|
static void set_taddr(Object *obj, Visitor *v, void *opaque,
|
|
const char *name, Error **errp)
|
|
{
|
|
DeviceState *dev = DEVICE(obj);
|
|
Property *prop = opaque;
|
|
hwaddr *ptr = qdev_get_prop_ptr(dev, prop);
|
|
Error *local_err = NULL;
|
|
int64_t value;
|
|
|
|
if (dev->state != DEV_STATE_CREATED) {
|
|
error_set(errp, QERR_PERMISSION_DENIED);
|
|
return;
|
|
}
|
|
|
|
visit_type_int64(v, &value, name, &local_err);
|
|
if (local_err) {
|
|
error_propagate(errp, local_err);
|
|
return;
|
|
}
|
|
if ((uint64_t)value <= (uint64_t) ~(hwaddr)0) {
|
|
*ptr = value;
|
|
} else {
|
|
error_set(errp, QERR_PROPERTY_VALUE_OUT_OF_RANGE,
|
|
dev->id?:"", name, value, (uint64_t) 0,
|
|
(uint64_t) ~(hwaddr)0);
|
|
}
|
|
}
|
|
|
|
|
|
PropertyInfo qdev_prop_taddr = {
|
|
.name = "taddr",
|
|
.parse = parse_taddr,
|
|
.print = print_taddr,
|
|
.get = get_taddr,
|
|
.set = set_taddr,
|
|
};
|
|
|
|
void qdev_prop_set_taddr(DeviceState *dev, const char *name, hwaddr value)
|
|
{
|
|
Error *errp = NULL;
|
|
object_property_set_int(OBJECT(dev), value, name, &errp);
|
|
assert(!errp);
|
|
|
|
}
|