From patchwork Mon Feb 26 11:14:03 2024 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: 775852 Delivered-To: patch@linaro.org Received: by 2002:a5d:6103:0:b0:33d:da16:65b6 with SMTP id v3csp272054wrt; Mon, 26 Feb 2024 03:15:46 -0800 (PST) X-Forwarded-Encrypted: i=2; AJvYcCVFOcfxwB4Wd5MgOyJNpihMgj6Hl49HFibD6WN8D5mWwaqOnWqxKMS9v7wcpG/0SY71AQg37fBQ93PU462+UDHI X-Google-Smtp-Source: AGHT+IFVTuo8iJwdtTPOk1vilYDU7qtGLl7tO9TX4mshSBTL01hfSJ/PCs+7BxoEfpTIMv5kffkR X-Received: by 2002:a05:620a:164e:b0:787:6eb3:2e0b with SMTP id c14-20020a05620a164e00b007876eb32e0bmr8158653qko.24.1708946145892; Mon, 26 Feb 2024 03:15:45 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1708946145; cv=none; d=google.com; s=arc-20160816; b=M8c9IqeCxuSdZLebEd6JAR6q+YTmOVcD71a9twvhSYwII6uRZDbaPHW53qqFOw6q1B wKTQvNS/mlVYMHnw+2HsESiFOZk7fagqefHsNOPW1703ACW60c2WkLKM6KcVSl3U8Rgi 4n0OQVnpSVGYg6nAg4b5tyVwaIvVxjgJ30mfxjd+XEyIKDacIDEMvz/LbX7miXx8jmXz HgZzsEtSXmM89HnYvr43IH9QIKz65/OKObPHRWe31+VAU72GjcoFG1eCERtW5V9oqtTc nE2Ge4wqNBqDupS+ASwve0LrhZps2Ew29e1OwxIC52lG96GfmZl6WM5zARo23V7nUWzA RSGw== 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=+8DBH+8DhWLlCRMzjMefALJRNboH1BCtR+qCvzO7EXA=; fh=j4MxUKsQnom9H3Srwq13mMegTaYVxToeDvl/PNa+M5c=; b=g4S6ZVL0opQXcH8m7H2B23e+vxS8dgSWJSJz4w1O7K7FqNgGpcIfslvSi6jC9Enf0L DdZ6GLKjWrLL0mv0xlSHHZ+9gEiHDpd82lAcZNgszGVnMKTe5P5fO9yhEDc+PIDoOkmI hIFAyZPm2yLUSDaLXCW695VkJkRf29/cMjV3NPoznUScYQrkrIx0u8YsiI3Dl8TAR/3N OHhnVDTuP6uywNqqL7w/Npjpm6JNcMzup9IUqFP6lmkf5ImjkakX8Xlu8vbpyJWva9mx Q97IPdOVqLaE6PAy9VoGEpQtiAViYyBXy8i+2VvJbuRBCbF1W5lBI9aInrg/JvtGbrAx a78g==; dara=google.com ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=Z1TeUqV6; 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 p25-20020a05620a22b900b00785d13048a3si4640752qkh.765.2024.02.26.03.15.45 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Mon, 26 Feb 2024 03:15:45 -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=Z1TeUqV6; 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 1reYwc-0000nj-89; Mon, 26 Feb 2024 06:14:50 -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 1reYwa-0000lf-Nj for qemu-devel@nongnu.org; Mon, 26 Feb 2024 06:14:48 -0500 Received: from mail-wr1-x433.google.com ([2a00:1450:4864:20::433]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1reYwY-0008SM-40 for qemu-devel@nongnu.org; Mon, 26 Feb 2024 06:14:47 -0500 Received: by mail-wr1-x433.google.com with SMTP id ffacd0b85a97d-33d6f26ff33so2085705f8f.0 for ; Mon, 26 Feb 2024 03:14:45 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1708946084; x=1709550884; darn=nongnu.org; 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=+8DBH+8DhWLlCRMzjMefALJRNboH1BCtR+qCvzO7EXA=; b=Z1TeUqV6L/njzuUPaG2kzLhsMlJr0flB/NcQ0pVcH0tmLDd4RY5YhINtkjdjYiVV0L 8F9ptNQ3WYZLzDDvj1eJ7a7l7tGchJYQbZl6i05EUyjQGFICOCJEfY/+W6U5IuwnLl7p gtHGCnZjYoxp9efkDDaOIE7vZjnsy/bULwIyVUTSSw/bKU9za5PydFS6k35DVR2Ej2VI IqqtjmPwNuVi2P7P4zCvQebND3WCiyemPuD1qyjS6zl7sZ+13ncmRLjGVmA+4SMcg7nz /uFSyzSGnrQiIL/nWzhCUTMsf+j0RSXPDI1IrTT0ei2MH03mX5n46vON2R/049485Nd1 kBXg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1708946084; x=1709550884; 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=+8DBH+8DhWLlCRMzjMefALJRNboH1BCtR+qCvzO7EXA=; b=wD9LeAHFFbZ+j6EgB8qW/vf/imhK1RQ4+0Vf8CkZcWa7EH3myqHdeTZctV8Ljp1u0i A/Kr0ZqLspi0HmNyZNk067vUR1lmAkZIQv7jWVxuYTBV/SjJZDypCgEEfhOhPXmV8r1x cPwN5+dikKI7CMEGlPqzXr8vkvPi8wS+ppJCMD9sLumk9dSKkvoEzAaK/XKrdeNUkG7I Dq0PbBAVCYl4nDR4MnqQBTGLHMPMtI3t1ZbKZOKpUej7qTAcR6IeJdux1//p4YCTAkbz iAEBrxjQ+/orPMMfyv3BEkhlSYkGY/wXnsP7zvHoZEUEX4UwpuBwzrRWzqkY3dfcyhu7 mnCQ== X-Gm-Message-State: AOJu0Yw2uPLhqciuEK4UOQPYkBw1NHOkoeq3MH9NE58c9nJda6AIzpO3 G1Zu8h9+1q+kkYmLm51T0fOIp54pl1dFoyRazQoZfJu0Mn+Amuks2fG2D8Wg4CqgpzUEJTu/aoj W X-Received: by 2002:a5d:4a88:0:b0:33d:4fca:a47f with SMTP id o8-20020a5d4a88000000b0033d4fcaa47fmr5347798wrq.18.1708946084399; Mon, 26 Feb 2024 03:14:44 -0800 (PST) Received: from m1x-phil.lan ([176.176.164.69]) by smtp.gmail.com with ESMTPSA id h4-20020a5d4304000000b0033d6c928a95sm7952487wrq.63.2024.02.26.03.14.42 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Mon, 26 Feb 2024 03:14:43 -0800 (PST) From: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org, Bernhard Beschow Cc: Laurent Vivier , Thomas Huth , BALATON Zoltan , Ani Sinha , qemu-block@nongnu.org, Marcel Apfelbaum , Eduardo Habkost , John Snow , Paolo Bonzini , "Michael S. Tsirkin" , Igor Mammedov , Richard Henderson , Mark Cave-Ayland , =?utf-8?q?Philippe_Mathie?= =?utf-8?q?u-Daud=C3=A9?= Subject: [PATCH v2 04/15] hw/acpi/ich9_tco: Include 'ich9' in names Date: Mon, 26 Feb 2024 12:14:03 +0100 Message-ID: <20240226111416.39217-5-philmd@linaro.org> X-Mailer: git-send-email 2.41.0 In-Reply-To: <20240226111416.39217-1-philmd@linaro.org> References: <20240226111416.39217-1-philmd@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::433; envelope-from=philmd@linaro.org; helo=mail-wr1-x433.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, T_SCC_BODY_TEXT_LINE=-0.01 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 Make it explicit the following are ICH9 specific: acpi_pm_tco_init() -> ich9_acpi_pm_tco_init() vmstate_tco_io_sts -> vmstate_ich9_sm_tco. Signed-off-by: Philippe Mathieu-Daudé --- include/hw/acpi/ich9_tco.h | 5 ++--- hw/acpi/ich9.c | 4 ++-- hw/acpi/ich9_tco.c | 4 ++-- 3 files changed, 6 insertions(+), 7 deletions(-) diff --git a/include/hw/acpi/ich9_tco.h b/include/hw/acpi/ich9_tco.h index 2562a7cf39..1c99781a79 100644 --- a/include/hw/acpi/ich9_tco.h +++ b/include/hw/acpi/ich9_tco.h @@ -75,9 +75,8 @@ typedef struct TCOIORegs { MemoryRegion io; } TCOIORegs; -/* tco.c */ -void acpi_pm_tco_init(TCOIORegs *tr, MemoryRegion *parent); +void ich9_acpi_pm_tco_init(TCOIORegs *tr, MemoryRegion *parent); -extern const VMStateDescription vmstate_tco_io_sts; +extern const VMStateDescription vmstate_ich9_sm_tco; #endif /* HW_ACPI_TCO_H */ diff --git a/hw/acpi/ich9.c b/hw/acpi/ich9.c index 4c75d1b56b..daf93361eb 100644 --- a/hw/acpi/ich9.c +++ b/hw/acpi/ich9.c @@ -186,7 +186,7 @@ static const VMStateDescription vmstate_tco_io_state = { .minimum_version_id = 1, .needed = vmstate_test_use_tco, .fields = (const VMStateField[]) { - VMSTATE_STRUCT(tco_regs, ICH9LPCPMRegs, 1, vmstate_tco_io_sts, + VMSTATE_STRUCT(tco_regs, ICH9LPCPMRegs, 1, vmstate_ich9_sm_tco, TCOIORegs), VMSTATE_END_OF_LIST() } @@ -317,7 +317,7 @@ void ich9_pm_init(PCIDevice *lpc_pci, ICH9LPCPMRegs *pm, qemu_irq sci_irq) memory_region_add_subregion(&pm->io, ICH9_PMIO_SMI_EN, &pm->io_smi); if (pm->enable_tco) { - acpi_pm_tco_init(&pm->tco_regs, &pm->io); + ich9_acpi_pm_tco_init(&pm->tco_regs, &pm->io); } if (pm->acpi_pci_hotplug.use_acpi_hotplug_bridge) { diff --git a/hw/acpi/ich9_tco.c b/hw/acpi/ich9_tco.c index 81606219f7..dd4aff82e0 100644 --- a/hw/acpi/ich9_tco.c +++ b/hw/acpi/ich9_tco.c @@ -224,7 +224,7 @@ static const MemoryRegionOps tco_io_ops = { .endianness = DEVICE_LITTLE_ENDIAN, }; -void acpi_pm_tco_init(TCOIORegs *tr, MemoryRegion *parent) +void ich9_acpi_pm_tco_init(TCOIORegs *tr, MemoryRegion *parent) { *tr = (TCOIORegs) { .tco = { @@ -250,7 +250,7 @@ void acpi_pm_tco_init(TCOIORegs *tr, MemoryRegion *parent) memory_region_add_subregion(parent, ICH9_PMIO_TCO_RLD, &tr->io); } -const VMStateDescription vmstate_tco_io_sts = { +const VMStateDescription vmstate_ich9_sm_tco = { .name = "tco io device status", .version_id = 1, .minimum_version_id = 1,