From nobody Sun Feb 8 15:37:35 2026 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) client-ip=208.118.235.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zoho.com; spf=pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; Return-Path: Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) by mx.zohomail.com with SMTPS id 1487681764293278.83016344892326; Tue, 21 Feb 2017 04:56:04 -0800 (PST) Received: from localhost ([::1]:44290 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1cg9z8-0001GE-1W for importer@patchew.org; Tue, 21 Feb 2017 07:56:02 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:48475) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1cg9ea-0007gC-Qy for qemu-devel@nongnu.org; Tue, 21 Feb 2017 07:34:50 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1cg9eZ-00085I-Cl for qemu-devel@nongnu.org; Tue, 21 Feb 2017 07:34:48 -0500 Received: from mx1.redhat.com ([209.132.183.28]:39024) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1cg9eU-00082D-De; Tue, 21 Feb 2017 07:34:42 -0500 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 669AE13A5E; Tue, 21 Feb 2017 12:34:42 +0000 (UTC) Received: from blackfin.pond.sub.org (ovpn-116-55.ams2.redhat.com [10.36.116.55]) by int-mx11.intmail.prod.int.phx2.redhat.com (8.14.4/8.14.4) with ESMTP id v1LCYfhj011812 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=NO); Tue, 21 Feb 2017 07:34:42 -0500 Received: by blackfin.pond.sub.org (Postfix, from userid 1000) id D1041113864D; Tue, 21 Feb 2017 13:34:39 +0100 (CET) From: Markus Armbruster To: qemu-devel@nongnu.org Date: Tue, 21 Feb 2017 13:34:30 +0100 Message-Id: <1487680479-15132-3-git-send-email-armbru@redhat.com> In-Reply-To: <1487680479-15132-1-git-send-email-armbru@redhat.com> References: <1487680479-15132-1-git-send-email-armbru@redhat.com> 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.29]); Tue, 21 Feb 2017 12:34:42 +0000 (UTC) X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] [fuzzy] X-Received-From: 209.132.183.28 Subject: [Qemu-devel] [PULL 02/11] hw/arm/cubieboard hw/arm/xlnx-ep108: Fix units_per_default_bus 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: Beniamino Galvani , "Edgar E. Iglesias" , qemu-arm@nongnu.org, Peter Maydell , Alistair Francis Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail: RSF_0 Z_629925259 SPT_0 Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Machine types cubieboard, xlnx-ep108, xlnx-zcu102 have an onboard AHCI controller, but neglect to set their MachineClass member units_per_default_bus =3D 1. This permits -drive if=3Dide,unit=3D1, which makes no sense for AHCI. It also screws up index=3DN for odd N, because it gets desugared to unit=3D1,bus=3DN/2 Doesn't really matter, because these machine types fail to honor -drive if=3Dide. Add the missing units_per_default_bus =3D 1 anyway, along with a TODO comment on what needs to be done for -drive if=3Dide. Also set block_default_type =3D IF_IDE explicitly. It's currently the default, but the next commit will change it to something more sensible, and we want to keep the IF_IDE default for these three machines. See also the previous commit. Cc: Beniamino Galvani Cc: Alistair Francis Cc: "Edgar E. Iglesias" Cc: Peter Maydell Cc: qemu-arm@nongnu.org Signed-off-by: Markus Armbruster Acked-by: Alistair Francis Message-Id: <1487153147-11530-3-git-send-email-armbru@redhat.com> --- hw/arm/cubieboard.c | 4 ++++ hw/arm/xlnx-ep108.c | 6 ++++++ 2 files changed, 10 insertions(+) diff --git a/hw/arm/cubieboard.c b/hw/arm/cubieboard.c index dd19ba3..b98e1c4 100644 --- a/hw/arm/cubieboard.c +++ b/hw/arm/cubieboard.c @@ -71,6 +71,8 @@ static void cubieboard_init(MachineState *machine) memory_region_add_subregion(get_system_memory(), AW_A10_SDRAM_BASE, &s->sdram); =20 + /* TODO create and connect IDE devices for ide_drive_get() */ + cubieboard_binfo.ram_size =3D machine->ram_size; cubieboard_binfo.kernel_filename =3D machine->kernel_filename; cubieboard_binfo.kernel_cmdline =3D machine->kernel_cmdline; @@ -82,6 +84,8 @@ static void cubieboard_machine_init(MachineClass *mc) { mc->desc =3D "cubietech cubieboard"; mc->init =3D cubieboard_init; + mc->block_default_type =3D IF_IDE; + mc->units_per_default_bus =3D 1; } =20 DEFINE_MACHINE("cubieboard", cubieboard_machine_init) diff --git a/hw/arm/xlnx-ep108.c b/hw/arm/xlnx-ep108.c index 4ec590a..860780a 100644 --- a/hw/arm/xlnx-ep108.c +++ b/hw/arm/xlnx-ep108.c @@ -106,6 +106,8 @@ static void xlnx_ep108_init(MachineState *machine) sysbus_connect_irq(SYS_BUS_DEVICE(&s->soc.spi[i]), 1, cs_line); } =20 + /* TODO create and connect IDE devices for ide_drive_get() */ + xlnx_ep108_binfo.ram_size =3D ram_size; xlnx_ep108_binfo.kernel_filename =3D machine->kernel_filename; xlnx_ep108_binfo.kernel_cmdline =3D machine->kernel_cmdline; @@ -118,6 +120,8 @@ static void xlnx_ep108_machine_init(MachineClass *mc) { mc->desc =3D "Xilinx ZynqMP EP108 board"; mc->init =3D xlnx_ep108_init; + mc->block_default_type =3D IF_IDE; + mc->units_per_default_bus =3D 1; } =20 DEFINE_MACHINE("xlnx-ep108", xlnx_ep108_machine_init) @@ -126,6 +130,8 @@ static void xlnx_zcu102_machine_init(MachineClass *mc) { mc->desc =3D "Xilinx ZynqMP ZCU102 board"; mc->init =3D xlnx_ep108_init; + mc->block_default_type =3D IF_IDE; + mc->units_per_default_bus =3D 1; } =20 DEFINE_MACHINE("xlnx-zcu102", xlnx_zcu102_machine_init) --=20 2.7.4