From patchwork Thu Feb 23 20:22:26 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Michael Roth X-Patchwork-Id: 142704 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [140.186.70.17]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (Client did not present a certificate) by ozlabs.org (Postfix) with ESMTPS id 540B1B70DF for ; Fri, 24 Feb 2012 07:27:45 +1100 (EST) Received: from localhost ([::1]:53034 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1S0fGR-0004J1-6y for incoming@patchwork.ozlabs.org; Thu, 23 Feb 2012 15:27:43 -0500 Received: from eggs.gnu.org ([140.186.70.92]:52503) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1S0fFg-0002GY-0l for qemu-devel@nongnu.org; Thu, 23 Feb 2012 15:26:57 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1S0fFe-0000k6-A3 for qemu-devel@nongnu.org; Thu, 23 Feb 2012 15:26:55 -0500 Received: from mail-pw0-f45.google.com ([209.85.160.45]:61193) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1S0fFe-0000iG-3U for qemu-devel@nongnu.org; Thu, 23 Feb 2012 15:26:54 -0500 Received: by mail-pw0-f45.google.com with SMTP id ro12so2139766pbb.4 for ; Thu, 23 Feb 2012 12:26:53 -0800 (PST) Received-SPF: pass (google.com: domain of flukshun@gmail.com designates 10.68.234.4 as permitted sender) client-ip=10.68.234.4; Authentication-Results: mr.google.com; spf=pass (google.com: domain of flukshun@gmail.com designates 10.68.234.4 as permitted sender) smtp.mail=flukshun@gmail.com; dkim=pass header.i=flukshun@gmail.com Received: from mr.google.com ([10.68.234.4]) by 10.68.234.4 with SMTP id ua4mr866369pbc.5.1330028813819 (num_hops = 1); Thu, 23 Feb 2012 12:26:53 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=gamma; h=sender:from:to:cc:subject:date:message-id:x-mailer:in-reply-to :references; bh=reodJF+94ygGQNi5FMgTj7OdLwvS6qimJeCsAQUl9+k=; b=Zw50wiuwkUjoFVdz2VxJRDeZEqvVSkd33TlvqpaGxHH7qBgWaRg/oziDG0898Cqv07 0Qyp/gcTDLnkmzsLsXLG9VCze4lEg0F/WxIRURVrxtvN3Ta27AtuAASh8cprIGeQmeU9 RnAv55RH7rvX+MrB6CpPJcm248FVQpsAP9Fa8= Received: by 10.68.234.4 with SMTP id ua4mr685426pbc.5.1330028813755; Thu, 23 Feb 2012 12:26:53 -0800 (PST) Received: from localhost.localdomain ([32.97.110.59]) by mx.google.com with ESMTPS id j9sm2304822pbp.43.2012.02.23.12.26.51 (version=TLSv1/SSLv3 cipher=OTHER); Thu, 23 Feb 2012 12:26:52 -0800 (PST) From: Michael Roth To: qemu-devel@nongnu.org Date: Thu, 23 Feb 2012 14:22:26 -0600 Message-Id: <1330028546-13183-7-git-send-email-mdroth@linux.vnet.ibm.com> X-Mailer: git-send-email 1.7.4.1 In-Reply-To: <1330028546-13183-1-git-send-email-mdroth@linux.vnet.ibm.com> References: <1330028546-13183-1-git-send-email-mdroth@linux.vnet.ibm.com> X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 209.85.160.45 Cc: pbonzini@redhat.com Subject: [Qemu-devel] [PATCH v2 6/6] qdev: switch property accessors to fixed-width visitor interfaces 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 Signed-off-by: Michael Roth --- hw/qdev-addr.c | 4 ++-- hw/qdev-properties.c | 42 +++++++++++++++++------------------------- 2 files changed, 19 insertions(+), 27 deletions(-) diff --git a/hw/qdev-addr.c b/hw/qdev-addr.c index 0bb16c7..b711b6b 100644 --- a/hw/qdev-addr.c +++ b/hw/qdev-addr.c @@ -27,7 +27,7 @@ static void get_taddr(Object *obj, Visitor *v, void *opaque, int64_t value; value = *ptr; - visit_type_int(v, &value, name, errp); + visit_type_int64(v, &value, name, errp); } static void set_taddr(Object *obj, Visitor *v, void *opaque, @@ -44,7 +44,7 @@ static void set_taddr(Object *obj, Visitor *v, void *opaque, return; } - visit_type_int(v, &value, name, &local_err); + visit_type_int64(v, &value, name, &local_err); if (local_err) { error_propagate(errp, local_err); return; diff --git a/hw/qdev-properties.c b/hw/qdev-properties.c index 0423af1..98d95fb 100644 --- a/hw/qdev-properties.c +++ b/hw/qdev-properties.c @@ -82,10 +82,8 @@ static void get_int8(Object *obj, Visitor *v, void *opaque, DeviceState *dev = DEVICE(obj); Property *prop = opaque; int8_t *ptr = qdev_get_prop_ptr(dev, prop); - int64_t value; - value = *ptr; - visit_type_int(v, &value, name, errp); + visit_type_int8(v, ptr, name, errp); } static void set_int8(Object *obj, Visitor *v, void *opaque, @@ -93,16 +91,15 @@ static void set_int8(Object *obj, Visitor *v, void *opaque, { DeviceState *dev = DEVICE(obj); Property *prop = opaque; - int8_t *ptr = qdev_get_prop_ptr(dev, prop); + int8_t value, *ptr = qdev_get_prop_ptr(dev, prop); Error *local_err = NULL; - int64_t value; if (dev->state != DEV_STATE_CREATED) { error_set(errp, QERR_PERMISSION_DENIED); return; } - visit_type_int(v, &value, name, &local_err); + visit_type_int8(v, &value, name, &local_err); if (local_err) { error_propagate(errp, local_err); return; @@ -111,7 +108,7 @@ static void set_int8(Object *obj, Visitor *v, void *opaque, *ptr = value; } else { error_set(errp, QERR_PROPERTY_VALUE_OUT_OF_RANGE, - dev->id?:"", name, value, prop->info->min, + dev->id?:"", name, (int64_t)value, prop->info->min, prop->info->max); } } @@ -168,10 +165,8 @@ static void get_int16(Object *obj, Visitor *v, void *opaque, DeviceState *dev = DEVICE(obj); Property *prop = opaque; int16_t *ptr = qdev_get_prop_ptr(dev, prop); - int64_t value; - value = *ptr; - visit_type_int(v, &value, name, errp); + visit_type_int16(v, ptr, name, errp); } static void set_int16(Object *obj, Visitor *v, void *opaque, @@ -179,16 +174,15 @@ static void set_int16(Object *obj, Visitor *v, void *opaque, { DeviceState *dev = DEVICE(obj); Property *prop = opaque; - int16_t *ptr = qdev_get_prop_ptr(dev, prop); + int16_t value, *ptr = qdev_get_prop_ptr(dev, prop); Error *local_err = NULL; - int64_t value; if (dev->state != DEV_STATE_CREATED) { error_set(errp, QERR_PERMISSION_DENIED); return; } - visit_type_int(v, &value, name, &local_err); + visit_type_int16(v, &value, name, &local_err); if (local_err) { error_propagate(errp, local_err); return; @@ -197,7 +191,7 @@ static void set_int16(Object *obj, Visitor *v, void *opaque, *ptr = value; } else { error_set(errp, QERR_PROPERTY_VALUE_OUT_OF_RANGE, - dev->id?:"", name, value, prop->info->min, + dev->id?:"", name, (int64_t)value, prop->info->min, prop->info->max); } } @@ -217,11 +211,10 @@ static void get_int32(Object *obj, Visitor *v, void *opaque, { DeviceState *dev = DEVICE(obj); Property *prop = opaque; - int32_t *ptr = qdev_get_prop_ptr(dev, prop); - int64_t value; + int32_t value, *ptr = qdev_get_prop_ptr(dev, prop); value = *ptr; - visit_type_int(v, &value, name, errp); + visit_type_int32(v, &value, name, errp); } static void set_int32(Object *obj, Visitor *v, void *opaque, @@ -229,16 +222,15 @@ static void set_int32(Object *obj, Visitor *v, void *opaque, { DeviceState *dev = DEVICE(obj); Property *prop = opaque; - int32_t *ptr = qdev_get_prop_ptr(dev, prop); + int32_t value, *ptr = qdev_get_prop_ptr(dev, prop); Error *local_err = NULL; - int64_t value; if (dev->state != DEV_STATE_CREATED) { error_set(errp, QERR_PERMISSION_DENIED); return; } - visit_type_int(v, &value, name, &local_err); + visit_type_int32(v, &value, name, &local_err); if (local_err) { error_propagate(errp, local_err); return; @@ -247,7 +239,7 @@ static void set_int32(Object *obj, Visitor *v, void *opaque, *ptr = value; } else { error_set(errp, QERR_PROPERTY_VALUE_OUT_OF_RANGE, - dev->id?:"", name, value, prop->info->min, + dev->id?:"", name, (int64_t)value, prop->info->min, prop->info->max); } } @@ -313,7 +305,7 @@ static void get_int64(Object *obj, Visitor *v, void *opaque, Property *prop = opaque; int64_t *ptr = qdev_get_prop_ptr(dev, prop); - visit_type_int(v, ptr, name, errp); + visit_type_int64(v, ptr, name, errp); } static void set_int64(Object *obj, Visitor *v, void *opaque, @@ -328,7 +320,7 @@ static void set_int64(Object *obj, Visitor *v, void *opaque, return; } - visit_type_int(v, ptr, name, errp); + visit_type_int64(v, ptr, name, errp); } PropertyInfo qdev_prop_uint64 = { @@ -649,7 +641,7 @@ static void get_vlan(Object *obj, Visitor *v, void *opaque, int64_t id; id = *ptr ? (*ptr)->id : -1; - visit_type_int(v, &id, name, errp); + visit_type_int64(v, &id, name, errp); } static void set_vlan(Object *obj, Visitor *v, void *opaque, @@ -667,7 +659,7 @@ static void set_vlan(Object *obj, Visitor *v, void *opaque, return; } - visit_type_int(v, &id, name, &local_err); + visit_type_int64(v, &id, name, &local_err); if (local_err) { error_propagate(errp, local_err); return;