From patchwork Thu May 1 18:36:17 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: 886357 Delivered-To: patch@linaro.org Received: by 2002:a5d:430f:0:b0:38f:210b:807b with SMTP id h15csp463936wrq; Thu, 1 May 2025 11:39:41 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCX2a8VXdJUvznhy0dBi13lGHA8dIsPzk4Xxiebn0ljQUm6e0VnG0LKz/H6nK3ifcPOYwPzEDg==@linaro.org X-Google-Smtp-Source: AGHT+IGfW51XFdnZvlgFbR6G+Aco+ohFx+c2h/PKWP4L019QmGO0n6leuCXuA1+18/TWRwHqVHBS X-Received: by 2002:a05:6214:1cc4:b0:6f4:ca47:af99 with SMTP id 6a1803df08f44-6f50b209147mr56989376d6.8.1746124781224; Thu, 01 May 2025 11:39:41 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1746124781; cv=none; d=google.com; s=arc-20240605; b=KOA/3HPlUAnEeDiXLa9sOP/H8vCMAlxfRBtKfUJ2VmmBrymH391EbAirTfqcP68n// dms+umC67FnJ2lgq93IMYPbwZ3Dj+otIHiEl8Evn3B6on+YODmyuL0ymdZl0zWOrlWZ4 Bosf2VCYxrIHBNe07VKoXFvcGg+dnliEgd2od3zuAWXp5KGFYz0AU9lv7VjyIcBwl5sA Birzp/BZpsnw3GU+QiGzkQuFEF7PkDo9UuYcM6WkJ9Kh1bJNzQNzV9TodIc3SaQs+e+L Ua2PHwH6RgyGoB6yBFxb8X3bnv0xEzzd6Pr9JE7lAcVKGkPHAD2+MJbyYvaKF3hh1CsW xwPA== 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=6ubkHzu7s1cOcOgdA3It0e7Y2rG2MJsOlgRmMsxMDKU=; fh=hoe06aprcDnk5P3d0vwgQt6uC5al0E2l9mfTIGTxZjA=; b=flVaAL36JIPz+c+hMEssPz573cGLO7gucK4YFZgLTlayIkN9gNQye14HID+oEgLtVQ svXqSb2PpEOTCQ+3RkWC8OYy+RPPDLoXpyEhCaIEfxLrnqBLJAU+Y91LUBSvLOJlLosf 01afjpUXviGG7hDoFY70BZ5nr0SsIk0VbfH0J29h2MBoUiwdnatVAFrVuK+JZzzS9G+L XU2cxtXuKPPwxefR2uWBtHLl/FyqxXgOrLKY32irfwDqLto7VrZ6rIwrEPmyzobQo51s WNYyUUrMn90KuJC+kSNvHwajc/unGvdrYIsT8x49CJogKukGHGF95+Z9Dw2crbhBzPSy g/TQ==; dara=google.com ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b="coafaSM/"; 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 ESMTP id 6a1803df08f44-6f50f4abecasi13209266d6.433.2025.05.01.11.39.41 for ; Thu, 01 May 2025 11:39: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="coafaSM/"; 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 1uAYnX-00010T-83; Thu, 01 May 2025 14:38:15 -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 1uAYmg-0007ul-JU for qemu-devel@nongnu.org; Thu, 01 May 2025 14:37:30 -0400 Received: from mail-il1-x131.google.com ([2607:f8b0:4864:20::131]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1uAYme-00084Q-Nd for qemu-devel@nongnu.org; Thu, 01 May 2025 14:37:22 -0400 Received: by mail-il1-x131.google.com with SMTP id e9e14a558f8ab-3d8dcc7cd17so8171615ab.1 for ; Thu, 01 May 2025 11:37:20 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1746124639; x=1746729439; 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=6ubkHzu7s1cOcOgdA3It0e7Y2rG2MJsOlgRmMsxMDKU=; b=coafaSM/Jjfkyj60O9BgH+ZYCFQnvYB+iogKCi0XTjKhQwQvWRyx+8pRZv9JyhzoTv Qt4RwHcFmD1TOrwoszCd66d0mrHJ/ZatYe20D5KpfMiJWQm3jUlNZAvyWWEzL3q86Len Nebl7VML2R5P1K9zvMGvjFz87jKK0M6ud/EAkhmNCCDyLmGzXr9WaBacKSskZxEVfwY+ bcf3jQsiPTONkOkVOZ1j2VyOp8JqQxKgbuspB+31lBP4SxXWIyNB6uHo97tE4VCNQCBB E8PtNV1DLW+MdIzGMnNZ6AVUcrpBwQMsNItlnSJI1rOym/KW7Kgs7Hbd4RaOc8Tg1NYr UiDQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1746124639; x=1746729439; 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=6ubkHzu7s1cOcOgdA3It0e7Y2rG2MJsOlgRmMsxMDKU=; b=ZGD/dF/ZqG3aTnZZROFGG+hF0isagSg153DKJFT8lHbMVPeNK68biDBm6RMrRRJaOO Jlm98Msa2oUwnA1i27gSBVM2HyZ/cthx+pXcTnzHCrUsG/zWlfvBBMKc3HORHdF8snS3 XoqDqpXbyUw9CC4FlzZ/zkKgdfe2Yz4s41a2JhePxUFCRHvBjKyVIgGzHsXieCDzIuvy OMJFfzxdJcBpB/kMkSkXgiNGhDj7H0vhM6Q0ChEvsC8POAXHW4P++oZQo7v5BH3EczLy zoV39v/8Pcy3s/MXp/ru87sc3dYpanuHzis2VOoCryGR+ofYSVbssX/AXp57uhJIpNQZ g+fQ== X-Gm-Message-State: AOJu0YwbCqTp+Jf11Ck8opCoIipvHX6KSdN9sc9wp9sjZBfxOSBJTg/7 bu5/rxrA4Ad3vqdR9W8Frz1p8Wo4CGDvxdiu2BO1kjMA9zUUO1ZW1cR93a/cA4gXuVkhPuDyTyy i X-Gm-Gg: ASbGncsfLFuKEcKdkHimgGqBR5NXcSfpFwWZV29Gw+rdwMsRqh//O2sVgEIg20mnnq9 XI8tQllQR2HNHJ5liPqAiKtLCQbHp3a0QMpEg/lIfIZTdxVLgGP4tNpzBMbuC4qAGiDW9XsVhcA yHPgmnC6rsS8Vqxd3vnJqeI9UzLr9EUTgZmUyS0Ce44Q88YVkxCm3NbJ+4BCEi0Wxia+yj6a0Gu T/adaSQXS7W6O4LH+3WRVi5AAc8NcpMG7Lz1NoVB4kkpPxYMhx5XDm73bqc21y+QGT3JiPqp3/K eg6e0Xq0shfEtPM8BCxGB/8EqbZDSuzad+RSqi6sURVT0ftUjJr7nFC6Zj4y0Lx/2inDXcsRg9J v/TYSJETRz+bHkye8kBmZ X-Received: by 2002:a05:6e02:5a5:b0:3d2:af0b:6e2a with SMTP id e9e14a558f8ab-3d970ad6a68mr36486965ab.5.1746124639251; Thu, 01 May 2025 11:37:19 -0700 (PDT) Received: from localhost.localdomain (88-187-86-199.subs.proxad.net. [88.187.86.199]) by smtp.gmail.com with ESMTPSA id 8926c6da1cb9f-4f882fc9ac6sm304331173.75.2025.05.01.11.37.15 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Thu, 01 May 2025 11:37:18 -0700 (PDT) From: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: Igor Mammedov , Gerd Hoffmann , =?utf-8?q?Cl=C3=A9ment_Mathieu--Drif?= , Yi Liu , Paolo Bonzini , Amit Shah , Zhao Liu , "Michael S. Tsirkin" , =?utf-8?q?Philippe_Mathieu-Daud?= =?utf-8?q?=C3=A9?= , =?utf-8?q?Marc-Andr=C3=A9_Lureau?= , Richard Henderson , Sergio Lopez , Laurent Vivier , Jason Wang , Eduardo Habkost , Yanan Wang , Marcel Apfelbaum , Ani Sinha , Thomas Huth Subject: [PATCH v2 05/16] hw/intc/apic: Remove APICCommonState::legacy_instance_id field Date: Thu, 1 May 2025 20:36:17 +0200 Message-ID: <20250501183628.87479-6-philmd@linaro.org> X-Mailer: git-send-email 2.47.1 In-Reply-To: <20250501183628.87479-1-philmd@linaro.org> References: <20250501183628.87479-1-philmd@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2607:f8b0:4864:20::131; envelope-from=philmd@linaro.org; helo=mail-il1-x131.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 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 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(). 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,