From patchwork Wed Jul 25 16:54:09 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Luiz Capitulino X-Patchwork-Id: 173222 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 B608E2C007C for ; Thu, 26 Jul 2012 03:08:33 +1000 (EST) Received: from localhost ([::1]:53851 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Su4qy-0003Pn-OV for incoming@patchwork.ozlabs.org; Wed, 25 Jul 2012 12:54:28 -0400 Received: from eggs.gnu.org ([208.118.235.92]:42091) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Su4qj-0002xf-Qd for qemu-devel@nongnu.org; Wed, 25 Jul 2012 12:54:19 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1Su4qi-0001Db-HU for qemu-devel@nongnu.org; Wed, 25 Jul 2012 12:54:13 -0400 Received: from mx1.redhat.com ([209.132.183.28]:6725) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Su4qi-0001DJ-8t for qemu-devel@nongnu.org; Wed, 25 Jul 2012 12:54:12 -0400 Received: from int-mx01.intmail.prod.int.phx2.redhat.com (int-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.11]) by mx1.redhat.com (8.14.4/8.14.4) with ESMTP id q6PGrlPp007492 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK); Wed, 25 Jul 2012 12:53:47 -0400 Received: from localhost (ovpn-113-89.phx2.redhat.com [10.3.113.89]) by int-mx01.intmail.prod.int.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id q6PGrjkq021940; Wed, 25 Jul 2012 12:53:46 -0400 From: Luiz Capitulino To: qemu-devel@nongnu.org Date: Wed, 25 Jul 2012 13:54:09 -0300 Message-Id: <1343235256-26310-5-git-send-email-lcapitulino@redhat.com> In-Reply-To: <1343235256-26310-1-git-send-email-lcapitulino@redhat.com> References: <1343235256-26310-1-git-send-email-lcapitulino@redhat.com> X-Scanned-By: MIMEDefang 2.67 on 10.5.11.11 X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 209.132.183.28 Cc: pbonzini@redhat.com, aliguori@us.ibm.com, armbru@redhat.com, mdroth@linux.vnet.ibm.com Subject: [Qemu-devel] [PATCH 04/11] qerror: rename QERR_PROPERTY_VALUE_NOT_POWER_OF_2 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 The error class name is PropertyValueNotPowerOf2, not PropertyValueNotPowerOf_2. Rename the QERR_PROPERTY_VALUE_NOT_POWER_OF_2 macro to QERR_PROPERTY_VALUE_NOT_POWER_OF2 to reflect that, so that future error macro generation generates the expected macro name. Signed-off-by: Luiz Capitulino --- hw/qdev-properties.c | 2 +- qerror.c | 2 +- qerror.h | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/hw/qdev-properties.c b/hw/qdev-properties.c index 24b39e8..7677cfd 100644 --- a/hw/qdev-properties.c +++ b/hw/qdev-properties.c @@ -901,7 +901,7 @@ static void set_blocksize(Object *obj, Visitor *v, void *opaque, /* We rely on power-of-2 blocksizes for bitmasks */ if ((value & (value - 1)) != 0) { - error_set(errp, QERR_PROPERTY_VALUE_NOT_POWER_OF_2, + error_set(errp, QERR_PROPERTY_VALUE_NOT_POWER_OF2, dev->id?:"", name, (int64_t)value); return; } diff --git a/qerror.c b/qerror.c index 132ab2d..e09c410 100644 --- a/qerror.c +++ b/qerror.c @@ -245,7 +245,7 @@ static const QErrorStringTable qerror_table[] = { .desc = "Property '%(device).%(property)' can't find value '%(value)'", }, { - .error_fmt = QERR_PROPERTY_VALUE_NOT_POWER_OF_2, + .error_fmt = QERR_PROPERTY_VALUE_NOT_POWER_OF2, .desc = "Property '%(device).%(property)' doesn't take " "value '%(value)', it's not a power of 2", }, diff --git a/qerror.h b/qerror.h index 27ce395..58d0295 100644 --- a/qerror.h +++ b/qerror.h @@ -205,7 +205,7 @@ QError *qobject_to_qerror(const QObject *obj); #define QERR_PROPERTY_VALUE_NOT_FOUND \ "{ 'class': 'PropertyValueNotFound', 'data': { 'device': %s, 'property': %s, 'value': %s } }" -#define QERR_PROPERTY_VALUE_NOT_POWER_OF_2 \ +#define QERR_PROPERTY_VALUE_NOT_POWER_OF2 \ "{ 'class': 'PropertyValueNotPowerOf2', 'data': { " \ "'device': %s, 'property': %s, 'value': %"PRId64" } }"