From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-6.8 required=3.0 tests=HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS, URIBL_BLOCKED autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id E2ACEECE588 for ; Tue, 15 Oct 2019 16:29:16 +0000 (UTC) Received: from lists.xenproject.org (lists.xenproject.org [192.237.175.120]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id C1D2F2086A for ; Tue, 15 Oct 2019 16:29:16 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org C1D2F2086A Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=redhat.com Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=xen-devel-bounces@lists.xenproject.org Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.89) (envelope-from ) id 1iKPh5-0003T7-NK; Tue, 15 Oct 2019 16:29:07 +0000 Received: from us1-rack-iad1.inumbo.com ([172.99.69.81]) by lists.xenproject.org with esmtp (Exim 4.89) (envelope-from ) id 1iKPh4-0003Sg-MD for xen-devel@lists.xenproject.org; Tue, 15 Oct 2019 16:29:06 +0000 X-Inumbo-ID: e7f89dc0-ef68-11e9-bbab-bc764e2007e4 Received: from mx1.redhat.com (unknown [209.132.183.28]) by us1-rack-iad1.inumbo.com (Halon) with ESMTPS id e7f89dc0-ef68-11e9-bbab-bc764e2007e4; Tue, 15 Oct 2019 16:29:06 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx08.intmail.prod.int.phx2.redhat.com [10.5.11.23]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id A2FDA18C8320; Tue, 15 Oct 2019 16:29:05 +0000 (UTC) Received: from x1w.redhat.com (ovpn-204-35.brq.redhat.com [10.40.204.35]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 9FCEF19C58; Tue, 15 Oct 2019 16:28:50 +0000 (UTC) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Date: Tue, 15 Oct 2019 18:26:41 +0200 Message-Id: <20191015162705.28087-9-philmd@redhat.com> In-Reply-To: <20191015162705.28087-1-philmd@redhat.com> References: <20191015162705.28087-1-philmd@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.84 on 10.5.11.23 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.6.2 (mx1.redhat.com [10.5.110.63]); Tue, 15 Oct 2019 16:29:05 +0000 (UTC) Subject: [Xen-devel] [PATCH 08/32] piix4: rename some variables in realize function X-BeenThere: xen-devel@lists.xenproject.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Cc: Laurent Vivier , Thomas Huth , Stefano Stabellini , Eduardo Habkost , kvm@vger.kernel.org, Paul Durrant , "Michael S. Tsirkin" , Marcel Apfelbaum , Paolo Bonzini , =?UTF-8?q?Herv=C3=A9=20Poussineau?= , Aleksandar Markovic , xen-devel@lists.xenproject.org, Anthony Perard , Igor Mammedov , Aleksandar Rikalo , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Aurelien Jarno , Richard Henderson Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Errors-To: xen-devel-bounces@lists.xenproject.org Sender: "Xen-devel" RnJvbTogSGVydsOpIFBvdXNzaW5lYXUgPGhwb3Vzc2luQHJlYWN0b3Mub3JnPgoKUElJWDQgc3Ry dWN0dXJlIGlzIG5vdyAncycKUENJIGRldmljZSBpcyBub3cgJ3BjaV9kZXYnCkRldmljZVN0YXRl IGlzIG5vdyAnZGV2JwoKQWNrZWQtYnk6IE1pY2hhZWwgUy4gVHNpcmtpbiA8bXN0QHJlZGhhdC5j b20+CkFja2VkLWJ5OiBQYW9sbyBCb256aW5pIDxwYm9uemluaUByZWRoYXQuY29tPgpTaWduZWQt b2ZmLWJ5OiBIZXJ2w6kgUG91c3NpbmVhdSA8aHBvdXNzaW5AcmVhY3Rvcy5vcmc+Ck1lc3NhZ2Ut SWQ6IDwyMDE3MTIxNjA5MDIyOC4yODUwNS02LWhwb3Vzc2luQHJlYWN0b3Mub3JnPgpTaWduZWQt b2ZmLWJ5OiBQaGlsaXBwZSBNYXRoaWV1LURhdWTDqSA8cGhpbG1kQHJlZGhhdC5jb20+Ci0tLQog aHcvaXNhL3BpaXg0LmMgfCAxMyArKysrKysrLS0tLS0tCiAxIGZpbGUgY2hhbmdlZCwgNyBpbnNl cnRpb25zKCspLCA2IGRlbGV0aW9ucygtKQoKZGlmZiAtLWdpdCBhL2h3L2lzYS9waWl4NC5jIGIv aHcvaXNhL3BpaXg0LmMKaW5kZXggMzI5NDA1NmNkNS4uNDIwMjI0M2U0MSAxMDA2NDQKLS0tIGEv aHcvaXNhL3BpaXg0LmMKKysrIGIvaHcvaXNhL3BpaXg0LmMKQEAgLTg4LDE2ICs4OCwxNyBAQCBz dGF0aWMgY29uc3QgVk1TdGF0ZURlc2NyaXB0aW9uIHZtc3RhdGVfcGlpeDQgPSB7CiAgICAgfQog fTsKIAotc3RhdGljIHZvaWQgcGlpeDRfcmVhbGl6ZShQQ0lEZXZpY2UgKmRldiwgRXJyb3IgKipl cnJwKQorc3RhdGljIHZvaWQgcGlpeDRfcmVhbGl6ZShQQ0lEZXZpY2UgKnBjaV9kZXYsIEVycm9y ICoqZXJycCkKIHsKLSAgICBQSUlYNFN0YXRlICpkID0gUElJWDRfUENJX0RFVklDRShkZXYpOwor ICAgIERldmljZVN0YXRlICpkZXYgPSBERVZJQ0UocGNpX2Rldik7CisgICAgUElJWDRTdGF0ZSAq cyA9IERPX1VQQ0FTVChQSUlYNFN0YXRlLCBkZXYsIHBjaV9kZXYpOwogCi0gICAgaWYgKCFpc2Ff YnVzX25ldyhERVZJQ0UoZCksIHBjaV9hZGRyZXNzX3NwYWNlKGRldiksCi0gICAgICAgICAgICAg ICAgICAgICBwY2lfYWRkcmVzc19zcGFjZV9pbyhkZXYpLCBlcnJwKSkgeworICAgIGlmICghaXNh X2J1c19uZXcoZGV2LCBwY2lfYWRkcmVzc19zcGFjZShwY2lfZGV2KSwKKyAgICAgICAgICAgICAg ICAgICAgIHBjaV9hZGRyZXNzX3NwYWNlX2lvKHBjaV9kZXYpLCBlcnJwKSkgewogICAgICAgICBy ZXR1cm47CiAgICAgfQotICAgIHBpaXg0X2RldiA9ICZkLT5kZXY7Ci0gICAgcWVtdV9yZWdpc3Rl cl9yZXNldChwaWl4NF9yZXNldCwgZCk7CisgICAgcGlpeDRfZGV2ID0gcGNpX2RldjsKKyAgICBx ZW11X3JlZ2lzdGVyX3Jlc2V0KHBpaXg0X3Jlc2V0LCBzKTsKIH0KIAogaW50IHBpaXg0X2luaXQo UENJQnVzICpidXMsIElTQUJ1cyAqKmlzYV9idXMsIGludCBkZXZmbikKLS0gCjIuMjEuMAoKCl9f X19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fClhlbi1kZXZlbCBt YWlsaW5nIGxpc3QKWGVuLWRldmVsQGxpc3RzLnhlbnByb2plY3Qub3JnCmh0dHBzOi8vbGlzdHMu eGVucHJvamVjdC5vcmcvbWFpbG1hbi9saXN0aW5mby94ZW4tZGV2ZWw= From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-6.8 required=3.0 tests=HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS, URIBL_BLOCKED autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 179ABECE588 for ; Tue, 15 Oct 2019 16:29:07 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id DEE8F2086A for ; Tue, 15 Oct 2019 16:29:06 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1728342AbfJOQ3G (ORCPT ); Tue, 15 Oct 2019 12:29:06 -0400 Received: from mx1.redhat.com ([209.132.183.28]:55110 "EHLO mx1.redhat.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1727651AbfJOQ3G (ORCPT ); Tue, 15 Oct 2019 12:29:06 -0400 Received: from smtp.corp.redhat.com (int-mx08.intmail.prod.int.phx2.redhat.com [10.5.11.23]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id A2FDA18C8320; Tue, 15 Oct 2019 16:29:05 +0000 (UTC) Received: from x1w.redhat.com (ovpn-204-35.brq.redhat.com [10.40.204.35]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 9FCEF19C58; Tue, 15 Oct 2019 16:28:50 +0000 (UTC) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: Aleksandar Markovic , Aurelien Jarno , Eduardo Habkost , Thomas Huth , Igor Mammedov , Anthony Perard , Stefano Stabellini , Paul Durrant , =?UTF-8?q?Herv=C3=A9=20Poussineau?= , Aleksandar Rikalo , xen-devel@lists.xenproject.org, Laurent Vivier , "Michael S. Tsirkin" , Marcel Apfelbaum , Paolo Bonzini , Richard Henderson , kvm@vger.kernel.org, =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= Subject: [PATCH 08/32] piix4: rename some variables in realize function Date: Tue, 15 Oct 2019 18:26:41 +0200 Message-Id: <20191015162705.28087-9-philmd@redhat.com> In-Reply-To: <20191015162705.28087-1-philmd@redhat.com> References: <20191015162705.28087-1-philmd@redhat.com> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Scanned-By: MIMEDefang 2.84 on 10.5.11.23 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.6.2 (mx1.redhat.com [10.5.110.63]); Tue, 15 Oct 2019 16:29:05 +0000 (UTC) Sender: kvm-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: kvm@vger.kernel.org From: Hervé Poussineau PIIX4 structure is now 's' PCI device is now 'pci_dev' DeviceState is now 'dev' Acked-by: Michael S. Tsirkin Acked-by: Paolo Bonzini Signed-off-by: Hervé Poussineau Message-Id: <20171216090228.28505-6-hpoussin@reactos.org> Signed-off-by: Philippe Mathieu-Daudé --- hw/isa/piix4.c | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/hw/isa/piix4.c b/hw/isa/piix4.c index 3294056cd5..4202243e41 100644 --- a/hw/isa/piix4.c +++ b/hw/isa/piix4.c @@ -88,16 +88,17 @@ static const VMStateDescription vmstate_piix4 = { } }; -static void piix4_realize(PCIDevice *dev, Error **errp) +static void piix4_realize(PCIDevice *pci_dev, Error **errp) { - PIIX4State *d = PIIX4_PCI_DEVICE(dev); + DeviceState *dev = DEVICE(pci_dev); + PIIX4State *s = DO_UPCAST(PIIX4State, dev, pci_dev); - if (!isa_bus_new(DEVICE(d), pci_address_space(dev), - pci_address_space_io(dev), errp)) { + if (!isa_bus_new(dev, pci_address_space(pci_dev), + pci_address_space_io(pci_dev), errp)) { return; } - piix4_dev = &d->dev; - qemu_register_reset(piix4_reset, d); + piix4_dev = pci_dev; + qemu_register_reset(piix4_reset, s); } int piix4_init(PCIBus *bus, ISABus **isa_bus, int devfn) -- 2.21.0 From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-6.8 required=3.0 tests=HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS, URIBL_BLOCKED autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id E829CECE588 for ; Tue, 15 Oct 2019 16:36:48 +0000 (UTC) Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id BCD9C20650 for ; Tue, 15 Oct 2019 16:36:48 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org BCD9C20650 Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=redhat.com Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Received: from localhost ([::1]:52742 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1iKPoV-0000zG-S2 for qemu-devel@archiver.kernel.org; Tue, 15 Oct 2019 12:36:48 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:41140) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1iKPh6-0001QC-Us for qemu-devel@nongnu.org; Tue, 15 Oct 2019 12:29:10 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1iKPh5-0004sQ-3e for qemu-devel@nongnu.org; Tue, 15 Oct 2019 12:29:08 -0400 Received: from mx1.redhat.com ([209.132.183.28]:31838) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1iKPh4-0004rO-Tr for qemu-devel@nongnu.org; Tue, 15 Oct 2019 12:29:07 -0400 Received: from smtp.corp.redhat.com (int-mx08.intmail.prod.int.phx2.redhat.com [10.5.11.23]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id A2FDA18C8320; Tue, 15 Oct 2019 16:29:05 +0000 (UTC) Received: from x1w.redhat.com (ovpn-204-35.brq.redhat.com [10.40.204.35]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 9FCEF19C58; Tue, 15 Oct 2019 16:28:50 +0000 (UTC) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Subject: [PATCH 08/32] piix4: rename some variables in realize function Date: Tue, 15 Oct 2019 18:26:41 +0200 Message-Id: <20191015162705.28087-9-philmd@redhat.com> In-Reply-To: <20191015162705.28087-1-philmd@redhat.com> References: <20191015162705.28087-1-philmd@redhat.com> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 X-Scanned-By: MIMEDefang 2.84 on 10.5.11.23 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.6.2 (mx1.redhat.com [10.5.110.63]); Tue, 15 Oct 2019 16:29:05 +0000 (UTC) Content-Transfer-Encoding: quoted-printable X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] [fuzzy] X-Received-From: 209.132.183.28 X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Laurent Vivier , Thomas Huth , Stefano Stabellini , Eduardo Habkost , kvm@vger.kernel.org, Paul Durrant , "Michael S. Tsirkin" , Paolo Bonzini , =?UTF-8?q?Herv=C3=A9=20Poussineau?= , Aleksandar Markovic , xen-devel@lists.xenproject.org, Anthony Perard , Igor Mammedov , Aleksandar Rikalo , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Aurelien Jarno , Richard Henderson Errors-To: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Sender: "Qemu-devel" From: Herv=C3=A9 Poussineau PIIX4 structure is now 's' PCI device is now 'pci_dev' DeviceState is now 'dev' Acked-by: Michael S. Tsirkin Acked-by: Paolo Bonzini Signed-off-by: Herv=C3=A9 Poussineau Message-Id: <20171216090228.28505-6-hpoussin@reactos.org> Signed-off-by: Philippe Mathieu-Daud=C3=A9 --- hw/isa/piix4.c | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/hw/isa/piix4.c b/hw/isa/piix4.c index 3294056cd5..4202243e41 100644 --- a/hw/isa/piix4.c +++ b/hw/isa/piix4.c @@ -88,16 +88,17 @@ static const VMStateDescription vmstate_piix4 =3D { } }; =20 -static void piix4_realize(PCIDevice *dev, Error **errp) +static void piix4_realize(PCIDevice *pci_dev, Error **errp) { - PIIX4State *d =3D PIIX4_PCI_DEVICE(dev); + DeviceState *dev =3D DEVICE(pci_dev); + PIIX4State *s =3D DO_UPCAST(PIIX4State, dev, pci_dev); =20 - if (!isa_bus_new(DEVICE(d), pci_address_space(dev), - pci_address_space_io(dev), errp)) { + if (!isa_bus_new(dev, pci_address_space(pci_dev), + pci_address_space_io(pci_dev), errp)) { return; } - piix4_dev =3D &d->dev; - qemu_register_reset(piix4_reset, d); + piix4_dev =3D pci_dev; + qemu_register_reset(piix4_reset, s); } =20 int piix4_init(PCIBus *bus, ISABus **isa_bus, int devfn) --=20 2.21.0