From patchwork Tue Oct 25 19:07:12 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Eduardo Habkost X-Patchwork-Id: 9395359 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id B24B560234 for ; Tue, 25 Oct 2016 19:37:00 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id C5EC629730 for ; Tue, 25 Oct 2016 19:37:00 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id BACBE2973E; Tue, 25 Oct 2016 19:37:00 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-6.9 required=2.0 tests=BAYES_00,RCVD_IN_DNSWL_HI autolearn=ham version=3.3.1 Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id 4145129730 for ; Tue, 25 Oct 2016 19:37:00 +0000 (UTC) Received: from localhost ([::1]:57783 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1bz7Wt-0008J9-Ee for patchwork-qemu-devel@patchwork.kernel.org; Tue, 25 Oct 2016 15:36:59 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:47289) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1bz74A-0000JL-9b for qemu-devel@nongnu.org; Tue, 25 Oct 2016 15:07:21 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1bz747-0000IC-4T for qemu-devel@nongnu.org; Tue, 25 Oct 2016 15:07:18 -0400 Received: from mx1.redhat.com ([209.132.183.28]:40270) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1bz746-0000I2-Vc for qemu-devel@nongnu.org; Tue, 25 Oct 2016 15:07:15 -0400 Received: from int-mx11.intmail.prod.int.phx2.redhat.com (int-mx11.intmail.prod.int.phx2.redhat.com [10.5.11.24]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 3D6358EB3F; Tue, 25 Oct 2016 19:07:14 +0000 (UTC) Received: from localhost (ovpn-116-51.phx2.redhat.com [10.3.116.51]) by int-mx11.intmail.prod.int.phx2.redhat.com (8.14.4/8.14.4) with ESMTP id u9PJ7D8x004543; Tue, 25 Oct 2016 15:07:13 -0400 Date: Tue, 25 Oct 2016 17:07:12 -0200 From: Eduardo Habkost To: Igor Mammedov Message-ID: <20161025190712.GB20882@thinpad.lan.raisama.net> References: <1476985679-4456-1-git-send-email-ehabkost@redhat.com> <1476985679-4456-4-git-send-email-ehabkost@redhat.com> <20161024155330.6ebf67a1@nial.brq.redhat.com> MIME-Version: 1.0 Content-Disposition: inline In-Reply-To: <20161024155330.6ebf67a1@nial.brq.redhat.com> X-Fnord: you can see the fnord User-Agent: Mutt/1.7.0 (2016-08-17) X-Scanned-By: MIMEDefang 2.68 on 10.5.11.24 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.26]); Tue, 25 Oct 2016 19:07:14 +0000 (UTC) X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 209.132.183.28 Subject: [Qemu-devel] [PATCH] fixup! qdev: Register static properties as class properties X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Markus Armbruster , qemu-devel@nongnu.org, Andreas =?iso-8859-1?Q?F=E4rber?= Errors-To: qemu-devel-bounces+patchwork-qemu-devel=patchwork.kernel.org@nongnu.org Sender: "Qemu-devel" X-Virus-Scanned: ClamAV using ClamSMTP On Mon, Oct 24, 2016 at 03:53:30PM +0200, Igor Mammedov wrote: [...] > > -static void qdev_property_add_legacy(DeviceState *dev, Property *prop, > > +static void qdev_class_property_add_legacy(ObjectClass *oc, Property *prop, > > Error **errp) > ^^^^ > need to fix alignment?? > [...] > > + object_class_property_add(oc, name, "str", > > + prop->info->print ? > alignment off by 1 starting from here? Fixup below. I can resend the whole series if necessary. Whoever is going to merge this, just let me know. --- hw/core/qdev.c | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/hw/core/qdev.c b/hw/core/qdev.c index f7d9030..a88753c 100644 --- a/hw/core/qdev.c +++ b/hw/core/qdev.c @@ -755,7 +755,7 @@ static void qdev_get_legacy_property(Object *obj, Visitor *v, * will be given names in the "legacy" namespace. */ static void qdev_class_property_add_legacy(ObjectClass *oc, Property *prop, - Error **errp) + Error **errp) { gchar *name; @@ -766,12 +766,12 @@ static void qdev_class_property_add_legacy(ObjectClass *oc, Property *prop, name = g_strdup_printf("legacy-%s", prop->name); object_class_property_add(oc, name, "str", - prop->info->print ? - qdev_get_legacy_property : - prop->info->get, - NULL, - NULL, - prop, errp); + prop->info->print ? + qdev_get_legacy_property : + prop->info->get, + NULL, + NULL, + prop, errp); g_free(name); }