From nobody Fri Dec 19 06:30:58 2025 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.zohomail.com; dkim=fail; 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; dmarc=fail(p=none dis=none) header.from=redhat.com Return-Path: Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) by mx.zohomail.com with SMTPS id 153021860038694.73357699427709; Thu, 28 Jun 2018 13:43:20 -0700 (PDT) Received: from localhost ([::1]:38486 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fYdl9-0005Qx-LC for importer@patchew.org; Thu, 28 Jun 2018 16:43:19 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:38286) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fYdAw-0007aN-LN for qemu-devel@nongnu.org; Thu, 28 Jun 2018 16:05:55 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1fYdAu-0000tv-IU for qemu-devel@nongnu.org; Thu, 28 Jun 2018 16:05:54 -0400 Received: from mail-wr0-x22e.google.com ([2a00:1450:400c:c0c::22e]:45170) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1fYdAu-0000so-As for qemu-devel@nongnu.org; Thu, 28 Jun 2018 16:05:52 -0400 Received: by mail-wr0-x22e.google.com with SMTP id u7-v6so6680497wrn.12 for ; Thu, 28 Jun 2018 13:05:52 -0700 (PDT) Received: from 640k.lan ([82.84.124.111]) by smtp.gmail.com with ESMTPSA id 127-v6sm6211110wmd.18.2018.06.28.13.05.49 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 28 Jun 2018 13:05:50 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=4U9Frdyn/LQ+KGr1l0uYUNbDOcw2OBREf0dl2maskiU=; b=XK9MOa8h7fGpUy7vi6kCu0N1AyK43p7x+h90D6qn6N6nDbSAxYocGJ0eQxGTfhjE94 syvoaD13XlMjBILNf0mmIU928FusR6OeRQZ5Vy2TczQdoKYrJ1lrhc5Gqei2kNdtlK4v iC/Iw/8bitz5nps1DgZUTrr+RYyE8lNEhQfmgOELuFoXiY36IYeaTEUf3sxL2MH5PTYh 8Wvq1gBB6bapBZLAZDBB+CbKKP1pjiIYTkDYihUfUADFidzvBIyH6Eq6s+mEMdh96bdA Sy6xviKoQ48z3oBVkClHoTIiL0B23IWK+fBu3odDMWRGFfI7hlKOf1VQwO5D7T9NdcZW Ffhw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :in-reply-to:references:mime-version:content-transfer-encoding; bh=4U9Frdyn/LQ+KGr1l0uYUNbDOcw2OBREf0dl2maskiU=; b=qoJgmutxF44jSCtabtQ3tfV2XbK5OnP8OFbhjn5D7No+u9mUYus+bXgeCsdtm0dDmJ U+VdGcZB61ph0mu44MsvclWUC99q77SjIYLjdid44W2gT0Fuu3MRkRjKoe1C/R1y84bZ GJpawMFztWHH9FyscPm073JRtPbF6bG34mBnlnXqgZuXMpzErbSPsyyW/x2JBvyDvgpa HVvTFCLnP3OT5GBBgWAAc13I9D9eu17GfnDnYxIBofzc8TTHg/nTQ55RS/j0yemy3vuK 8hfZwz28LXKooZ9CT0pC+PO2NwQYg+2HwivSVIu0Ye2TUFSVX72P0WWfS65l+3IhjH4r i55w== X-Gm-Message-State: APt69E0aZq8Qts4B6RgcFvK2Ou7GtX3HaeVisIBqPgkFyXe4ggThpfPp ura1PGz2W7b+gouCSRtOwCdszlhh X-Google-Smtp-Source: AAOMgpdJsRKe1PCr/YdY/9QO4bizVsRPNM9b/x5OMCX9uqGrPJGePhMUcBeZleRJXS//LbuM5pDSfg== X-Received: by 2002:adf:9102:: with SMTP id j2-v6mr10170802wrj.57.1530216351077; Thu, 28 Jun 2018 13:05:51 -0700 (PDT) From: Paolo Bonzini To: qemu-devel@nongnu.org Date: Thu, 28 Jun 2018 22:04:48 +0200 Message-Id: <1530216310-52873-39-git-send-email-pbonzini@redhat.com> X-Mailer: git-send-email 1.8.3.1 In-Reply-To: <1530216310-52873-1-git-send-email-pbonzini@redhat.com> References: <1530216310-52873-1-git-send-email-pbonzini@redhat.com> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2a00:1450:400c:c0c::22e Subject: [Qemu-devel] [PULL 38/60] hw/mips/jazz: create ESP device directly via qdev 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: Mark Cave-Ayland Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) X-ZohoMail: RDKM_2 RSF_0 Z_629925259 SPT_0 From: Mark Cave-Ayland MIPS jazz is the last user of the legacy esp_init() function so move creati= on of the ESP device over to use qdev. Note that the esp_reset and dma_enable qemu_irqs are currently unused and so we do not wire these up and instead remove the variables to prevent the compiler emitting unused variable warnings. Signed-off-by: Mark Cave-Ayland Message-Id: <20180613094727.11326-2-mark.cave-ayland@ilande.co.uk> Signed-off-by: Paolo Bonzini Tested-by: Herv=C3=A9 Poussineau --- hw/mips/mips_jazz.c | 19 ++++++++++++++++--- 1 file changed, 16 insertions(+), 3 deletions(-) diff --git a/hw/mips/mips_jazz.c b/hw/mips/mips_jazz.c index 90cb306..1afbe3c 100644 --- a/hw/mips/mips_jazz.c +++ b/hw/mips/mips_jazz.c @@ -145,10 +145,10 @@ static void mips_jazz_init(MachineState *machine, ISABus *isa_bus; ISADevice *pit; DriveInfo *fds[MAX_FD]; - qemu_irq esp_reset, dma_enable; MemoryRegion *ram =3D g_new(MemoryRegion, 1); MemoryRegion *bios =3D g_new(MemoryRegion, 1); MemoryRegion *bios2 =3D g_new(MemoryRegion, 1); + SysBusESPState *sysbus_esp; ESPState *esp; =20 /* init CPUs */ @@ -281,8 +281,21 @@ static void mips_jazz_init(MachineState *machine, } =20 /* SCSI adapter */ - esp =3D esp_init(0x80002000, 0, rc4030_dma_read, rc4030_dma_write, dma= s[0], - qdev_get_gpio_in(rc4030, 5), &esp_reset, &dma_enable); + dev =3D qdev_create(NULL, TYPE_ESP); + sysbus_esp =3D ESP_STATE(dev); + esp =3D &sysbus_esp->esp; + esp->dma_memory_read =3D rc4030_dma_read; + esp->dma_memory_write =3D rc4030_dma_write; + esp->dma_opaque =3D dmas[0]; + sysbus_esp->it_shift =3D 0; + /* XXX for now until rc4030 has been changed to use DMA enable signal = */ + esp->dma_enabled =3D 1; + qdev_init_nofail(dev); + + sysbus =3D SYS_BUS_DEVICE(dev); + sysbus_connect_irq(sysbus, 0, qdev_get_gpio_in(rc4030, 5)); + sysbus_mmio_map(sysbus, 0, 0x80002000); + scsi_bus_legacy_handle_cmdline(&esp->bus); =20 /* Floppy */ --=20 1.8.3.1