From patchwork Mon Oct 22 15:02:55 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Igor Mammedov X-Patchwork-Id: 193171 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (Client did not present a certificate) by ozlabs.org (Postfix) with ESMTPS id 686CF2C007B for ; Tue, 23 Oct 2012 02:09:21 +1100 (EST) Received: from localhost ([::1]:50275 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1TQJd1-0006Ep-LD for incoming@patchwork.ozlabs.org; Mon, 22 Oct 2012 11:09:19 -0400 Received: from eggs.gnu.org ([208.118.235.92]:60947) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1TQJcp-0006EQ-4V for qemu-devel@nongnu.org; Mon, 22 Oct 2012 11:09:13 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1TQJcn-0002UJ-TZ for qemu-devel@nongnu.org; Mon, 22 Oct 2012 11:09:07 -0400 Received: from mx1.redhat.com ([209.132.183.28]:57214) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1TQJcn-0002U0-KX for qemu-devel@nongnu.org; Mon, 22 Oct 2012 11:09:05 -0400 Received: from int-mx12.intmail.prod.int.phx2.redhat.com (int-mx12.intmail.prod.int.phx2.redhat.com [10.5.11.25]) by mx1.redhat.com (8.14.4/8.14.4) with ESMTP id q9MF3t2H015543 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK); Mon, 22 Oct 2012 11:03:55 -0400 Received: from nial.brq.redhat.com (dhcp-1-247.brq.redhat.com [10.34.1.247]) by int-mx12.intmail.prod.int.phx2.redhat.com (8.14.4/8.14.4) with ESMTP id q9MF3OnA031350; Mon, 22 Oct 2012 11:03:52 -0400 From: Igor Mammedov To: qemu-devel@nongnu.org Date: Mon, 22 Oct 2012 17:02:55 +0200 Message-Id: <1350918203-25198-10-git-send-email-imammedo@redhat.com> In-Reply-To: <1350918203-25198-1-git-send-email-imammedo@redhat.com> References: <1350918203-25198-1-git-send-email-imammedo@redhat.com> X-Scanned-By: MIMEDefang 2.68 on 10.5.11.25 X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 209.132.183.28 Cc: aliguori@us.ibm.com, ehabkost@redhat.com, jan.kiszka@siemens.com, Don@CloudSwitch.com, mdroth@linux.vnet.ibm.com, blauwirbel@gmail.com, stefanha@redhat.com, pbonzini@redhat.com, afaerber@suse.de Subject: [Qemu-devel] [PATCH 09/37] qdev: export qdev_prop_find() and allow it to be used with DeviceClass instead of Object X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Operating on DeviceClass instead of DEVICE will allow to find static properties before DEVICE instance is created. It will be used later in compat_normalize_cpu_model() to convert legacy CPUID features into corresponding static properties. Signed-off-by: Igor Mammedov --- hw/qdev-properties.h | 4 +++- qom/qdev-properties.c | 16 +++++++++------- 2 files changed, 12 insertions(+), 8 deletions(-) diff --git a/hw/qdev-properties.h b/hw/qdev-properties.h index ddcf774..b2f7142 100644 --- a/hw/qdev-properties.h +++ b/hw/qdev-properties.h @@ -98,7 +98,7 @@ extern PropertyInfo qdev_prop_pci_host_devaddr; {} /* Set properties between creation and init. */ -void *qdev_get_prop_ptr(DeviceState *dev, Property *prop); +void *qdev_get_prop_ptr(DeviceState *dev, const Property *prop); int qdev_prop_parse(DeviceState *dev, const char *name, const char *value); void qdev_prop_set_bit(DeviceState *dev, const char *name, bool value); void qdev_prop_set_uint8(DeviceState *dev, const char *name, uint8_t value); @@ -128,4 +128,6 @@ void error_set_from_qdev_prop_error(Error **errp, int ret, DeviceState *dev, */ void qdev_property_add_static(DeviceState *dev, Property *prop, Error **errp); +const Property *qdev_prop_find(const DeviceClass *dc, const char *name); + #endif diff --git a/qom/qdev-properties.c b/qom/qdev-properties.c index 2e82cb9..cc37479 100644 --- a/qom/qdev-properties.c +++ b/qom/qdev-properties.c @@ -6,7 +6,7 @@ #include "net/hub.h" #include "qapi/qapi-visit-core.h" -void *qdev_get_prop_ptr(DeviceState *dev, Property *prop) +void *qdev_get_prop_ptr(DeviceState *dev, const Property *prop) { void *ptr = dev; ptr += prop->offset; @@ -784,13 +784,13 @@ static Property *qdev_prop_walk(Property *props, const char *name) return NULL; } -static Property *qdev_prop_find(DeviceState *dev, const char *name) +const Property *qdev_prop_find(const DeviceClass *dc, const char *name) { ObjectClass *class; Property *prop; /* device properties */ - class = object_get_class(OBJECT(dev)); + class = OBJECT_CLASS(dc); do { prop = qdev_prop_walk(DEVICE_CLASS(class)->props, name); if (prop) { @@ -907,10 +907,11 @@ void qdev_prop_set_macaddr(DeviceState *dev, const char *name, uint8_t *value) void qdev_prop_set_enum(DeviceState *dev, const char *name, int value) { - Property *prop; + const Property *prop; Error *errp = NULL; + DeviceClass *dc = DEVICE_CLASS(object_get_class(OBJECT(dev))); - prop = qdev_prop_find(dev, name); + prop = qdev_prop_find(dc, name); object_property_set_str(OBJECT(dev), prop->info->enum_table[value], name, &errp); assert_no_error(errp); @@ -918,10 +919,11 @@ void qdev_prop_set_enum(DeviceState *dev, const char *name, int value) void qdev_prop_set_ptr(DeviceState *dev, const char *name, void *value) { - Property *prop; + const Property *prop; void **ptr; + DeviceClass *dc = DEVICE_CLASS(object_get_class(OBJECT(dev))); - prop = qdev_prop_find(dev, name); + prop = qdev_prop_find(dc, name); assert(prop && prop->info == &qdev_prop_ptr); ptr = qdev_get_prop_ptr(dev, prop); *ptr = value;