From patchwork Thu May 8 13:35:37 2025 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: 888597 Delivered-To: patch@linaro.org Received: by 2002:adf:b60d:0:b0:3a1:f579:ae88 with SMTP id f13csp8367wre; Thu, 8 May 2025 06:41:42 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCVlR2+EBjhBxsIhPhmwxVaMgeJsiD6HPtWQ9ssRPWSoCb09QH39uIc0vrrnS/s5pg0LYL99ng==@linaro.org X-Google-Smtp-Source: AGHT+IGzRTVtpJBdsW2UiEpEeWFA0kA5kAqTyromTzc8f4yisseMs0sf48T5PfRYtXbMMNcKhiVs X-Received: by 2002:a05:622a:19a0:b0:474:fee1:7915 with SMTP id d75a77b69052e-4922620916fmr107841971cf.31.1746711701948; Thu, 08 May 2025 06:41:41 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1746711701; cv=none; d=google.com; s=arc-20240605; b=fto0LB+ZnKDdhm7trKi6M1YNvR7k6NYp4qKX68MAb84rjfimCmqE0MUHlD2WXw6Nmz n32QgQeOgtPLGj8zqjUr0Eshu1VisYuoBfvnlq8YC+EW76QwO/xlkke9t1TNy/PvDaZK gKOy7sDglH1q6Spy9oEZIfDWrMPH/1r6RGMfD6JegyLR8XtmJ8T1h6e+sSeO1zQ8CVsU zKywxQ4GxmQ7rAc5uFTdZDoOreBQ1v3WFb9v95f3PbAZBL3e1PXxlUouUMShwooe5jkv 79uyIYMTYZNIXP7guxk8W6fRiA4sfSBWMbRKCLl9OEj+pHTSbTsqybdzeJ/xW2ERMIc1 ilAw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20240605; 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=GfnNMh8um2i71NVQR7Vo7AAo9gkZrP7mDUQkPEIxOEM=; fh=fPkRSEYCel/EUuwKjeUH2HSngyX7ytCg7docWFAAYgw=; b=CMKc36zK8N/2MWXWi2JmvpMNQPtQwXvhdQIio5X7xwPrYjM16g7kUEM1pm4KhyATQa xZktVgTrPcDh+ROI5mLDuJCZw5Zma4C5GQ7L56LJqMYMJXXqosd0yj2CwtFltew0AYUF N+uOK3GAnRDYgK27HocYUhi55gRySJ1aK1fE35gzH1HF3sC5H1L5Y300flSF9viH1Wom D2n0cvDa/hs68dXXPhIO6nG8sfU8gPT8B0HNlli+OUufECWGRt7QldA8oAt7Rz63jzNy EDBJpwOQmvjOxsQD7hOY/HDSxyTS2jvSwSyInfoatm7q/xaCfkQp2aphLQtHkjtouX7b OjDQ==; dara=google.com ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b="HPKYNVL/"; 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; dara=neutral header.i=@linaro.org Return-Path: Received: from lists.gnu.org (lists.gnu.org. [209.51.188.17]) by mx.google.com with ESMTPS id d75a77b69052e-49223457d9dsi43105021cf.534.2025.05.08.06.41.41 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Thu, 08 May 2025 06:41:41 -0700 (PDT) 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="HPKYNVL/"; 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; dara=neutral header.i=@linaro.org Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1uD1V7-0001Ay-Fz; Thu, 08 May 2025 09:41:25 -0400 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 1uD1V5-00014i-5E for qemu-devel@nongnu.org; Thu, 08 May 2025 09:41:23 -0400 Received: from mail-pj1-x1032.google.com ([2607:f8b0:4864:20::1032]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1uD1Uz-0004Yk-UL for qemu-devel@nongnu.org; Thu, 08 May 2025 09:41:22 -0400 Received: by mail-pj1-x1032.google.com with SMTP id 98e67ed59e1d1-306b78ae2d1so945924a91.3 for ; Thu, 08 May 2025 06:41:17 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1746711676; x=1747316476; 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=GfnNMh8um2i71NVQR7Vo7AAo9gkZrP7mDUQkPEIxOEM=; b=HPKYNVL/Oo3D9bI81bb6wIyVbcgPC0g8Qdd4/aj+veIe0nnneDIBgm0zxzhNlEdmHF QhA+uAdq7HzTNb9kdyNWfPEYDIajoWakuUrrI6Q+28+Z0U+zxjMErE+MCzp9OuhEhS4r EvoCxDiW3iVND21Fnu2v/BDy1GHZz7g28CpcmdFgPSFuhDxReM62i1p1KA04Y839355y XAiCsW14q56WCviGKwrfgmsWQ4jfUPaCnxT4v9iNNuGqEp2jztLzOxkKHkmDhxjnbnqM NUWQo60rCgPvLyGzauGTNA0qjEhz2X9eG90YNAPotdwpuKbEixlS9i2XCf7qLOQMwlmU oYRQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1746711676; x=1747316476; 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=GfnNMh8um2i71NVQR7Vo7AAo9gkZrP7mDUQkPEIxOEM=; b=YD3M+qCoUBA9vQdH2m0eOJYG6B5Eqmy07JQt8XbTjU/thCsEGdO9Ha3TeqDunFAO1V gvGpos1GcPphOy0bjUpmzd417hhAxySoTOpPvHipBfc4m0v5hN1zBjWdBevG5/QYtYsW SlG1PenZ+z8GJUQAnOqQSo92FKmwWcnSaCSMphbTyvkm767Kt//4PWNUkhBdz3bIbXXG VhE/nLKVYd5BlyWGTvarjOYSdA7OfJq0/a8SPkVczsiTV2TwGNovNsTskAcG3T3g05W4 VXY1uanLvi7FWaDI0/FnAoI2eOr+QY38NiZ1Bb9uCBoKHiRKjg2pXbb0Ygyi7/FgskhZ MbJQ== X-Gm-Message-State: AOJu0YyHa/WKK1Rwp2rtxuILhSgFwxEetSaWyIxqxcVyW5RZTQ3Aoi95 KOSzHrJKUIDHOMedy94Ti/tjUleTW7sO3XneP/QGFd9vzYv5VJN7ySKqzNr7Y1xHPfP+5PsreSU 39WaniA== X-Gm-Gg: ASbGnctVBUKL0hqHbXQDp6GTbj+b7Zxtd6aButbAma92TdMKChlku6aN9uH/vwctwZT kelgGmZtUSZ3DSBrvsg4l6orEKSJ4vEo7qJuye9epmr+WiFFtWAvUVrlZo5FPPmpFbMdXUkkL/a WapOlHnn4PfKbZc0eNPW4zTbMU53wUG3n0rvEKqDEyf8YhqSX3hD7CmuiWFkF4wd+sEvjR0QzLt hRSpVP2hzERoMQyiDbj5b1t/BSQnV2/4zSIxk5TkCoB4Vi0YftKtvYdPJu/+6sS01VtyiSQJaHB mtPqrLup1nbioPQGHY3SiTWc+HaqkIOnwQhzUXMl8FpILh6WcngYVvKkWUxUAE2N6GT5irX97d6 tCExQjiqD/0jZ48A= X-Received: by 2002:a17:90b:278e:b0:2fa:1a23:c01d with SMTP id 98e67ed59e1d1-30aac1b407amr10664017a91.21.1746711675615; Thu, 08 May 2025 06:41:15 -0700 (PDT) Received: from localhost.localdomain (88-187-86-199.subs.proxad.net. [88.187.86.199]) by smtp.gmail.com with ESMTPSA id 98e67ed59e1d1-30ad4d56981sm2115127a91.28.2025.05.08.06.41.01 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Thu, 08 May 2025 06:41:15 -0700 (PDT) From: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: Richard Henderson , kvm@vger.kernel.org, Sergio Lopez , Gerd Hoffmann , Peter Maydell , Laurent Vivier , Jiaxun Yang , Yi Liu , "Michael S. Tsirkin" , Eduardo Habkost , Marcel Apfelbaum , Alistair Francis , Daniel Henrique Barboza , Marcelo Tosatti , qemu-riscv@nongnu.org, Weiwei Li , Amit Shah , Zhao Liu , Yanan Wang , Helge Deller , Palmer Dabbelt , Ani Sinha , Igor Mammedov , Fabiano Rosas , Paolo Bonzini , =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= , Liu Zhiwei , =?utf-8?q?Cl=C3=A9ment_Mathieu--?= =?utf-8?q?Drif?= , qemu-arm@nongnu.org, =?utf-8?q?Marc-Andr=C3=A9_Lureau?= , Huacai Chen , Jason Wang , Mark Cave-Ayland , Thomas Huth Subject: [PATCH v4 14/27] hw/intc/apic: Remove APICCommonState::legacy_instance_id field Date: Thu, 8 May 2025 15:35:37 +0200 Message-ID: <20250508133550.81391-15-philmd@linaro.org> X-Mailer: git-send-email 2.47.1 In-Reply-To: <20250508133550.81391-1-philmd@linaro.org> References: <20250508133550.81391-1-philmd@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2607:f8b0:4864:20::1032; envelope-from=philmd@linaro.org; helo=mail-pj1-x1032.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, T_SPF_TEMPERROR=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 The APICCommonState::legacy_instance_id boolean was only set in the pc_compat_2_6[] array, via the 'legacy-instance-id=on' property. We removed all machines using that array, lets remove that property, simplifying apic_common_realize(). Because instance_id is initialized as initial_apic_id, we can not register vmstate_apic_common directly via dc->vmsd. Signed-off-by: Philippe Mathieu-Daudé Reviewed-by: Mark Cave-Ayland Reviewed-by: Thomas Huth --- include/hw/i386/apic_internal.h | 1 - hw/intc/apic_common.c | 5 ----- 2 files changed, 6 deletions(-) diff --git a/include/hw/i386/apic_internal.h b/include/hw/i386/apic_internal.h index 429278da618..db6a9101530 100644 --- a/include/hw/i386/apic_internal.h +++ b/include/hw/i386/apic_internal.h @@ -188,7 +188,6 @@ struct APICCommonState { uint32_t vapic_control; DeviceState *vapic; hwaddr vapic_paddr; /* note: persistence via kvmvapic */ - bool legacy_instance_id; uint32_t extended_log_dest; }; diff --git a/hw/intc/apic_common.c b/hw/intc/apic_common.c index 37a7a7019d3..1d259b97e63 100644 --- a/hw/intc/apic_common.c +++ b/hw/intc/apic_common.c @@ -294,9 +294,6 @@ static void apic_common_realize(DeviceState *dev, Error **errp) info->enable_tpr_reporting(s, true); } - if (s->legacy_instance_id) { - instance_id = VMSTATE_INSTANCE_ID_ANY; - } vmstate_register_with_alias_id(NULL, instance_id, &vmstate_apic_common, s, -1, 0, NULL); @@ -412,8 +409,6 @@ static const Property apic_properties_common[] = { DEFINE_PROP_UINT8("version", APICCommonState, version, 0x14), DEFINE_PROP_BIT("vapic", APICCommonState, vapic_control, VAPIC_ENABLE_BIT, true), - DEFINE_PROP_BOOL("legacy-instance-id", APICCommonState, legacy_instance_id, - false), }; static void apic_common_get_id(Object *obj, Visitor *v, const char *name,