From patchwork Fri Dec 29 21:23:20 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Richard Henderson X-Patchwork-Id: 758822 Delivered-To: patch@linaro.org Received: by 2002:a5d:67c6:0:b0:336:6142:bf13 with SMTP id n6csp4671850wrw; Fri, 29 Dec 2023 13:29:43 -0800 (PST) X-Google-Smtp-Source: AGHT+IFqgnQqrHjO3/Se6Zw/ZYQUsSerQ3wPfaziJWM2IzoSbL4wisq1RIm7K3StIDRTKxyjZIen X-Received: by 2002:a05:620a:2233:b0:781:62ce:b0fc with SMTP id n19-20020a05620a223300b0078162ceb0fcmr4080464qkh.27.1703885383138; Fri, 29 Dec 2023 13:29:43 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1703885383; cv=none; d=google.com; s=arc-20160816; b=nZ5KBa7VyU2T64azaH7gH+Wht6i5ZgmDYcyZ0u2dtCF2Fn62FbTcGMOIigbO8l4QCe KUC+QYYuuohwefUanXZ1yMfGquv13gtqYuiCCo7prNrgijNELiRfSBrAmD8eMEeH7fJK iUcCEo+C7J6/fHTRrpQ5SWjts+d/ycfS69G19p1g3XYD1tx9UJg6XqhA72Nkw/7x/FSf JXpEOjjCDB4jUSpJ5LGw2w7pEmepuoGOBO8z8bYk5JnaU8D2okDPxMHPThYGeQ5aQsM6 fHV4f4euL7kNsoTB8WHIyfLj3DK7AzDQD2SJ87WaisSg8ucppvUR3VOjOvZmZeE45nac LiHA== 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:to:from :dkim-signature; bh=sb0kvKmYxUvHaaVG2ec6NYva65clnrsq/dPDXpOeYAM=; fh=PnYt+qEB9tAfMKoqBm2xjKOFpYyFFGPudh5cVIoieJM=; b=Xd3n9O+PJwwfnuL9FxeqHXopfDnmeFyrZ+et3IswYbvVU8s16TXtjSzVF34nzeXJLw avCz69KX1B9fL0ediSIwkcwoYvsMjxm9hmS0CrNXH+mbPmw7PguV45jVuhMZ0JpDn7Vt abZKGTuDi5aDMVvRqwOuXGjUNC3tbI9YIcjap/eOn84QBfniHT8bo1XS51iXWZ+5noRW FvtThNo4X+crhILeVMrBadHW7hOteEkWCZaIIe0y0SZC6Yn3ETcIBGlJC3L/+T70jafy uVKwP45PAlmVd3QEV7BBfdJtCu6WshQXp7YL2H5MRTpj7WGw9FG88vtjxpVjmJOqPpxB vSKA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=WbC4PJQA; 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 x12-20020a05620a258c00b00781723f0a42si4847038qko.137.2023.12.29.13.29.42 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Fri, 29 Dec 2023 13:29:43 -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=WbC4PJQA; 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 1rJKPX-0005jb-JA; Fri, 29 Dec 2023 16:28:55 -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 1rJKPR-0005My-GA for qemu-devel@nongnu.org; Fri, 29 Dec 2023 16:28:49 -0500 Received: from mail-oa1-x29.google.com ([2001:4860:4864:20::29]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1rJKPP-0000Ka-PM for qemu-devel@nongnu.org; Fri, 29 Dec 2023 16:28:49 -0500 Received: by mail-oa1-x29.google.com with SMTP id 586e51a60fabf-203fe0e3fefso3880165fac.2 for ; Fri, 29 Dec 2023 13:28:41 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1703885320; x=1704490120; 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=sb0kvKmYxUvHaaVG2ec6NYva65clnrsq/dPDXpOeYAM=; b=WbC4PJQAaiu1zifnjdFMeSOVrJxv4eNzUO3iccmeRuElgM2I+PaAROCJoM+LhtMOYI mCNYklWshXnrr8tOfXRu0X+CtV4werPmoO+mQsm3CmpBAd8jyYtVbdnjxjvnLFkqabYI iT/3s6VXl6M+DfIiBdrsEdvngDTnvkhRxsgKFncWNath1fEGVNmBSEos5jJ3LGRKaH3v pjeOrEPB/Wu4QNC8nvyy0MK3aOSpOXGwAbqKYD8IAyxWgYcJvQvy1wlVSW2UUzcpx9El qacGLlAA2xQ4IU8mklrnPDdxyWSJd2f8TRivJYkYpx8O3KPxosU4LMEw3J6yFrLAQiN6 DEYw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1703885320; x=1704490120; 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=sb0kvKmYxUvHaaVG2ec6NYva65clnrsq/dPDXpOeYAM=; b=e5huscZVNrXZONgYfQjWdWorOrctFjnymFtD5ItXlhT4YRIanlP25YpGjzuDGjinoA VJddSHVN0bWBjxbB07AIU4EFJzYXellUeR1yamwP+BcGrZfL2Z++LD3ekHhzQmeHSWD+ lDGMOZz4PBNka4CFFUF6y9G65+647ohqf9vC1BPivmni9lKj9Asm+hgQ2fDtCkFBLSqw ed2FsILL7y4EC+TeKq5dbOvRsfqafjTel6WqAjWnpuIJdosumtJlTgE10OAhU7M09VnT TyjB3T0I1RTOOGTpvCQjG58LKxbBri/lbILeD3RD6IeVIJ94ZJthQ3PgFTglTjuuGsyO kLzQ== X-Gm-Message-State: AOJu0YzJI1ehQZ8Gvr3NwD3+7q+oaHAE8CwIFYkIOERzV/xeuAEV7vzw A7eraZTqyOvqF/i/8HTzTaUF6ue2/jWmoMlm0RgEmbMPf4oemQ== X-Received: by 2002:a05:6870:c1cb:b0:203:4504:542d with SMTP id i11-20020a056870c1cb00b002034504542dmr10400384oad.58.1703885320602; Fri, 29 Dec 2023 13:28:40 -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.38 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 29 Dec 2023 13:28:40 -0800 (PST) From: Richard Henderson To: qemu-devel@nongnu.org Subject: [PULL 45/71] hw/pci-bridge: Constify VMState Date: Sat, 30 Dec 2023 08:23:20 +1100 Message-Id: <20231229212346.147149-46-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 Received-SPF: pass client-ip=2001:4860:4864:20::29; envelope-from=richard.henderson@linaro.org; helo=mail-oa1-x29.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+patch=linaro.org@nongnu.org Sender: qemu-devel-bounces+patch=linaro.org@nongnu.org Signed-off-by: Richard Henderson Message-Id: <20231221031652.119827-46-richard.henderson@linaro.org> --- hw/pci-bridge/gen_pcie_root_port.c | 2 +- hw/pci-bridge/i82801b11.c | 2 +- hw/pci-bridge/ioh3420.c | 2 +- hw/pci-bridge/pci_bridge_dev.c | 2 +- hw/pci-bridge/pcie_pci_bridge.c | 2 +- hw/pci-bridge/xio3130_downstream.c | 2 +- hw/pci-bridge/xio3130_upstream.c | 2 +- 7 files changed, 7 insertions(+), 7 deletions(-) diff --git a/hw/pci-bridge/gen_pcie_root_port.c b/hw/pci-bridge/gen_pcie_root_port.c index 1ce4e7beba..784507c826 100644 --- a/hw/pci-bridge/gen_pcie_root_port.c +++ b/hw/pci-bridge/gen_pcie_root_port.c @@ -117,7 +117,7 @@ static const VMStateDescription vmstate_rp_dev = { .version_id = 1, .minimum_version_id = 1, .post_load = pcie_cap_slot_post_load, - .fields = (VMStateField[]) { + .fields = (const VMStateField[]) { VMSTATE_PCI_DEVICE(parent_obj.parent_obj.parent_obj, PCIESlot), VMSTATE_STRUCT(parent_obj.parent_obj.parent_obj.exp.aer_log, PCIESlot, 0, vmstate_pcie_aer_log, PCIEAERLog), diff --git a/hw/pci-bridge/i82801b11.c b/hw/pci-bridge/i82801b11.c index 0e83cd11b2..c140919cbc 100644 --- a/hw/pci-bridge/i82801b11.c +++ b/hw/pci-bridge/i82801b11.c @@ -81,7 +81,7 @@ err_bridge: static const VMStateDescription i82801b11_bridge_dev_vmstate = { .name = "i82801b11_bridge", .priority = MIG_PRI_PCI_BUS, - .fields = (VMStateField[]) { + .fields = (const VMStateField[]) { VMSTATE_PCI_DEVICE(parent_obj, PCIBridge), VMSTATE_END_OF_LIST() } diff --git a/hw/pci-bridge/ioh3420.c b/hw/pci-bridge/ioh3420.c index f1e16135a3..be752a4bda 100644 --- a/hw/pci-bridge/ioh3420.c +++ b/hw/pci-bridge/ioh3420.c @@ -88,7 +88,7 @@ static const VMStateDescription vmstate_ioh3420 = { .version_id = 1, .minimum_version_id = 1, .post_load = pcie_cap_slot_post_load, - .fields = (VMStateField[]) { + .fields = (const VMStateField[]) { VMSTATE_PCI_DEVICE(parent_obj.parent_obj.parent_obj, PCIESlot), VMSTATE_STRUCT(parent_obj.parent_obj.parent_obj.exp.aer_log, PCIESlot, 0, vmstate_pcie_aer_log, PCIEAERLog), diff --git a/hw/pci-bridge/pci_bridge_dev.c b/hw/pci-bridge/pci_bridge_dev.c index 4b2696ea7f..089f91efed 100644 --- a/hw/pci-bridge/pci_bridge_dev.c +++ b/hw/pci-bridge/pci_bridge_dev.c @@ -199,7 +199,7 @@ static bool pci_device_shpc_present(void *opaque, int version_id) static const VMStateDescription pci_bridge_dev_vmstate = { .name = "pci_bridge", .priority = MIG_PRI_PCI_BUS, - .fields = (VMStateField[]) { + .fields = (const VMStateField[]) { VMSTATE_PCI_DEVICE(parent_obj, PCIBridge), SHPC_VMSTATE(shpc, PCIDevice, pci_device_shpc_present), VMSTATE_END_OF_LIST() diff --git a/hw/pci-bridge/pcie_pci_bridge.c b/hw/pci-bridge/pcie_pci_bridge.c index 2301b2ca0b..7646ac2397 100644 --- a/hw/pci-bridge/pcie_pci_bridge.c +++ b/hw/pci-bridge/pcie_pci_bridge.c @@ -132,7 +132,7 @@ static Property pcie_pci_bridge_dev_properties[] = { static const VMStateDescription pcie_pci_bridge_dev_vmstate = { .name = TYPE_PCIE_PCI_BRIDGE_DEV, .priority = MIG_PRI_PCI_BUS, - .fields = (VMStateField[]) { + .fields = (const VMStateField[]) { VMSTATE_PCI_DEVICE(parent_obj, PCIBridge), SHPC_VMSTATE(shpc, PCIDevice, NULL), VMSTATE_END_OF_LIST() diff --git a/hw/pci-bridge/xio3130_downstream.c b/hw/pci-bridge/xio3130_downstream.c index 38a2361fa2..907d5105b0 100644 --- a/hw/pci-bridge/xio3130_downstream.c +++ b/hw/pci-bridge/xio3130_downstream.c @@ -146,7 +146,7 @@ static const VMStateDescription vmstate_xio3130_downstream = { .version_id = 1, .minimum_version_id = 1, .post_load = pcie_cap_slot_post_load, - .fields = (VMStateField[]) { + .fields = (const VMStateField[]) { VMSTATE_PCI_DEVICE(parent_obj.parent_obj.parent_obj, PCIESlot), VMSTATE_STRUCT(parent_obj.parent_obj.parent_obj.exp.aer_log, PCIESlot, 0, vmstate_pcie_aer_log, PCIEAERLog), diff --git a/hw/pci-bridge/xio3130_upstream.c b/hw/pci-bridge/xio3130_upstream.c index a48bfe3bc5..2a6cff6e03 100644 --- a/hw/pci-bridge/xio3130_upstream.c +++ b/hw/pci-bridge/xio3130_upstream.c @@ -115,7 +115,7 @@ static const VMStateDescription vmstate_xio3130_upstream = { .priority = MIG_PRI_PCI_BUS, .version_id = 1, .minimum_version_id = 1, - .fields = (VMStateField[]) { + .fields = (const VMStateField[]) { VMSTATE_PCI_DEVICE(parent_obj.parent_obj, PCIEPort), VMSTATE_STRUCT(parent_obj.parent_obj.exp.aer_log, PCIEPort, 0, vmstate_pcie_aer_log, PCIEAERLog),