From patchwork Wed Apr 11 21:30:33 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Paolo Bonzini X-Patchwork-Id: 151918 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 273FFB706B for ; Thu, 12 Apr 2012 08:55:54 +1000 (EST) Received: from localhost ([::1]:34594 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1SI58l-0000ZU-Td for incoming@patchwork.ozlabs.org; Wed, 11 Apr 2012 17:31:47 -0400 Received: from eggs.gnu.org ([208.118.235.92]:43824) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1SI58B-0007bs-8A for qemu-devel@nongnu.org; Wed, 11 Apr 2012 17:31:14 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1SI588-0002b9-Kn for qemu-devel@nongnu.org; Wed, 11 Apr 2012 17:31:10 -0400 Received: from mail-wi0-f181.google.com ([209.85.212.181]:38481) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1SI588-0002WT-Aw for qemu-devel@nongnu.org; Wed, 11 Apr 2012 17:31:08 -0400 Received: by mail-wi0-f181.google.com with SMTP id hr17so1209460wib.10 for ; Wed, 11 Apr 2012 14:31:07 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=sender:from:to:cc:subject:date:message-id:x-mailer:in-reply-to :references; bh=eDIncMCS9iEeWQbGnFyoJ64iNlI8FiZ7NXyVq4bglkE=; b=dnXNtyk9fykzyCkR4JuXpA/Y8PMhfKMRiLJbi82NGiIP+lGIWB0kLoXGhcAzOPProb l4jYToGqxE2wPOMKN9sGRvx6t2+tOqnPVRY7TGwjmpw3+GqF6h++pyBOv9xAJexehDyI /vxRwQZIeGPveqLlTUA3JvjKWVsx9K1Vt8y+WaT3JaRNA/1ur/t5vP2VqJHbg5ISi/fD ulq8KsCrsPq6eeJUlLMmR7GYIi3uMK/1PW4PbPdM9Y/mZ0c5XE4E60lOqcxX+/aOYQXu dgJJnDM8bMFMmawORYzsbYIWfpLWo/EOOrVfe8Agm5eofodMjVgozg6R9KlLDVtfCrgj rufw== Received: by 10.180.107.104 with SMTP id hb8mr76385wib.8.1334179867417; Wed, 11 Apr 2012 14:31:07 -0700 (PDT) Received: from yakj.lan (93-34-182-16.ip50.fastwebnet.it. [93.34.182.16]) by mx.google.com with ESMTPS id h8sm13849678wix.4.2012.04.11.14.31.06 (version=TLSv1/SSLv3 cipher=OTHER); Wed, 11 Apr 2012 14:31:06 -0700 (PDT) From: Paolo Bonzini To: qemu-devel@nongnu.org Date: Wed, 11 Apr 2012 23:30:33 +0200 Message-Id: <1334179842-6061-15-git-send-email-pbonzini@redhat.com> X-Mailer: git-send-email 1.7.9.3 In-Reply-To: <1334179793-5914-1-git-send-email-pbonzini@redhat.com> References: <1334179793-5914-1-git-send-email-pbonzini@redhat.com> X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 209.85.212.181 Cc: aliguori@us.ibm.com, afaerber@suse.de, Michael Roth Subject: [Qemu-devel] [PATCH v2 15/24] 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 From: Michael Roth Signed-off-by: Michael Roth Signed-off-by: Paolo Bonzini --- hw/qdev-addr.c | 4 +- hw/qdev-properties.c | 140 ++++++++++++++++++++++++++++++-------------------- 2 files changed, 87 insertions(+), 57 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 af7c00a..85d8a11 100644 --- a/hw/qdev-properties.c +++ b/hw/qdev-properties.c @@ -76,33 +76,30 @@ PropertyInfo qdev_prop_bit = { /* --- 8bit integer --- */ -static void get_int8(Object *obj, Visitor *v, void *opaque, - const char *name, Error **errp) +static void get_uint8(Object *obj, Visitor *v, void *opaque, + const char *name, Error **errp) { DeviceState *dev = DEVICE(obj); Property *prop = opaque; - int8_t *ptr = qdev_get_prop_ptr(dev, prop); - int64_t value; + uint8_t *ptr = qdev_get_prop_ptr(dev, prop); - value = *ptr; - visit_type_int(v, &value, name, errp); + visit_type_uint8(v, ptr, name, errp); } -static void set_int8(Object *obj, Visitor *v, void *opaque, - const char *name, Error **errp) +static void set_uint8(Object *obj, Visitor *v, void *opaque, + const char *name, Error **errp) { DeviceState *dev = DEVICE(obj); Property *prop = opaque; - int8_t *ptr = qdev_get_prop_ptr(dev, prop); + uint8_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_uint8(v, &value, name, &local_err); if (local_err) { error_propagate(errp, local_err); return; @@ -111,15 +108,15 @@ 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); } } PropertyInfo qdev_prop_uint8 = { .name = "uint8", - .get = get_int8, - .set = set_int8, + .get = get_uint8, + .set = set_uint8, .min = 0, .max = 255, }; @@ -154,41 +151,38 @@ PropertyInfo qdev_prop_hex8 = { .legacy_name = "hex8", .parse = parse_hex8, .print = print_hex8, - .get = get_int8, - .set = set_int8, + .get = get_uint8, + .set = set_uint8, .min = 0, .max = 255, }; /* --- 16bit integer --- */ -static void get_int16(Object *obj, Visitor *v, void *opaque, - const char *name, Error **errp) +static void get_uint16(Object *obj, Visitor *v, void *opaque, + const char *name, Error **errp) { DeviceState *dev = DEVICE(obj); Property *prop = opaque; - int16_t *ptr = qdev_get_prop_ptr(dev, prop); - int64_t value; + uint16_t *ptr = qdev_get_prop_ptr(dev, prop); - value = *ptr; - visit_type_int(v, &value, name, errp); + visit_type_uint16(v, ptr, name, errp); } -static void set_int16(Object *obj, Visitor *v, void *opaque, - const char *name, Error **errp) +static void set_uint16(Object *obj, Visitor *v, void *opaque, + const char *name, Error **errp) { DeviceState *dev = DEVICE(obj); Property *prop = opaque; - int16_t *ptr = qdev_get_prop_ptr(dev, prop); + uint16_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_uint16(v, &value, name, &local_err); if (local_err) { error_propagate(errp, local_err); return; @@ -197,31 +191,68 @@ 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); } } PropertyInfo qdev_prop_uint16 = { .name = "uint16", - .get = get_int16, - .set = set_int16, + .get = get_uint16, + .set = set_uint16, .min = 0, .max = 65535, }; /* --- 32bit integer --- */ +static void get_uint32(Object *obj, Visitor *v, void *opaque, + const char *name, Error **errp) +{ + DeviceState *dev = DEVICE(obj); + Property *prop = opaque; + uint32_t value, *ptr = qdev_get_prop_ptr(dev, prop); + + value = *ptr; + visit_type_uint32(v, &value, name, errp); +} + +static void set_uint32(Object *obj, Visitor *v, void *opaque, + const char *name, Error **errp) +{ + DeviceState *dev = DEVICE(obj); + Property *prop = opaque; + uint32_t value, *ptr = qdev_get_prop_ptr(dev, prop); + Error *local_err = NULL; + + if (dev->state != DEV_STATE_CREATED) { + error_set(errp, QERR_PERMISSION_DENIED); + return; + } + + visit_type_uint32(v, &value, name, &local_err); + if (local_err) { + error_propagate(errp, local_err); + return; + } + if (value >= prop->info->min && value <= prop->info->max) { + *ptr = value; + } else { + error_set(errp, QERR_PROPERTY_VALUE_OUT_OF_RANGE, + dev->id?:"", name, (int64_t)value, prop->info->min, + prop->info->max); + } +} + static void get_int32(Object *obj, Visitor *v, void *opaque, const char *name, Error **errp) { 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 +260,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,15 +277,15 @@ 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); } } PropertyInfo qdev_prop_uint32 = { .name = "uint32", - .get = get_int32, - .set = set_int32, + .get = get_uint32, + .set = set_uint32, .min = 0, .max = 0xFFFFFFFFULL, }; @@ -298,43 +328,43 @@ PropertyInfo qdev_prop_hex32 = { .legacy_name = "hex32", .parse = parse_hex32, .print = print_hex32, - .get = get_int32, - .set = set_int32, + .get = get_uint32, + .set = set_uint32, .min = 0, .max = 0xFFFFFFFFULL, }; /* --- 64bit integer --- */ -static void get_int64(Object *obj, Visitor *v, void *opaque, - const char *name, Error **errp) +static void get_uint64(Object *obj, Visitor *v, void *opaque, + const char *name, Error **errp) { DeviceState *dev = DEVICE(obj); Property *prop = opaque; - int64_t *ptr = qdev_get_prop_ptr(dev, prop); + uint64_t *ptr = qdev_get_prop_ptr(dev, prop); - visit_type_int(v, ptr, name, errp); + visit_type_uint64(v, ptr, name, errp); } -static void set_int64(Object *obj, Visitor *v, void *opaque, - const char *name, Error **errp) +static void set_uint64(Object *obj, Visitor *v, void *opaque, + const char *name, Error **errp) { DeviceState *dev = DEVICE(obj); Property *prop = opaque; - int64_t *ptr = qdev_get_prop_ptr(dev, prop); + uint64_t *ptr = qdev_get_prop_ptr(dev, prop); if (dev->state != DEV_STATE_CREATED) { error_set(errp, QERR_PERMISSION_DENIED); return; } - visit_type_int(v, ptr, name, errp); + visit_type_uint64(v, ptr, name, errp); } PropertyInfo qdev_prop_uint64 = { .name = "uint64", - .get = get_int64, - .set = set_int64, + .get = get_uint64, + .set = set_uint64, }; /* --- 64bit hex value --- */ @@ -367,8 +397,8 @@ PropertyInfo qdev_prop_hex64 = { .legacy_name = "hex64", .parse = parse_hex64, .print = print_hex64, - .get = get_int64, - .set = set_int64, + .get = get_uint64, + .set = set_uint64, }; /* --- string --- */ @@ -645,7 +675,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, @@ -663,7 +693,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;