From nobody Tue Nov 26 22:22:36 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=1703885542; cv=none; d=zohomail.com; s=zohoarc; b=bxBQdkxzRvLGpru39+xGg2OtexENzrw4hTT88OjOcf4UMkYgzG4Rjo8vzKbQYVCTOnH8ix9vxOv+e9M83y0tS+InCz855dX+UfST6ue8H4HncXIRptH8+imfBYIxeoejEtWBNAvPZLAyBASwNutOc+KLf/QblB9HY7g3EujilZg= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1703885542; h=Content-Transfer-Encoding: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:Cc; bh=CUHhbLfoN2d7ET2o9i2N09+Q0gqs/g1wftGgAlf1CKE=; b=f0gUsQx3k8r2UAwdAIV+uJ3nO7+Rw4kIs6oDM1DhmXkToDGgURzH3vPQaIZxToPgE9ZOIhuq2V8xuvpPEaCejK8ZDMgFoGNxg80r3Jdx70QYHzVYZwMRusUnlj7vJASvy7VNnC5/CzLpZVNu6nFnLyfh2jGpzS+S2hXJRqv2Gyc= 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 1703885542859519.9532141935368; Fri, 29 Dec 2023 13:32:22 -0800 (PST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1rJKPa-0006BS-GO; Fri, 29 Dec 2023 16:28:58 -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 1rJKPQ-0005Gu-3m for qemu-devel@nongnu.org; Fri, 29 Dec 2023 16:28:49 -0500 Received: from mail-pf1-x429.google.com ([2607:f8b0:4864:20::429]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1rJKPH-0000KI-Jd for qemu-devel@nongnu.org; Fri, 29 Dec 2023 16:28:41 -0500 Received: by mail-pf1-x429.google.com with SMTP id d2e1a72fcca58-6d9a79a1ad4so1725270b3a.2 for ; Fri, 29 Dec 2023 13:28:39 -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 bd33-20020a056a0027a100b006d9a96b7d0dsm11285396pfb.208.2023.12.29.13.28.36 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 29 Dec 2023 13:28:37 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1703885318; x=1704490118; darn=nongnu.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:from:to:cc:subject:date:message-id :reply-to; bh=CUHhbLfoN2d7ET2o9i2N09+Q0gqs/g1wftGgAlf1CKE=; b=bljjymqYnNO8iK9/Iq7ctY2yVNoBVBlVjKcTS7/3BTpYLZKhZqvXinfe4tMCb6TKIj 5PrEjeNQSohtxoMtiGDPze0UaGi2tcBpm7TY/CzL6cY5iYAvcEYsBKf8VFvw0QxQjK2Q hmovYkYylKwB1VmDu+RtIr5pm4jTjgFPCJ0wQ//F+78ApUagvJslycxLilYAElzbzJcv KvaTOg22cw4Gq695AUTQvU9KY+JxYohCU5krQcwBGqwtCjzbmHeoHq/uu6EtCiBZliMF pVjoQmnYY7oxTyX9MsrmDDUiI5X0N8jUFKR5IqgQgcHlwtGIoso262Mi7knlJ4IqwF4L oYkg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1703885318; x=1704490118; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=CUHhbLfoN2d7ET2o9i2N09+Q0gqs/g1wftGgAlf1CKE=; b=Zz4txlDWA6Epab1AIuZnOHcbyOZIPk+CQZLCLAE7um7yd4ASr2Ea8qbI+hzGmt5hKo AKZWWigIDZpxGtrqdBAkmm+Eq8MAhsuxat3dkh0wLlj0IaxaNkP1XYlk6ahQjQxwqkQn p2W7UssS6paZsXgjUhEMHX9jAe0rzm6lqT7FGpoBmZWxGANKG6GplhIhHKpz6FRFN2Bz xBNaOeAJnpanTAvQvD8wjgbEEqNwKK1+YAJ5Fwnggi9P1QxGZqfX9VuD4ZUyv451czpC FCU2ZgBB7QkV5opLejji3rLHmfnZkjzTMmiduHRtAdBDMGdB977Jm/qi30ME5zBS8ZS/ VATA== X-Gm-Message-State: AOJu0YzYhEwl6LnPiB/tx1FU7hJo6p2PFz8qZ/rasEwD+hi+ZtbOdFMT YCD71znD8AA+swUO+r5tyz4z+qAwRlRHpu2GQEpBSckowmUyKQ== X-Google-Smtp-Source: AGHT+IEZvAm10DGFs5QLVYTZyFe+o23JsuOFvHRJz6pPh4XeFbEs5c61q0OZ+mplkfZDA0n2pPjUlQ== X-Received: by 2002:a05:6a00:1404:b0:6d9:a9e9:28dd with SMTP id l4-20020a056a00140400b006d9a9e928ddmr5111526pfu.51.1703885318331; Fri, 29 Dec 2023 13:28:38 -0800 (PST) From: Richard Henderson To: qemu-devel@nongnu.org Subject: [PULL 44/71] hw/pci: Constify VMState Date: Sat, 30 Dec 2023 08:23:19 +1100 Message-Id: <20231229212346.147149-45-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-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::429; envelope-from=richard.henderson@linaro.org; helo=mail-pf1-x429.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: 1703885545032100003 Content-Type: text/plain; charset="utf-8" Signed-off-by: Richard Henderson Message-Id: <20231221031652.119827-45-richard.henderson@linaro.org> --- include/hw/pci/shpc.h | 2 +- hw/pci/msix.c | 4 ++-- hw/pci/pci.c | 8 ++++---- hw/pci/pci_host.c | 2 +- hw/pci/pcie_aer.c | 4 ++-- hw/pci/shpc.c | 2 +- 6 files changed, 11 insertions(+), 11 deletions(-) diff --git a/include/hw/pci/shpc.h b/include/hw/pci/shpc.h index 89c7a3b7fa..a0789df153 100644 --- a/include/hw/pci/shpc.h +++ b/include/hw/pci/shpc.h @@ -52,7 +52,7 @@ void shpc_device_unplug_cb(HotplugHandler *hotplug_dev, D= eviceState *dev, void shpc_device_unplug_request_cb(HotplugHandler *hotplug_dev, DeviceState *dev, Error **errp); =20 -extern VMStateInfo shpc_vmstate_info; +extern const VMStateInfo shpc_vmstate_info; #define SHPC_VMSTATE(_field, _type, _test) \ VMSTATE_BUFFER_UNSAFE_INFO_TEST(_field, _type, _test, 0, \ shpc_vmstate_info, 0) diff --git a/hw/pci/msix.c b/hw/pci/msix.c index cd817f4ca8..487e49834e 100644 --- a/hw/pci/msix.c +++ b/hw/pci/msix.c @@ -685,7 +685,7 @@ static int get_msix_state(QEMUFile *f, void *pv, size_t= size, return 0; } =20 -static VMStateInfo vmstate_info_msix =3D { +static const VMStateInfo vmstate_info_msix =3D { .name =3D "msix state", .get =3D get_msix_state, .put =3D put_msix_state, @@ -693,7 +693,7 @@ static VMStateInfo vmstate_info_msix =3D { =20 const VMStateDescription vmstate_msix =3D { .name =3D "msix", - .fields =3D (VMStateField[]) { + .fields =3D (const VMStateField[]) { { .name =3D "msix", .version_id =3D 0, diff --git a/hw/pci/pci.c b/hw/pci/pci.c index c49417abb2..76080af580 100644 --- a/hw/pci/pci.c +++ b/hw/pci/pci.c @@ -92,7 +92,7 @@ static const VMStateDescription vmstate_pcibus =3D { .name =3D "PCIBUS", .version_id =3D 1, .minimum_version_id =3D 1, - .fields =3D (VMStateField[]) { + .fields =3D (const VMStateField[]) { VMSTATE_INT32_EQUAL(nirq, PCIBus, NULL), VMSTATE_VARRAY_INT32(irq_count, PCIBus, nirq, 0, vmstate_info_int32, @@ -673,7 +673,7 @@ static int put_pci_config_device(QEMUFile *f, void *pv,= size_t size, return 0; } =20 -static VMStateInfo vmstate_info_pci_config =3D { +static const VMStateInfo vmstate_info_pci_config =3D { .name =3D "pci config", .get =3D get_pci_config_device, .put =3D put_pci_config_device, @@ -714,7 +714,7 @@ static int put_pci_irq_state(QEMUFile *f, void *pv, siz= e_t size, return 0; } =20 -static VMStateInfo vmstate_info_pci_irq_state =3D { +static const VMStateInfo vmstate_info_pci_irq_state =3D { .name =3D "pci irq state", .get =3D get_pci_irq_state, .put =3D put_pci_irq_state, @@ -734,7 +734,7 @@ const VMStateDescription vmstate_pci_device =3D { .name =3D "PCIDevice", .version_id =3D 2, .minimum_version_id =3D 1, - .fields =3D (VMStateField[]) { + .fields =3D (const VMStateField[]) { VMSTATE_INT32_POSITIVE_LE(version_id, PCIDevice), VMSTATE_BUFFER_UNSAFE_INFO_TEST(config, PCIDevice, migrate_is_not_pcie, diff --git a/hw/pci/pci_host.c b/hw/pci/pci_host.c index a18aa0a8d4..dfe6fe6184 100644 --- a/hw/pci/pci_host.c +++ b/hw/pci/pci_host.c @@ -234,7 +234,7 @@ const VMStateDescription vmstate_pcihost =3D { .needed =3D pci_host_needed, .version_id =3D 1, .minimum_version_id =3D 1, - .fields =3D (VMStateField[]) { + .fields =3D (const VMStateField[]) { VMSTATE_UINT32(config_reg, PCIHostState), VMSTATE_END_OF_LIST() } diff --git a/hw/pci/pcie_aer.c b/hw/pci/pcie_aer.c index b68c7ecb49..2c85a78fcd 100644 --- a/hw/pci/pcie_aer.c +++ b/hw/pci/pcie_aer.c @@ -797,7 +797,7 @@ static const VMStateDescription vmstate_pcie_aer_err = =3D { .name =3D "PCIE_AER_ERROR", .version_id =3D 1, .minimum_version_id =3D 1, - .fields =3D (VMStateField[]) { + .fields =3D (const VMStateField[]) { VMSTATE_UINT32(status, PCIEAERErr), VMSTATE_UINT16(source_id, PCIEAERErr), VMSTATE_UINT16(flags, PCIEAERErr), @@ -818,7 +818,7 @@ const VMStateDescription vmstate_pcie_aer_log =3D { .name =3D "PCIE_AER_ERROR_LOG", .version_id =3D 1, .minimum_version_id =3D 1, - .fields =3D (VMStateField[]) { + .fields =3D (const VMStateField[]) { VMSTATE_UINT16(log_num, PCIEAERLog), VMSTATE_UINT16_EQUAL(log_max, PCIEAERLog, NULL), VMSTATE_VALIDATE("log_num <=3D log_max", pcie_aer_state_log_num_va= lid), diff --git a/hw/pci/shpc.c b/hw/pci/shpc.c index df7f370111..d2a5eea69e 100644 --- a/hw/pci/shpc.c +++ b/hw/pci/shpc.c @@ -736,7 +736,7 @@ static int shpc_load(QEMUFile *f, void *pv, size_t size, return 0; } =20 -VMStateInfo shpc_vmstate_info =3D { +const VMStateInfo shpc_vmstate_info =3D { .name =3D "shpc", .get =3D shpc_load, .put =3D shpc_save, --=20 2.34.1