From patchwork Thu Mar 2 22:40:49 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= X-Patchwork-Id: 658161 Delivered-To: patch@linaro.org Received: by 2002:adf:a3c6:0:0:0:0:0 with SMTP id m6csp145102wrb; Thu, 2 Mar 2023 14:42:42 -0800 (PST) X-Google-Smtp-Source: AK7set+jAV8ICFM4yTUWC6VTMgnLJt5vkvEcXeuqDV+dL+rUmiRLmKr0p9GcF22TDKNLk4oG1gZ5 X-Received: by 2002:a05:622a:1801:b0:3bf:cd42:7724 with SMTP id t1-20020a05622a180100b003bfcd427724mr20812344qtc.11.1677796962648; Thu, 02 Mar 2023 14:42:42 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1677796962; cv=none; d=google.com; s=arc-20160816; b=wm3CdPTRuj02LdCTCMmJPdCFw6u+QIdThMNsbtYgKTkMZtpvtvbOXBCLnNaesbHew5 rnzngYKdywaOnE3Eo3q0TvnT6yvLHHEC1JDzvz/DadpLwDGN/a+DkmeYuBqahtO5lpl1 Z6+RvTh0cSzyGpHoI0rjF1eUxLUQd0PQU2+0qWYhq7T4Ki8Vru1k0FtMn+92Jmw2HR2+ v/2FTCfzp64XSOWgHskdusuf/IbyPCeJ75s7U1eNaEd6kaPMmXX75DIhieuT2T399udn jFGEtbpKDcxU9oSesrcdVzmhJBFbtkK0LRn0p10ydVUTuskd8cCvJ5IqJ49/BHgTOzmw eGXA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:content-transfer-encoding :mime-version:references:in-reply-to:message-id:date:subject:cc:to :from:dkim-signature; bh=H5itDKkjjwbFDWZM5dfCKNestHYP2geb5DKzbrDRTD4=; b=sqGLXQJVYxoNnXpk26BexzrjP1+YOs1/o7uekzSXR8HuA4faIWBmpszsxoonx0KFi1 Qr0Vt68goeSX154mssDLoc78Io/uEDHSL2KiSt28V6ZY+baOEABL9/Rzdk0V6EADAenW Px1poJqEIpDY5jsFhXDT3o+vAIztWv4rZjPtk7bBuWMUou3c5GLbR+SKnB6tOZyPn61j sZ0B8RWzLpbhEMGCCovvi3HdU8TYsKmytb9qsDAhn5ONE4jRlGIMPAYy7hwOxnBMikxF IO6E40hYMg03Dd4eQVhV+t2A+LlNZF2axkAAofM5vgi0B0yiRpeHpLB/13Q2QTMTgi34 1TPA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=PAVWdoTh; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from lists.gnu.org (lists.gnu.org. [209.51.188.17]) by mx.google.com with ESMTPS id r3-20020a05620a298300b0073b447266b6si643530qkp.185.2023.03.02.14.42.42 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Thu, 02 Mar 2023 14:42:42 -0800 (PST) Received-SPF: pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; Authentication-Results: mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=PAVWdoTh; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1pXrcs-0007nF-IX; Thu, 02 Mar 2023 17:42:14 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1pXrcq-0007fg-Ah for qemu-devel@nongnu.org; Thu, 02 Mar 2023 17:42:12 -0500 Received: from mail-wr1-x431.google.com ([2a00:1450:4864:20::431]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1pXrco-00006N-KZ for qemu-devel@nongnu.org; Thu, 02 Mar 2023 17:42:11 -0500 Received: by mail-wr1-x431.google.com with SMTP id v16so661070wrn.0 for ; Thu, 02 Mar 2023 14:42:10 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1677796929; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=H5itDKkjjwbFDWZM5dfCKNestHYP2geb5DKzbrDRTD4=; b=PAVWdoThX6qssLgvIeIXrd8xehaHHU8GzYhQJpTra3qrcajjrG2kbnzHyXnVE/5hCX s1++DlVlg7ThRO/dfTlDYDNhcUpABbIRkbsBig1rbNe9ZNbk3LKMtqN+fm/3z0pN9tH4 Q1HvfC7B4exa8BptZ49b0OPsGc9mZaX9vYEFxKbSwYblrT0JzAPG/otw5kKsNCw0YBM6 Qb5CUe3jpI/NcW/5GDoKOklqwe//Z/3i8dQgl6pvq87RcotLvnCaKnOEJJbBh20stWZM AeM0J61wMeL3F1tKPZOljMeXGnQF0hadKQARCN5bNm2/Hxb3c84gqFHw/wJPOTfL55gI f6Vg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; t=1677796929; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=H5itDKkjjwbFDWZM5dfCKNestHYP2geb5DKzbrDRTD4=; b=AtwP7caMjKTaABQHlPyg29QC5J6jyegwS0YGpAOtLVJGV2rBPysk85S3vvxwZkcF5t wBwsvGeJT8oZSa5n7hmUvFWwH9lVO2SXRlLULQQ0EdBD/8B2/J/SXnI7tBwOVTqAxfbT btUjtZP2ZJ0Ip6nKhwijfI0m3r3w5/lv8OV20XBOX9B6kyTqcHVYSJfQvKw7kimzr2XO SmPSBkB8k/udbtLCykQ00M+21KnWP7rbQboRJTREFouVysd47NzxCUwxAzHQT3AVuQFZ lukV/kjRDqOeu7VQSwmL2xh2vmNLbRQv33xitHrOEo0xCtV7M4E+nGa1jeWdIikxQQ8b VrEA== X-Gm-Message-State: AO0yUKV/idhatNvC3bfhAo+tqFj1gjNFIDwb3VQ4eeOWIBthCGPelmqw xn6Dvb1nWRGtgHj/ExEv437LFiajgOCqYflg X-Received: by 2002:a5d:4fc6:0:b0:2c7:1e3b:2d46 with SMTP id h6-20020a5d4fc6000000b002c71e3b2d46mr7575295wrw.17.1677796929195; Thu, 02 Mar 2023 14:42:09 -0800 (PST) Received: from localhost.localdomain (43.red-95-127-39.staticip.rima-tde.net. [95.127.39.43]) by smtp.gmail.com with ESMTPSA id q10-20020a5d658a000000b002c70851fdd8sm475179wru.75.2023.03.02.14.42.07 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Thu, 02 Mar 2023 14:42:08 -0800 (PST) From: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org, Bernhard Beschow Cc: John Snow , David Woodhouse , BALATON Zoltan , =?utf-8?q?Herv=C3=A9_Poussineau?= , qemu-ppc@nongnu.org, =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= , qemu-block@nongnu.org Subject: [PATCH v3 09/18] hw/ide/piix: Use generic ide_bus_init_ioport() Date: Thu, 2 Mar 2023 23:40:49 +0100 Message-Id: <20230302224058.43315-10-philmd@linaro.org> X-Mailer: git-send-email 2.38.1 In-Reply-To: <20230302224058.43315-1-philmd@linaro.org> References: <20230302224058.43315-1-philmd@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::431; envelope-from=philmd@linaro.org; helo=mail-wr1-x431.google.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=unavailable autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: qemu-devel-bounces+patch=linaro.org@nongnu.org TYPE_PIIX3_IDE is a PCI function inheriting from QOM TYPE_PCI_DEVICE. To be able to call the ISA specific ide_init_ioport_isa(), we call this function passing a NULL ISADevice argument. Remove this hack by calling the recently added generic ide_init_ioport(), which doesn't expect any ISADevice. Inspired-by: Bernhard Beschow Signed-off-by: Philippe Mathieu-Daudé --- hw/ide/piix.c | 11 +++-------- 1 file changed, 3 insertions(+), 8 deletions(-) diff --git a/hw/ide/piix.c b/hw/ide/piix.c index 91424e5249..2136895401 100644 --- a/hw/ide/piix.c +++ b/hw/ide/piix.c @@ -138,7 +138,6 @@ static bool pci_piix_init_bus(PCIIDEState *d, unsigned i, Error **errp) {0x1f0, 0x3f6}, {0x170, 0x376}, }; - int ret; if (!d->isa_irq[i]) { error_setg(errp, "output IDE IRQ %u not connected", i); @@ -146,13 +145,9 @@ static bool pci_piix_init_bus(PCIIDEState *d, unsigned i, Error **errp) } ide_bus_init(&d->bus[i], sizeof(d->bus[i]), DEVICE(d), i, 2); - ret = ide_bus_init_ioport_isa(&d->bus[i], NULL, port_info[i].iobase, - port_info[i].iobase2); - if (ret) { - error_setg_errno(errp, -ret, "Failed to realize %s port %u", - object_get_typename(OBJECT(d)), i); - return false; - } + ide_bus_init_ioport(&d->bus[i], OBJECT(d), + pci_address_space_io(PCI_DEVICE(d)), + port_info[i].iobase, port_info[i].iobase2); ide_bus_init_output_irq(&d->bus[i], d->isa_irq[i]); bmdma_init(&d->bus[i], &d->bmdma[i], d);