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 216B2CA9EA0 for ; Fri, 18 Oct 2019 13:49:55 +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 F0C8C222BD for ; Fri, 18 Oct 2019 13:49:54 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org F0C8C222BD 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 1iLSdU-00058G-J8; Fri, 18 Oct 2019 13:49:44 +0000 Received: from us1-rack-iad1.inumbo.com ([172.99.69.81]) by lists.xenproject.org with esmtp (Exim 4.89) (envelope-from ) id 1iLSdS-00057k-UM for xen-devel@lists.xenproject.org; Fri, 18 Oct 2019 13:49:42 +0000 X-Inumbo-ID: 22577ea4-f1ae-11e9-beca-bc764e2007e4 Received: from mx1.redhat.com (unknown [209.132.183.28]) by us1-rack-iad1.inumbo.com (Halon) with ESMTPS id 22577ea4-f1ae-11e9-beca-bc764e2007e4; Fri, 18 Oct 2019 13:49:41 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.12]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 2696F10DCC9F; Fri, 18 Oct 2019 13:49:41 +0000 (UTC) Received: from x1w.redhat.com (unknown [10.40.205.74]) by smtp.corp.redhat.com (Postfix) with ESMTPS id B94CF60BF1; Fri, 18 Oct 2019 13:49:29 +0000 (UTC) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Date: Fri, 18 Oct 2019 15:47:43 +0200 Message-Id: <20191018134754.16362-10-philmd@redhat.com> In-Reply-To: <20191018134754.16362-1-philmd@redhat.com> References: <20191018134754.16362-1-philmd@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.12 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.6.2 (mx1.redhat.com [10.5.110.64]); Fri, 18 Oct 2019 13:49:41 +0000 (UTC) Subject: [Xen-devel] [PATCH v2 09/20] hw/mips/mips_malta: Create IDE hard drive array dynamically 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: Stefano Stabellini , Marcel Apfelbaum , "Michael S. Tsirkin" , Paul Durrant , Paolo Bonzini , =?UTF-8?q?Herv=C3=A9=20Poussineau?= , Aleksandar Markovic , Igor Mammedov , Anthony Perard , xen-devel@lists.xenproject.org, Aleksandar Rikalo , Richard Henderson , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Aurelien Jarno , Eduardo Habkost Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Errors-To: xen-devel-bounces@lists.xenproject.org Sender: "Xen-devel" SW4gdGhlIG5leHQgY29tbWl0IHdlJ2xsIHJlZmFjdG9yIHRoZSBQSUlYNCBjb2RlIG91dCBvZgpt aXBzX21hbHRhX2luaXQoKS4gQXMgYSBwcmVsaW1pbmFyeSBzdGVwLCBhZGQgdGhlICdpZGVfZHJp dmVzJwp2YXJpYWJsZSBhbmQgY3JlYXRlIHRoZSBkcml2ZSBhcnJheSBkeW5hbWljYWxseS4KClJl dmlld2VkLWJ5OiBBbGVrc2FuZGFyIE1hcmtvdmljIDxhbWFya292aWNAd2F2ZWNvbXAuY29tPgpT aWduZWQtb2ZmLWJ5OiBQaGlsaXBwZSBNYXRoaWV1LURhdWTDqSA8cGhpbG1kQHJlZGhhdC5jb20+ Ci0tLQogaHcvbWlwcy9taXBzX21hbHRhLmMgfCA3ICsrKysrLS0KIDEgZmlsZSBjaGFuZ2VkLCA1 IGluc2VydGlvbnMoKyksIDIgZGVsZXRpb25zKC0pCgpkaWZmIC0tZ2l0IGEvaHcvbWlwcy9taXBz X21hbHRhLmMgYi9ody9taXBzL21pcHNfbWFsdGEuYwppbmRleCA1MjhjMzRhMWMzLi43NzRiYjgx MGY2IDEwMDY0NAotLS0gYS9ody9taXBzL21pcHNfbWFsdGEuYworKysgYi9ody9taXBzL21pcHNf bWFsdGEuYwpAQCAtMTIzNSw3ICsxMjM1LDggQEAgdm9pZCBtaXBzX21hbHRhX2luaXQoTWFjaGlu ZVN0YXRlICptYWNoaW5lKQogICAgIGludCBwaWl4NF9kZXZmbjsKICAgICBJMkNCdXMgKnNtYnVz OwogICAgIERyaXZlSW5mbyAqZGluZm87Ci0gICAgRHJpdmVJbmZvICpoZFtNQVhfSURFX0JVUyAq IE1BWF9JREVfREVWU107CisgICAgY29uc3Qgc2l6ZV90IGlkZV9kcml2ZXMgPSBNQVhfSURFX0JV UyAqIE1BWF9JREVfREVWUzsKKyAgICBEcml2ZUluZm8gKipoZDsKICAgICBpbnQgZmxfaWR4ID0g MDsKICAgICBpbnQgYmU7CiAKQEAgLTE0MDYsNyArMTQwNyw4IEBAIHZvaWQgbWlwc19tYWx0YV9p bml0KE1hY2hpbmVTdGF0ZSAqbWFjaGluZSkKICAgICBwY2lfYnVzID0gZ3Q2NDEyMF9yZWdpc3Rl cihzLT5pODI1OSk7CiAKICAgICAvKiBTb3V0aGJyaWRnZSAqLwotICAgIGlkZV9kcml2ZV9nZXQo aGQsIEFSUkFZX1NJWkUoaGQpKTsKKyAgICBoZCA9IGdfbmV3KERyaXZlSW5mbyAqLCBpZGVfZHJp dmVzKTsKKyAgICBpZGVfZHJpdmVfZ2V0KGhkLCBpZGVfZHJpdmVzKTsKIAogICAgIHBjaSA9IHBj aV9jcmVhdGVfc2ltcGxlX211bHRpZnVuY3Rpb24ocGNpX2J1cywgUENJX0RFVkZOKDEwLCAwKSwK ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIHRydWUsIFRZUEVfUElJ WDRfUENJX0RFVklDRSk7CkBAIC0xNDIxLDYgKzE0MjMsNyBAQCB2b2lkIG1pcHNfbWFsdGFfaW5p dChNYWNoaW5lU3RhdGUgKm1hY2hpbmUpCiAgICAgfQogCiAgICAgcGNpX3BpaXg0X2lkZV9pbml0 KHBjaV9idXMsIGhkLCBwaWl4NF9kZXZmbiArIDEpOworICAgIGdfZnJlZShoZCk7CiAgICAgcGNp X2NyZWF0ZV9zaW1wbGUocGNpX2J1cywgcGlpeDRfZGV2Zm4gKyAyLCAicGlpeDQtdXNiLXVoY2ki KTsKICAgICBzbWJ1cyA9IHBpaXg0X3BtX2luaXQocGNpX2J1cywgcGlpeDRfZGV2Zm4gKyAzLCAw eDExMDAsCiAgICAgICAgICAgICAgICAgICAgICAgICAgIGlzYV9nZXRfaXJxKE5VTEwsIDkpLCBO VUxMLCAwLCBOVUxMKTsKLS0gCjIuMjEuMAoKCl9fX19fX19fX19fX19fX19fX19fX19fX19fX19f X19fX19fX19fX19fX19fX19fClhlbi1kZXZlbCBtYWlsaW5nIGxpc3QKWGVuLWRldmVsQGxpc3Rz LnhlbnByb2plY3Qub3JnCmh0dHBzOi8vbGlzdHMueGVucHJvamVjdC5vcmcvbWFpbG1hbi9saXN0 aW5mby94ZW4tZGV2ZWw= 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 38CBECA9EA1 for ; Fri, 18 Oct 2019 13:53:18 +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 0CC27222BD for ; Fri, 18 Oct 2019 13:53:18 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 0CC27222BD 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]:40400 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1iLSgu-0000Rx-Jg for qemu-devel@archiver.kernel.org; Fri, 18 Oct 2019 09:53:16 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:54996) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1iLSdT-0004fw-MU for qemu-devel@nongnu.org; Fri, 18 Oct 2019 09:49:44 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1iLSdS-0006A6-6l for qemu-devel@nongnu.org; Fri, 18 Oct 2019 09:49:43 -0400 Received: from mx1.redhat.com ([209.132.183.28]:48120) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1iLSdS-00069q-1B for qemu-devel@nongnu.org; Fri, 18 Oct 2019 09:49:42 -0400 Received: from smtp.corp.redhat.com (int-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.12]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 2696F10DCC9F; Fri, 18 Oct 2019 13:49:41 +0000 (UTC) Received: from x1w.redhat.com (unknown [10.40.205.74]) by smtp.corp.redhat.com (Postfix) with ESMTPS id B94CF60BF1; Fri, 18 Oct 2019 13:49:29 +0000 (UTC) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Subject: [PATCH v2 09/20] hw/mips/mips_malta: Create IDE hard drive array dynamically Date: Fri, 18 Oct 2019 15:47:43 +0200 Message-Id: <20191018134754.16362-10-philmd@redhat.com> In-Reply-To: <20191018134754.16362-1-philmd@redhat.com> References: <20191018134754.16362-1-philmd@redhat.com> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.12 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.6.2 (mx1.redhat.com [10.5.110.64]); Fri, 18 Oct 2019 13:49:41 +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: Stefano Stabellini , "Michael S. Tsirkin" , Paul Durrant , Paolo Bonzini , =?UTF-8?q?Herv=C3=A9=20Poussineau?= , Aleksandar Markovic , Igor Mammedov , Anthony Perard , xen-devel@lists.xenproject.org, Aleksandar Rikalo , Richard Henderson , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Aurelien Jarno , Eduardo Habkost Errors-To: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Sender: "Qemu-devel" In the next commit we'll refactor the PIIX4 code out of mips_malta_init(). As a preliminary step, add the 'ide_drives' variable and create the drive array dynamically. Reviewed-by: Aleksandar Markovic Signed-off-by: Philippe Mathieu-Daud=C3=A9 --- hw/mips/mips_malta.c | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/hw/mips/mips_malta.c b/hw/mips/mips_malta.c index 528c34a1c3..774bb810f6 100644 --- a/hw/mips/mips_malta.c +++ b/hw/mips/mips_malta.c @@ -1235,7 +1235,8 @@ void mips_malta_init(MachineState *machine) int piix4_devfn; I2CBus *smbus; DriveInfo *dinfo; - DriveInfo *hd[MAX_IDE_BUS * MAX_IDE_DEVS]; + const size_t ide_drives =3D MAX_IDE_BUS * MAX_IDE_DEVS; + DriveInfo **hd; int fl_idx =3D 0; int be; =20 @@ -1406,7 +1407,8 @@ void mips_malta_init(MachineState *machine) pci_bus =3D gt64120_register(s->i8259); =20 /* Southbridge */ - ide_drive_get(hd, ARRAY_SIZE(hd)); + hd =3D g_new(DriveInfo *, ide_drives); + ide_drive_get(hd, ide_drives); =20 pci =3D pci_create_simple_multifunction(pci_bus, PCI_DEVFN(10, 0), true, TYPE_PIIX4_PCI_DEVICE); @@ -1421,6 +1423,7 @@ void mips_malta_init(MachineState *machine) } =20 pci_piix4_ide_init(pci_bus, hd, piix4_devfn + 1); + g_free(hd); pci_create_simple(pci_bus, piix4_devfn + 2, "piix4-usb-uhci"); smbus =3D piix4_pm_init(pci_bus, piix4_devfn + 3, 0x1100, isa_get_irq(NULL, 9), NULL, 0, NULL); --=20 2.21.0