david.venhoff/QEMU-Nyx-fork
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

qdev: make the non-legacy pci address property accept an integer

Browse Source 
PCI addresses are set with qdev_prop_uint32.  Thus we make the QOM
property accept a device and function encoded in an 8-bit integer,
instead of the magic dd.f hex string.

Reviewed-by: Anthony Liguori <aliguori@us.ibm.com>
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
This commit is contained in:
Paolo Bonzini 2012-02-02 17:12:19 +01:00
parent e39e5d60c9
commit b403298adb
1 changed files with 9 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
hw/qdev-properties.c
View File

@ -999,30 +999,20 @@ static int print_pci_devfn(DeviceState *dev, Property *prop, char *dest, size_t
} }
} }
static void get_pci_devfn(Object *obj, Visitor *v, void *opaque,
const char *name, Error **errp)
{
DeviceState *dev = DEVICE(obj);
Property *prop = opaque;
uint32_t *ptr = qdev_get_prop_ptr(dev, prop);
char buffer[32];
char *p = buffer;
buffer[0] = 0;
if (*ptr != -1) {
snprintf(buffer, sizeof(buffer), "%02x.%x", *ptr >> 3, *ptr & 7);
}
visit_type_str(v, &p, name, errp);
}
PropertyInfo qdev_prop_pci_devfn = { PropertyInfo qdev_prop_pci_devfn = {
.name = "pci-devfn", .name = "int32",
.legacy_name = "pci-devfn",
.type = PROP_TYPE_UINT32, .type = PROP_TYPE_UINT32,
.size = sizeof(uint32_t), .size = sizeof(uint32_t),
.parse = parse_pci_devfn, .parse = parse_pci_devfn,
.print = print_pci_devfn, .print = print_pci_devfn,
.get = get_pci_devfn, .get = get_int32,
.set = set_generic, .set = set_int32,
/* FIXME: this should be -1...255, but the address is stored
* into an uint32_t rather than int32_t.
*/
.min = 0,
.max = 0xFFFFFFFFULL,
}; };
/* --- public helpers --- */ /* --- public helpers --- */