[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH v2 18/27] qdev: make the non-legacy pci address prop
From: |
Paolo Bonzini |
Subject: |
[Qemu-devel] [PATCH v2 18/27] qdev: make the non-legacy pci address property accept an integer |
Date: |
Sat, 4 Feb 2012 09:02:48 +0100 |
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.
Signed-off-by: Paolo Bonzini <address@hidden>
---
hw/qdev-properties.c | 28 +++++++++-------------------
1 files changed, 9 insertions(+), 19 deletions(-)
diff --git a/hw/qdev-properties.c b/hw/qdev-properties.c
index 42b9b24..9a67cc5 100644
--- a/hw/qdev-properties.c
+++ b/hw/qdev-properties.c
@@ -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 = {
- .name = "pci-devfn",
+ .name = "int32",
+ .legacy_name = "pci-devfn",
.type = PROP_TYPE_UINT32,
.size = sizeof(uint32_t),
.parse = parse_pci_devfn,
.print = print_pci_devfn,
- .get = get_pci_devfn,
- .set = set_generic,
+ .get = get_int32,
+ .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 --- */
--
1.7.7.6
- Re: [Qemu-devel] [PATCH v2 02/27] qom: more documentation on subclassing, (continued)
- [Qemu-devel] [PATCH v2 05/27] qom: do not include qdev header file, Paolo Bonzini, 2012/02/04
- [Qemu-devel] [PATCH v2 03/27] qom: clean up/optimize object_dynamic_cast, Paolo Bonzini, 2012/02/04
- [Qemu-devel] [PATCH v2 04/27] qom: avoid useless conversions from string to type, Paolo Bonzini, 2012/02/04
- [Qemu-devel] [PATCH v2 08/27] qom: fix off-by-one, Paolo Bonzini, 2012/02/04
- [Qemu-devel] [PATCH v2 18/27] qdev: make the non-legacy pci address property accept an integer,
Paolo Bonzini <=
- [Qemu-devel] [PATCH v2 12/27] qom: add property get/set wrappers for links, Paolo Bonzini, 2012/02/04
- [Qemu-devel] [PATCH v2 06/27] qom: add QObject-based property get/set wrappers, Paolo Bonzini, 2012/02/04
- [Qemu-devel] [PATCH v2 14/27] qdev: allow reusing get/set for legacy property, Paolo Bonzini, 2012/02/04
- [Qemu-devel] [PATCH v2 13/27] qdev: remove direct calls to print/parse, Paolo Bonzini, 2012/02/04