From patchwork Wed Feb 15 11:27:04 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: 653693 Delivered-To: patch@linaro.org Received: by 2002:adf:f90f:0:0:0:0:0 with SMTP id b15csp280630wrr; Wed, 15 Feb 2023 03:28:27 -0800 (PST) X-Google-Smtp-Source: AK7set8mnm2qDtCHI9+RHP+kbR0rrGJf6+jB2D5n8oHEpl0E7gs+DusQ/xqE47x8RgdDk7WsZG31 X-Received: by 2002:a05:622a:43:b0:3b8:6a41:c329 with SMTP id y3-20020a05622a004300b003b86a41c329mr2961966qtw.21.1676460506890; Wed, 15 Feb 2023 03:28:26 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1676460506; cv=none; d=google.com; s=arc-20160816; b=AsJ7UDHKl35CTQRR0gbjBFH15Ynjxk4htF4zhv6b2t4GVxlAyDdmwNKFDKAhCfei04 4Q2b+uIFNd7dEX8FVuXNXo/MHWfytbJGXqaC7ttiFGfRuSOmloRebaJDVPKBczMcMinc sFARqsAAAbCKMiZBgpaew4s+VwpIR9K9rT74vKcf8DlZYl0tZdUaxZE6KCsuCTgXxXIL rzt9rKxEDzRbc55fBSpIte0z0A5L8rXyyV1ov9J3g7QXzJTYm5zDXslliJnkOohZTeN2 5JNzAgCSA0F2q1BDmbOGQbfkIoJ4Uyx8QDbnOvFdVOuM52Qzyc6nc17gKgRGAs8vsCCs Rm0g== 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=WGmJkWSNgy7/ynEvZkEIYLnmZh5KuFB9CpCEyEsgCaM=; b=jrrXxP8hVW0idQoYAqgv+8sGdwFOsjCUD4No0JbywbyS/FpCLBTR0SqO1uDYqySY52 T9L78/xqWIApU2OTxdtqZStkLGhXW2rc5wykFrbTJga69Lp+9nyJ0PX5MAQLrSPVNT1M KEsup3hQ+iQP9duqAB4c9uEFJ9YD2exIw4s5dPSNhad8FfK2gH1qKC9xaSI5RYMYdcxV 6fRgLOYJB/p6cYpJewrwFu0v4o4qOFqhFnrLTFKyhFecKnCoeFe9rr0jdnIQg+eTbRd7 6NUuP9AyXAVL1EoVvI/gV407NcEfBY+sJq1XIowNdVrEXJA88n1U+Yj5TEkdVNZcvC6b FL8g== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=nlqJ6eD8; 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 h22-20020ac85856000000b003b1ad716005si14434920qth.577.2023.02.15.03.28.26 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Wed, 15 Feb 2023 03:28:26 -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=nlqJ6eD8; 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 1pSFxU-00029t-55; Wed, 15 Feb 2023 06:28:20 -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 1pSFxR-0001wf-Sg for qemu-devel@nongnu.org; Wed, 15 Feb 2023 06:28:17 -0500 Received: from mail-wr1-x430.google.com ([2a00:1450:4864:20::430]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1pSFxP-0003dE-NH for qemu-devel@nongnu.org; Wed, 15 Feb 2023 06:28:17 -0500 Received: by mail-wr1-x430.google.com with SMTP id bu23so18773168wrb.8 for ; Wed, 15 Feb 2023 03:28:14 -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=WGmJkWSNgy7/ynEvZkEIYLnmZh5KuFB9CpCEyEsgCaM=; b=nlqJ6eD8XcO+VDA3jKu1s81AtbvIc5ISH3Z7rjbv2wwEgKcywowCD2eJuDrKy0A4HH r0+G6A5Wj97IbmjdjYmliFeJqFKXy2EJpYi7Sr2jqB0sot/ZQg4+Nck8AAdHhwa96ER2 NW0GhFIFOueFJ0ayNsHn3heGfgh0stKvDCZrqJAtTl252gQ99u7plhTGgU9m1b4H86Yk CxSZKKGR2ejCc97akZ/GuCU+5Hsla51HB7B7YDibiqiobCLj8wbrF8rFtBsPaUv2wGK6 H92ohY0RAt5+jisQL+UvQ7+TBRvSMyCWQ5G4qctMlUk1586TUzHMagkleuZHaL2yAISj HPbw== 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=WGmJkWSNgy7/ynEvZkEIYLnmZh5KuFB9CpCEyEsgCaM=; b=39jG0zYnqKt9QgBbT7l6c2MtUkoy6zgn/MjwPL3OXtBvSpyZQr3zfoHcc10MPVvzv5 KVmt5vHKn4IN173Dtn5wKADVBUBeR0Hc74tJdzfEaPLiN1qOeW3Z9xZfh6ASk9bI5Th7 RvdcsNNn2hg8Pv/PFhJfyXoavJh703D8FORYawbugWwDRRQgaU64RGgiok8hgurmkFOK RtN1tfQwMIy+8Q4naI3oMDONoAz67KAnhQx8cHZ20YfESFvEsDfv760Nyw/wo+eD17wj GKM1ReSbFsSBa3bO3ryi1UR9nA1BwAZb+BGSZ5H5+IoYRQW7gq0MtBDj1cAz0YPV9Aww F6XQ== X-Gm-Message-State: AO0yUKVlGIUeWg0JLeqhmyH/1VYgZgIZgtxD3yj/xlPbip2mQ4qh06V7 zDT5NWUEeFzsy+NyzQsKp1O0Ojcd73i2k5O1 X-Received: by 2002:adf:fa4d:0:b0:2c5:4ffa:ba62 with SMTP id y13-20020adffa4d000000b002c54ffaba62mr1229949wrr.17.1676460492987; Wed, 15 Feb 2023 03:28:12 -0800 (PST) Received: from localhost.localdomain ([81.0.6.76]) by smtp.gmail.com with ESMTPSA id t13-20020adfe44d000000b002c557f82e27sm8092531wrm.99.2023.02.15.03.28.12 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Wed, 15 Feb 2023 03:28:12 -0800 (PST) From: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: qemu-block@nongnu.org, Eduardo Habkost , John Snow , =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= , BALATON Zoltan , qemu-ppc@nongnu.org Subject: [PATCH 12/20] hw/ide: Rename ide_register_restart_cb -> ide_bus_register_restart_cb Date: Wed, 15 Feb 2023 12:27:04 +0100 Message-Id: <20230215112712.23110-13-philmd@linaro.org> X-Mailer: git-send-email 2.38.1 In-Reply-To: <20230215112712.23110-1-philmd@linaro.org> References: <20230215112712.23110-1-philmd@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::430; envelope-from=philmd@linaro.org; helo=mail-wr1-x430.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 ide_register_restart_cb() operates on a IDEBus; rename it as ide_bus_register_restart_cb() to emphasize its first argument is a IDEBus. Mechanical change using: $ sed -i -e 's/ide_register_restart_cb/ide_bus_register_restart_cb/g' \ $(git grep -l ide_register_restart_cb) Signed-off-by: Philippe Mathieu-Daudé Reviewed-by: Richard Henderson --- hw/ide/ahci.c | 2 +- hw/ide/cmd646.c | 2 +- hw/ide/core.c | 2 +- hw/ide/isa.c | 2 +- hw/ide/piix.c | 2 +- hw/ide/sii3112.c | 2 +- hw/ide/via.c | 2 +- include/hw/ide/internal.h | 2 +- 8 files changed, 8 insertions(+), 8 deletions(-) diff --git a/hw/ide/ahci.c b/hw/ide/ahci.c index 90fea5d059..430961d73b 100644 --- a/hw/ide/ahci.c +++ b/hw/ide/ahci.c @@ -1560,7 +1560,7 @@ void ahci_realize(AHCIState *s, DeviceState *qdev, AddressSpace *as, int ports) ad->port_no = i; ad->port.dma = &ad->dma; ad->port.dma->ops = &ahci_dma_ops; - ide_register_restart_cb(&ad->port); + ide_bus_register_restart_cb(&ad->port); } g_free(irqs); } diff --git a/hw/ide/cmd646.c b/hw/ide/cmd646.c index 94c576262c..2865bc25fc 100644 --- a/hw/ide/cmd646.c +++ b/hw/ide/cmd646.c @@ -298,7 +298,7 @@ static void pci_cmd646_ide_realize(PCIDevice *dev, Error **errp) bmdma_init(&d->bus[i], &d->bmdma[i], d); d->bmdma[i].bus = &d->bus[i]; - ide_register_restart_cb(&d->bus[i]); + ide_bus_register_restart_cb(&d->bus[i]); } } diff --git a/hw/ide/core.c b/hw/ide/core.c index 117e26cef1..5897411b95 100644 --- a/hw/ide/core.c +++ b/hw/ide/core.c @@ -2759,7 +2759,7 @@ static void ide_restart_cb(void *opaque, bool running, RunState state) } } -void ide_register_restart_cb(IDEBus *bus) +void ide_bus_register_restart_cb(IDEBus *bus) { if (bus->dma->ops->restart_dma) { bus->vmstate = qemu_add_vm_change_state_handler(ide_restart_cb, bus); diff --git a/hw/ide/isa.c b/hw/ide/isa.c index 74f7b43137..f8ed26b587 100644 --- a/hw/ide/isa.c +++ b/hw/ide/isa.c @@ -74,7 +74,7 @@ static void isa_ide_realizefn(DeviceState *dev, Error **errp) ide_init_ioport(&s->bus, isadev, s->iobase, s->iobase2); ide_init2(&s->bus, isa_get_irq(isadev, s->irqnum)); vmstate_register(VMSTATE_IF(dev), 0, &vmstate_ide_isa, s); - ide_register_restart_cb(&s->bus); + ide_bus_register_restart_cb(&s->bus); } ISADevice *isa_ide_init(ISABus *bus, int iobase, int iobase2, int irqnum, diff --git a/hw/ide/piix.c b/hw/ide/piix.c index 267dbf37db..daeb9b605d 100644 --- a/hw/ide/piix.c +++ b/hw/ide/piix.c @@ -149,7 +149,7 @@ static int pci_piix_init_ports(PCIIDEState *d) bmdma_init(&d->bus[i], &d->bmdma[i], d); d->bmdma[i].bus = &d->bus[i]; - ide_register_restart_cb(&d->bus[i]); + ide_bus_register_restart_cb(&d->bus[i]); } return 0; diff --git a/hw/ide/sii3112.c b/hw/ide/sii3112.c index 46204f10d7..c918370220 100644 --- a/hw/ide/sii3112.c +++ b/hw/ide/sii3112.c @@ -288,7 +288,7 @@ static void sii3112_pci_realize(PCIDevice *dev, Error **errp) bmdma_init(&s->bus[i], &s->bmdma[i], s); s->bmdma[i].bus = &s->bus[i]; - ide_register_restart_cb(&s->bus[i]); + ide_bus_register_restart_cb(&s->bus[i]); } } diff --git a/hw/ide/via.c b/hw/ide/via.c index e1a429405d..fd398226d4 100644 --- a/hw/ide/via.c +++ b/hw/ide/via.c @@ -195,7 +195,7 @@ static void via_ide_realize(PCIDevice *dev, Error **errp) bmdma_init(&d->bus[i], &d->bmdma[i], d); d->bmdma[i].bus = &d->bus[i]; - ide_register_restart_cb(&d->bus[i]); + ide_bus_register_restart_cb(&d->bus[i]); } } diff --git a/include/hw/ide/internal.h b/include/hw/ide/internal.h index ccfe064643..cc95cd47a0 100644 --- a/include/hw/ide/internal.h +++ b/include/hw/ide/internal.h @@ -620,7 +620,7 @@ void ide_init2(IDEBus *bus, qemu_irq irq); void ide_exit(IDEState *s); int ide_init_ioport(IDEBus *bus, ISADevice *isa, int iobase, int iobase2); void ide_bus_set_irq(IDEBus *bus); -void ide_register_restart_cb(IDEBus *bus); +void ide_bus_register_restart_cb(IDEBus *bus); void ide_exec_cmd(IDEBus *bus, uint32_t val);