From patchwork Mon Feb 20 09:13:38 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: 655055 Delivered-To: patch@linaro.org Received: by 2002:adf:9bcd:0:0:0:0:0 with SMTP id e13csp1293992wrc; Mon, 20 Feb 2023 01:22:31 -0800 (PST) X-Google-Smtp-Source: AK7set/ce/qOxppcjQg6Y3qeA2SJTl8B02xS4VtSSnBaAIIQ9cu0jJJP3ZGl9Rjg3xL5p04hWIuZ X-Received: by 2002:a05:622a:205:b0:3b8:6215:789b with SMTP id b5-20020a05622a020500b003b86215789bmr17185499qtx.35.1676884951265; Mon, 20 Feb 2023 01:22:31 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1676884951; cv=none; d=google.com; s=arc-20160816; b=ubIW+SSwKAMs1PMhytT2HlIPIH+myszpAEM4MfE02r5sUrvnhCEeqyGJdmusOYl9ep +AaC42L1cz9ycYDuAsjL0vsZMTtFg8o3Xoibm1hbNqkneD1oP9Dg89J7W2iPZ4MXl/Kc uFnqXajjA/dJbKD/hXYC5PvQSFWmTl/roq6/c8QSlJFU4kLNEgRXthRtvlU3Zkn/0xou WB6U1y9nhxcFbHItMm8rs5ayyHdFTJgOnZVEWrgfDsEMuEMI4ZGX4T6PRbW5V+z38RPS yj2vXsTw2wkGCr5q2VW6yOV7RT/+/+tteMnV1jUdN8AXbzPMu9tfDNXfCDxKFlTHxkEy Gl2w== 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=5jcQ5Jy5SaeE5p3W9B4GoLvdNk0rJLyHlurFAjM3Bhw=; b=Ty7JsusCfDc4k2y6RC32Z+oZpetNJOATMnhep5hnEgBu9ZqTKev4HaAvrQzfHVK099 9vN+EzpmgWVDv/46P/WgaHletH9lNHLdy9PqDxZlA7higg+1eOnFJzJXNfOzCMy9uCmZ 4PG9XoS2bNQ3WF/Z8WeUU9Xe4aG1AFQ7PWOiPjBAsppW/x7544Tf73B/0JVKt8NxlLMP 2PNNoMDoLSO/l/rP/ilu3DhySPM8dWzQQoAjMH+oh5KT5WdhPiTm1g/WFqSbiqNvM7Ik M60TktcPu1Wmjsb+wUxjGXUvXupa+bMka3njT0/VDMiZ4fH7hhuh+gRV60M2XnzFkINb O4lw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=Oi9fRADP; 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 e12-20020ac8010c000000b003bcd91aa37dsi8700417qtg.47.2023.02.20.01.22.31 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Mon, 20 Feb 2023 01:22:31 -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=Oi9fRADP; 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 1pU2Fe-0005iT-TX; Mon, 20 Feb 2023 04:14:26 -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 1pU2Fc-0005gA-E1 for qemu-devel@nongnu.org; Mon, 20 Feb 2023 04:14:24 -0500 Received: from mail-wm1-x330.google.com ([2a00:1450:4864:20::330]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1pU2FZ-0003jX-ID for qemu-devel@nongnu.org; Mon, 20 Feb 2023 04:14:24 -0500 Received: by mail-wm1-x330.google.com with SMTP id p26so401013wmc.4 for ; Mon, 20 Feb 2023 01:14:21 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; 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=5jcQ5Jy5SaeE5p3W9B4GoLvdNk0rJLyHlurFAjM3Bhw=; b=Oi9fRADPm4mQ8QrjNJxO44msZ0Sf8oIfHEOgcSvoLovJY7fbrdgwbniIRpeg0WNopY VpTGpueMEbNCTXm/EjH/pxTc5O944Nw6i2NKvh/wGYAa022smOtlET9sJcnhOyukGff8 ltAWS61M8D9QAcdanizxg7Msc2FRj86hJaDeVpjQKL0v8+ICH9NAsT9YO3MA6OsFoHCX RqXG8ITslUay9WNEc9tsWxMYQxmZc4buxdEOI0ozWKMwZky5ulHwNKO+2+2YtDXmrnMO 6gfMGO0OANcsXmELhHCMuxF2pgBlN/onmRGKpxf09TxmX466I/KcBo63XqaPjkrXVnXr 6Mzw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; 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=5jcQ5Jy5SaeE5p3W9B4GoLvdNk0rJLyHlurFAjM3Bhw=; b=j42toklmWM6BSHeiPaTv5BengbjLKbLZ0qSYiG6q4q5LoemvV17eAIprjYZjEMIuAO nm0+4PEuRDzxH+/0gobbBzCASC99kDDiBVCFOe1VEpYEXXNX2EoqsP8rMq0pPfwP66G8 YYd85XRZ12MKP5Fqt+wrcQ5SoMO/b374WL6ZNaQWe4655TMf9OGI0CDHxSFrfJNEDO6f 5oOOAr0uoxq9NsQ07FZA1birLbAzGQjA+9lPJZytkW9ld+VDXMrQq48N3kucy2z0qCu+ ftVVXbQQJNXmn24GZg4tf/bVq7LtyEy1XGca97lcia57Y7jvqfMXf4SM9OaUosw2uTdp a4VA== X-Gm-Message-State: AO0yUKWX/VOuyOaLege9QUJTpZthAj9lfq/6cn4+opZmT1xSKtXHHt6D ARf6r0OiHycSIFUcLxh3tJkj/26llb0zGmEI X-Received: by 2002:a05:600c:4487:b0:3e2:1ddf:7452 with SMTP id e7-20020a05600c448700b003e21ddf7452mr7877108wmo.5.1676884460618; Mon, 20 Feb 2023 01:14:20 -0800 (PST) Received: from localhost.localdomain ([81.0.6.76]) by smtp.gmail.com with ESMTPSA id iz7-20020a05600c554700b003e203681b26sm12951069wmb.29.2023.02.20.01.14.19 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Mon, 20 Feb 2023 01:14:20 -0800 (PST) From: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: qemu-ppc@nongnu.org, John Snow , qemu-block@nongnu.org, qemu-arm@nongnu.org, =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= , Richard Henderson , Bernhard Beschow Subject: [PATCH v2 04/24] hw/ide/isa: Rename isairq -> irqnum Date: Mon, 20 Feb 2023 10:13:38 +0100 Message-Id: <20230220091358.17038-5-philmd@linaro.org> X-Mailer: git-send-email 2.38.1 In-Reply-To: <20230220091358.17038-1-philmd@linaro.org> References: <20230220091358.17038-1-philmd@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::330; envelope-from=philmd@linaro.org; helo=mail-wm1-x330.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 Rename ISAIDEState::isairq as 'irqnum' to emphasize this is not a qemu_irq object but the number (index) of an ISA IRQ. Signed-off-by: Philippe Mathieu-Daudé Message-Id: <20230215112712.23110-5-philmd@linaro.org> Reviewed-by: Richard Henderson Reviewed-by: Bernhard Beschow --- hw/ide/isa.c | 10 +++++----- include/hw/ide.h | 2 +- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/hw/ide/isa.c b/hw/ide/isa.c index 8bedbd13f1..b434cbd0e9 100644 --- a/hw/ide/isa.c +++ b/hw/ide/isa.c @@ -46,7 +46,7 @@ struct ISAIDEState { IDEBus bus; uint32_t iobase; uint32_t iobase2; - uint32_t isairq; + uint32_t irqnum; qemu_irq irq; }; @@ -75,13 +75,13 @@ static void isa_ide_realizefn(DeviceState *dev, Error **errp) ide_bus_init(&s->bus, sizeof(s->bus), dev, 0, 2); ide_init_ioport(&s->bus, isadev, s->iobase, s->iobase2); - s->irq = isa_get_irq(isadev, s->isairq); + s->irq = isa_get_irq(isadev, s->irqnum); ide_init2(&s->bus, s->irq); vmstate_register(VMSTATE_IF(dev), 0, &vmstate_ide_isa, s); ide_register_restart_cb(&s->bus); } -ISADevice *isa_ide_init(ISABus *bus, int iobase, int iobase2, int isairq, +ISADevice *isa_ide_init(ISABus *bus, int iobase, int iobase2, int irqnum, DriveInfo *hd0, DriveInfo *hd1) { DeviceState *dev; @@ -92,7 +92,7 @@ ISADevice *isa_ide_init(ISABus *bus, int iobase, int iobase2, int isairq, dev = DEVICE(isadev); qdev_prop_set_uint32(dev, "iobase", iobase); qdev_prop_set_uint32(dev, "iobase2", iobase2); - qdev_prop_set_uint32(dev, "irq", isairq); + qdev_prop_set_uint32(dev, "irq", irqnum); isa_realize_and_unref(isadev, bus, &error_fatal); s = ISA_IDE(dev); @@ -108,7 +108,7 @@ ISADevice *isa_ide_init(ISABus *bus, int iobase, int iobase2, int isairq, static Property isa_ide_properties[] = { DEFINE_PROP_UINT32("iobase", ISAIDEState, iobase, 0x1f0), DEFINE_PROP_UINT32("iobase2", ISAIDEState, iobase2, 0x3f6), - DEFINE_PROP_UINT32("irq", ISAIDEState, isairq, 14), + DEFINE_PROP_UINT32("irq", ISAIDEState, irqnum, 14), DEFINE_PROP_END_OF_LIST(), }; diff --git a/include/hw/ide.h b/include/hw/ide.h index 5f8c36b2aa..09fe169ebb 100644 --- a/include/hw/ide.h +++ b/include/hw/ide.h @@ -5,7 +5,7 @@ #include "exec/memory.h" /* ide-isa.c */ -ISADevice *isa_ide_init(ISABus *bus, int iobase, int iobase2, int isairq, +ISADevice *isa_ide_init(ISABus *bus, int iobase, int iobase2, int irqnum, DriveInfo *hd0, DriveInfo *hd1); int ide_get_geometry(BusState *bus, int unit,