From nobody Tue Nov 26 22:28:17 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass(p=none dis=none) header.from=linaro.org ARC-Seal: i=1; a=rsa-sha256; t=1703885511; cv=none; d=zohomail.com; s=zohoarc; b=nBT2Tr3shX4OKoUEROAVD19M2sk41kqAkYj6g5FihhUQpStQDuJa2usk4wbFWrkPPyw3ko1IKosWBz1b6E1f85VFQRovfd0AM64ku6Iq2wIsGu5TfrjnoUVrrXJFt0G1nxf2+Oknt3fQXqH4Lx9HWK+X27mqGiu95MD8OUTI4hQ= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1703885511; h=Content-Type:Content-Transfer-Encoding:Cc:Cc:Date:Date:From:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:Subject:To:To:Message-Id:Reply-To; bh=l3kpg/BKaYly+4qds3DN/RI8tOaGgyQRhusJUu7sn+4=; b=hOr4taQCUhicT2jnqSibjXFOyNIXJ4iRgh0X6buOqGFt8VhPgAaxawqdcTxiZ71bxdFGiuIENOobyO/cuFuyochCS3xSj5v+SwKxh/F2cdzqo3BP3FkKYjfEiOafIb2QBSDpr5Bn5V3yJ5RzZVGA++NSVAmutfZzDnvMKupXFTE= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass header.from= (p=none dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1703885511278775.4098265066833; Fri, 29 Dec 2023 13:31:51 -0800 (PST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1rJKMa-0002AM-5A; Fri, 29 Dec 2023 16:25:53 -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 1rJKM6-0001Vf-N4 for qemu-devel@nongnu.org; Fri, 29 Dec 2023 16:25:22 -0500 Received: from mail-il1-x12e.google.com ([2607:f8b0:4864:20::12e]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1rJKM4-00080B-OZ for qemu-devel@nongnu.org; Fri, 29 Dec 2023 16:25:22 -0500 Received: by mail-il1-x12e.google.com with SMTP id e9e14a558f8ab-35feb61c91fso23482865ab.3 for ; Fri, 29 Dec 2023 13:25:20 -0800 (PST) Received: from stoup.lan (203-217-28-32.perm.iinet.net.au. [203.217.28.32]) by smtp.gmail.com with ESMTPSA id a34-20020a631a22000000b005c65e82a0cbsm15016237pga.17.2023.12.29.13.25.17 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 29 Dec 2023 13:25:19 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1703885119; x=1704489919; 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=l3kpg/BKaYly+4qds3DN/RI8tOaGgyQRhusJUu7sn+4=; b=oW00ye9vap3W8I3Bu5JO6M3fyEx6XRcZQY5RWXxYlAHbNBCox4B7vG/s4UFARdBm9m fqCe0X8m8ZnQ+G2qmMZo4yxAbYRqDSXjWPY2C/3m1LqymWi/FidBdCvAzZoC1LHoOj4k ZHF2nlMfgIROwNGpPWY8eO4Z2aAyALwCIekVOykl91vYMTLyAwGXiGsKukooYrtaN6K1 TYEamriJ+9q/pEwNrnKMgCiCxAG4tJ1+c5mhGqGs95+7litN/mQ/jA0/N74THTbAIPdo drN4aHuNkrqDHcxMB3yzbv6FBixvfvZgHgM/M8tGT7SDGCUY7lfnlwSORzLTIj0RmS/f gdxw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1703885119; x=1704489919; 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=l3kpg/BKaYly+4qds3DN/RI8tOaGgyQRhusJUu7sn+4=; b=lF2oxiX/i7UR/vnY9DkhKBtbuylbyhxDwmQRWiOojDQ1xDbmSZy003dNoApnek0CYj lLPPpawg0Zgb8qnT22J1DJznRBxw8C2drUjALzD13nOoikNEwJI5SHKuHg3mwhNessUc ozO8ybkYwVRATeyLx+PJsVknWwqEB5qkvhj4Ctgy9LGOkQzZPk0tmGFQnn2hDTx+EhQM Ko0BXtMmiNFzRAiQWCYLRPp4SujDyCMwoBAtohntaRN/6vGE/sneDAANiVpeKIz3zLPR nkZyFlXyYB9DDYQYmXK4UejOYQ2hLoXStAxRaI4lag8wCdLU+79FbDQ9pJGBV+zqpkXy LcXw== X-Gm-Message-State: AOJu0Yz/6+EBkXiLshx3d1fTSgjNf2ajBZFz607ulh0lmza0hYYrYZqf 6Z4EUVv5WryerfK70K/DiK3x523Kwbaog7x7KUW1zJCQ6vqedA== X-Google-Smtp-Source: AGHT+IHyOP93dbYY5X752SiPoYSFGPryaQzdI2VTeE1FWbzi79bhIIg83P+wuCVcK0Pey/SZfL5hFg== X-Received: by 2002:a05:6e02:214e:b0:35f:da92:11e1 with SMTP id d14-20020a056e02214e00b0035fda9211e1mr10842543ilv.46.1703885119567; Fri, 29 Dec 2023 13:25:19 -0800 (PST) From: Richard Henderson To: qemu-devel@nongnu.org Cc: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= Subject: [PULL 37/71] hw/isa: Constify VMState Date: Sat, 30 Dec 2023 08:23:12 +1100 Message-Id: <20231229212346.147149-38-richard.henderson@linaro.org> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20231229212346.147149-1-richard.henderson@linaro.org> References: <20231229212346.147149-1-richard.henderson@linaro.org> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=2607:f8b0:4864:20::12e; envelope-from=richard.henderson@linaro.org; helo=mail-il1-x12e.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=ham 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+importer=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @linaro.org) X-ZM-MESSAGEID: 1703885512966100009 Reviewed-by: Philippe Mathieu-Daud=C3=A9 Signed-off-by: Richard Henderson Message-Id: <20231221031652.119827-38-richard.henderson@linaro.org> --- hw/isa/apm.c | 2 +- hw/isa/i82378.c | 2 +- hw/isa/lpc_ich9.c | 8 ++++---- hw/isa/pc87312.c | 2 +- hw/isa/piix.c | 8 ++++---- hw/isa/vt82c686.c | 4 ++-- 6 files changed, 13 insertions(+), 13 deletions(-) diff --git a/hw/isa/apm.c b/hw/isa/apm.c index dfe9020d30..e34edb864c 100644 --- a/hw/isa/apm.c +++ b/hw/isa/apm.c @@ -68,7 +68,7 @@ const VMStateDescription vmstate_apm =3D { .name =3D "APM State", .version_id =3D 1, .minimum_version_id =3D 1, - .fields =3D (VMStateField[]) { + .fields =3D (const VMStateField[]) { VMSTATE_UINT8(apmc, APMState), VMSTATE_UINT8(apms, APMState), VMSTATE_END_OF_LIST() diff --git a/hw/isa/i82378.c b/hw/isa/i82378.c index 203b92c264..cbaa152a89 100644 --- a/hw/isa/i82378.c +++ b/hw/isa/i82378.c @@ -40,7 +40,7 @@ static const VMStateDescription vmstate_i82378 =3D { .name =3D "pci-i82378", .version_id =3D 0, .minimum_version_id =3D 0, - .fields =3D (VMStateField[]) { + .fields =3D (const VMStateField[]) { VMSTATE_PCI_DEVICE(parent_obj, I82378State), VMSTATE_END_OF_LIST() }, diff --git a/hw/isa/lpc_ich9.c b/hw/isa/lpc_ich9.c index 23eba64f22..3924eec483 100644 --- a/hw/isa/lpc_ich9.c +++ b/hw/isa/lpc_ich9.c @@ -768,7 +768,7 @@ static const VMStateDescription vmstate_ich9_rst_cnt = =3D { .version_id =3D 1, .minimum_version_id =3D 1, .needed =3D ich9_rst_cnt_needed, - .fields =3D (VMStateField[]) { + .fields =3D (const VMStateField[]) { VMSTATE_UINT8(rst_cnt, ICH9LPCState), VMSTATE_END_OF_LIST() } @@ -788,7 +788,7 @@ static const VMStateDescription vmstate_ich9_smi_feat = =3D { .version_id =3D 1, .minimum_version_id =3D 1, .needed =3D ich9_smi_feat_needed, - .fields =3D (VMStateField[]) { + .fields =3D (const VMStateField[]) { VMSTATE_UINT8_ARRAY(smi_guest_features_le, ICH9LPCState, sizeof(uint64_t)), VMSTATE_UINT8(smi_features_ok, ICH9LPCState), @@ -802,7 +802,7 @@ static const VMStateDescription vmstate_ich9_lpc =3D { .version_id =3D 1, .minimum_version_id =3D 1, .post_load =3D ich9_lpc_post_load, - .fields =3D (VMStateField[]) { + .fields =3D (const VMStateField[]) { VMSTATE_PCI_DEVICE(d, ICH9LPCState), VMSTATE_STRUCT(apm, ICH9LPCState, 0, vmstate_apm, APMState), VMSTATE_STRUCT(pm, ICH9LPCState, 0, vmstate_ich9_pm, ICH9LPCPMRegs= ), @@ -810,7 +810,7 @@ static const VMStateDescription vmstate_ich9_lpc =3D { VMSTATE_UINT32(sci_level, ICH9LPCState), VMSTATE_END_OF_LIST() }, - .subsections =3D (const VMStateDescription*[]) { + .subsections =3D (const VMStateDescription * const []) { &vmstate_ich9_rst_cnt, &vmstate_ich9_smi_feat, NULL diff --git a/hw/isa/pc87312.c b/hw/isa/pc87312.c index 8d7b8d3db2..ee23f3e164 100644 --- a/hw/isa/pc87312.c +++ b/hw/isa/pc87312.c @@ -319,7 +319,7 @@ static const VMStateDescription vmstate_pc87312 =3D { .version_id =3D 1, .minimum_version_id =3D 1, .post_load =3D pc87312_post_load, - .fields =3D (VMStateField[]) { + .fields =3D (const VMStateField[]) { VMSTATE_UINT8(read_id_step, PC87312State), VMSTATE_UINT8(selected_index, PC87312State), VMSTATE_UINT8_ARRAY(regs, PC87312State, 3), diff --git a/hw/isa/piix.c b/hw/isa/piix.c index 04ebed5b52..344bf32e54 100644 --- a/hw/isa/piix.c +++ b/hw/isa/piix.c @@ -230,7 +230,7 @@ static const VMStateDescription vmstate_piix3_rcr =3D { .version_id =3D 1, .minimum_version_id =3D 1, .needed =3D piix3_rcr_needed, - .fields =3D (VMStateField[]) { + .fields =3D (const VMStateField[]) { VMSTATE_UINT8(rcr, PIIXState), VMSTATE_END_OF_LIST() } @@ -242,13 +242,13 @@ static const VMStateDescription vmstate_piix3 =3D { .minimum_version_id =3D 2, .post_load =3D piix_post_load, .pre_save =3D piix3_pre_save, - .fields =3D (VMStateField[]) { + .fields =3D (const VMStateField[]) { VMSTATE_PCI_DEVICE(dev, PIIXState), VMSTATE_INT32_ARRAY_V(pci_irq_levels_vmstate, PIIXState, PIIX_NUM_PIRQS, 3), VMSTATE_END_OF_LIST() }, - .subsections =3D (const VMStateDescription*[]) { + .subsections =3D (const VMStateDescription * const []) { &vmstate_piix3_rcr, NULL } @@ -259,7 +259,7 @@ static const VMStateDescription vmstate_piix4 =3D { .version_id =3D 3, .minimum_version_id =3D 2, .post_load =3D piix4_post_load, - .fields =3D (VMStateField[]) { + .fields =3D (const VMStateField[]) { VMSTATE_PCI_DEVICE(dev, PIIXState), VMSTATE_UINT8_V(rcr, PIIXState, 3), VMSTATE_END_OF_LIST() diff --git a/hw/isa/vt82c686.c b/hw/isa/vt82c686.c index 9c2333a277..d3e0f6d01f 100644 --- a/hw/isa/vt82c686.c +++ b/hw/isa/vt82c686.c @@ -82,7 +82,7 @@ static const VMStateDescription vmstate_acpi =3D { .version_id =3D 1, .minimum_version_id =3D 1, .post_load =3D vmstate_acpi_post_load, - .fields =3D (VMStateField[]) { + .fields =3D (const VMStateField[]) { VMSTATE_PCI_DEVICE(dev, ViaPMState), VMSTATE_UINT16(ar.pm1.evt.sts, ViaPMState), VMSTATE_UINT16(ar.pm1.evt.en, ViaPMState), @@ -563,7 +563,7 @@ static const VMStateDescription vmstate_via =3D { .name =3D "via-isa", .version_id =3D 1, .minimum_version_id =3D 1, - .fields =3D (VMStateField[]) { + .fields =3D (const VMStateField[]) { VMSTATE_PCI_DEVICE(dev, ViaISAState), VMSTATE_END_OF_LIST() } --=20 2.34.1