From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:51813) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Xoym6-0001Nx-Lp for qemu-devel@nongnu.org; Thu, 13 Nov 2014 13:05:49 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1Xoylz-0001lx-Kh for qemu-devel@nongnu.org; Thu, 13 Nov 2014 13:05:42 -0500 Received: from mx1.redhat.com ([209.132.183.28]:48014) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Xoylz-0001ll-5U for qemu-devel@nongnu.org; Thu, 13 Nov 2014 13:05:35 -0500 From: Eduardo Habkost Date: Thu, 13 Nov 2014 16:05:18 -0200 Message-Id: <1415901921-14372-2-git-send-email-ehabkost@redhat.com> In-Reply-To: <1415901921-14372-1-git-send-email-ehabkost@redhat.com> References: <1415901921-14372-1-git-send-email-ehabkost@redhat.com> Subject: [Qemu-devel] [RFC 1/4] qdev: Variable name style fix List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: Paolo Bonzini , =?UTF-8?q?Andreas=20F=C3=A4rber?= Use 'DeviceClass *dc' instead of 'klass'. Signed-off-by: Eduardo Habkost --- hw/core/qdev.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/hw/core/qdev.c b/hw/core/qdev.c index 413b413..5c6a109 100644 --- a/hw/core/qdev.c +++ b/hw/core/qdev.c @@ -1150,12 +1150,12 @@ static void device_finalize(Object *obj) static void device_class_base_init(ObjectClass *class, void *data) { - DeviceClass *klass = DEVICE_CLASS(class); + DeviceClass *dc = DEVICE_CLASS(class); /* We explicitly look up properties in the superclasses, * so do not propagate them to the subclasses. */ - klass->props = NULL; + dc->props = NULL; } static void device_unparent(Object *obj) @@ -1204,10 +1204,10 @@ static void device_class_init(ObjectClass *class, void *data) void device_reset(DeviceState *dev) { - DeviceClass *klass = DEVICE_GET_CLASS(dev); + DeviceClass *dc = DEVICE_GET_CLASS(dev); - if (klass->reset) { - klass->reset(dev); + if (dc->reset) { + dc->reset(dev); } } -- 1.9.3