From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([140.186.70.92]:34754) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Rtaaj-0001vC-IT for qemu-devel@nongnu.org; Sat, 04 Feb 2012 03:03:30 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1Rtaaf-0005HE-8R for qemu-devel@nongnu.org; Sat, 04 Feb 2012 03:03:23 -0500 Received: from mail-wi0-f173.google.com ([209.85.212.173]:51500) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Rtaad-0005CR-PM for qemu-devel@nongnu.org; Sat, 04 Feb 2012 03:03:20 -0500 Received: by mail-wi0-f173.google.com with SMTP id hi20so3684792wib.4 for ; Sat, 04 Feb 2012 00:03:19 -0800 (PST) Sender: Paolo Bonzini From: Paolo Bonzini Date: Sat, 4 Feb 2012 09:02:48 +0100 Message-Id: <1328342577-25732-19-git-send-email-pbonzini@redhat.com> In-Reply-To: <1328342577-25732-1-git-send-email-pbonzini@redhat.com> References: <1328342577-25732-1-git-send-email-pbonzini@redhat.com> Subject: [Qemu-devel] [PATCH v2 18/27] qdev: make the non-legacy pci address property accept an integer List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org 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 --- 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