From 05cb5fe442dd9574895427f8ea02aec73550b6db Mon Sep 17 00:00:00 2001 From: Gerd Hoffmann Date: Wed, 15 Jul 2009 13:59:22 +0200 Subject: qdev/prop: add pci devfn property So we can parse "$slot.$fn" strings into devfn numbers. Signed-off-by: Gerd Hoffmann Signed-off-by: Anthony Liguori --- hw/qdev-properties.c | 43 +++++++++++++++++++++++++++++++++++++++++++ hw/qdev.h | 1 + 2 files changed, 44 insertions(+) (limited to 'hw') diff --git a/hw/qdev-properties.c b/hw/qdev-properties.c index 4f35f06628..0e4878ee8f 100644 --- a/hw/qdev-properties.c +++ b/hw/qdev-properties.c @@ -198,6 +198,49 @@ PropertyInfo qdev_prop_macaddr = { .print = print_mac, }; +/* --- pci address --- */ + +/* + * bus-local address, i.e. "$slot" or "$slot.$fn" + */ +static int parse_pci_devfn(DeviceState *dev, Property *prop, const char *str) +{ + uint32_t *ptr = qdev_get_prop_ptr(dev, prop); + unsigned int slot, fn, n; + + if (sscanf(str, "%x.%x%n", &slot, &fn, &n) != 2) { + fn = 0; + if (sscanf(str, "%x%n", &slot, &n) != 1) { + return -1; + } + } + if (str[n] != '\0') + return -1; + if (fn > 7) + return -1; + *ptr = slot << 3 | fn; + return 0; +} + +static int print_pci_devfn(DeviceState *dev, Property *prop, char *dest, size_t len) +{ + uint32_t *ptr = qdev_get_prop_ptr(dev, prop); + + if (-1 == *ptr) { + return snprintf(dest, len, ""); + } else { + return snprintf(dest, len, "%02x.%x", *ptr >> 3, *ptr & 7); + } +} + +PropertyInfo qdev_prop_pci_devfn = { + .name = "pci-devfn", + .type = PROP_TYPE_UINT32, + .size = sizeof(uint32_t), + .parse = parse_pci_devfn, + .print = print_pci_devfn, +}; + /* --- public helpers --- */ static Property *qdev_prop_walk(Property *props, const char *name) diff --git a/hw/qdev.h b/hw/qdev.h index 2e196e1c1c..dfd3e92ab0 100644 --- a/hw/qdev.h +++ b/hw/qdev.h @@ -151,6 +151,7 @@ extern PropertyInfo qdev_prop_hex32; extern PropertyInfo qdev_prop_hex64; extern PropertyInfo qdev_prop_ptr; extern PropertyInfo qdev_prop_macaddr; +extern PropertyInfo qdev_prop_pci_devfn; /* Set properties between creation and init. */ void *qdev_get_prop_ptr(DeviceState *dev, Property *prop); -- cgit v1.2.3