From patchwork Tue May 6 14:38:53 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: 887794 Delivered-To: patch@linaro.org Received: by 2002:a5d:430f:0:b0:38f:210b:807b with SMTP id h15csp2586201wrq; Tue, 6 May 2025 07:43:53 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCVTL0dtUG3/onYJOEenvvCH83vMHhM3suZOXE3nJf1CJxRjPyhiom+4hjhXY84/Nj7DnqocTg==@linaro.org X-Google-Smtp-Source: AGHT+IGFZZB0YneZfsFDRgZAX46O3SHc3lN/8Ept7qDTiq86NdIbUn2DF9xShiU3VqZyTSW4F5UB X-Received: by 2002:a05:6102:2d08:b0:4bb:e36f:6a35 with SMTP id ada2fe7eead31-4dc64ff0be0mr2479385137.14.1746542633596; Tue, 06 May 2025 07:43:53 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1746542633; cv=none; d=google.com; s=arc-20240605; b=P4DByML6YV2977TXo4Br0qmeBepyd8zY9e9Yax3JzULdQGxEZ7vqJ5FCxqzI4XR425 rphmLbvhKsLppX/zArxU1xcwD2jL2vXicyaXBwVwtjMi9VCsVaMWLxEtKeFT+F59Ml7z KlJnmeWQMbDTJpPUVtvX3ffgBiHyzLLBH1s/iarehzqgjRFHINi6/wEdwdiX0UnQhvNd htfUgiSVB77mTJXAiGtbb349c7OspE6CJCtb45Ef06tpCP/aOpDy+XpF7+XVrP3iKrAw te14BoFan9yMzh9AdyKfXQxbpc4Td8j3KGg+0RfrdmIffaTAn/iXQLoIGIBqsS7bNJD/ AZdw== 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=ms9JBoeprQUPiUptapCDzYpBSk9NyAFnoD9mnSvk1Zo=; fh=yv/UmZ//SMR7OMCPM+hEQ1cdGiNsmlJhsS8KuguVnUs=; b=D6spIRFtlSVi9l6QpKkA1ENO/gDbntibmY9wQAdeJXDKPtwr03BPYqUL8OL0qmfpLZ YfnOhP+Xp3e1DgAsIiZPpmON+JKCLYbxp2S+BItJRx/UpKHXjiNEgXciJl7W+ZZvZDNq CdkmZ5wNz+q1vVL+ozIwbO0Clteisq0uyVKOz8CrdQFjOYBD4aUo70vdNPlpOY28QWOD BqV1Olkmy+MksLWcna0YsIhfogOVQ5xoTchKhFyl2U5IqWT7y0JamnSRDb2Y0PIacIJn HenCuUYNyM6RZJSGFZlPJQK2n+iHR7POHfVhVOe+GUyjP3Q1h6pUeTVzYI/K+CZsv2Bn uK/A==; dara=google.com ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=SGcrTxIc; 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 ada2fe7eead31-4daf25002c0si2630337137.221.2025.05.06.07.43.53 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Tue, 06 May 2025 07:43:53 -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=SGcrTxIc; 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 1uCJVw-0003Z3-MX; Tue, 06 May 2025 10:43:20 -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 1uCJSU-000733-3I for qemu-devel@nongnu.org; Tue, 06 May 2025 10:39:48 -0400 Received: from mail-wm1-x32e.google.com ([2a00:1450:4864:20::32e]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1uCJSR-0001SE-K4 for qemu-devel@nongnu.org; Tue, 06 May 2025 10:39:45 -0400 Received: by mail-wm1-x32e.google.com with SMTP id 5b1f17b1804b1-43cf680d351so34833695e9.0 for ; Tue, 06 May 2025 07:39:42 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1746542381; x=1747147181; 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=ms9JBoeprQUPiUptapCDzYpBSk9NyAFnoD9mnSvk1Zo=; b=SGcrTxIclfO5EuzzSgKMfcwt6D9P9SrwuaeHJ2+TZnccVZHQeHLg1P++a1C/HbquHf vgaBtpxj+OOUAZRkXFEy99AVObklxlStKJNUsRxRO4lS4TAINPMjR44iKqqBLRFZUchE JG9MVk1BxpQQvRxI2K/NckIOQ9Tk0i3prdVSwL5UVt891V3NoALLGl4w1kGldcP07Ue/ 6AqgVCjqb3IPap0o0XPa4+ToRcgcxCdtIeIlzghoOXLj0bweLol0lUq9J6CnetbL844D oOMYpP3kFkBa+NwPhYpE10rqvtzhJPCqqs1k81qbPnCaDB04sV2TSKaa2c5yYr+RT40U ulbA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1746542381; x=1747147181; 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=ms9JBoeprQUPiUptapCDzYpBSk9NyAFnoD9mnSvk1Zo=; b=CnTRKlt5O5AWF1MYgUAm5LKEafzCcDcxebOq4y3TU1lZNtSTmfpHmm/DBugMWYz4en CKDxkgwFWVDg+YUt6UEIqSc706+CzcUJImP1CsaQzwZ8k34luunpdozoXcMK82vlu/O3 3elLL8G83fjIjX8VgQs1DVkrX2G3O02cEnvYJpLhiLzDp9GzOHSbPhgubcO3HXCD+0XA BEqu87cDIDU0JGG/1RPiXbPW1iqF+uhbCVWgMkxT6rI5EcdRk9Hr8+nszz9T0/4iUbTB 7P6BH7UtJCdy4gJAJCNDgr0V3f6vwYYFeSo2k+tuZJrADo7Sg37T8uqjFTme8CjWdUyP Brgw== X-Gm-Message-State: AOJu0YwAVJP9CzKY4J1s+SsgRu4X+T24QJG/F/ipatjmsH6tP7iHzezq 9hscyKB2KJuyCrQBz67g/Ce77oS19KSjHHdrPL6bWTMURP7D9aZ6sYllYkSVAqQg+rLcoNhob2F z X-Gm-Gg: ASbGncti3xhI7qe/li4t2kYzTc3BYxt+YAVhIxvD0BpSfEu5UnsFpQWYNodNUPb3hRX Ftg4z9sUp4/r2qAt4ZQbfTpXfoinfTQvJc6I0zWnTOeiquQ3eM00i3VSV4J9DZK1Gg2SLfkaTGV tP9dJU2+qfOoxYV1CEvhwuPcO4HPqsx/DJ5O4T2FH3AL2cG6wwEkKm96ca4i0OKqNj3njD1U3cO rY3gSiZXx4660cl9V81Wy4PP6Udt8aB8ZBwgh1SndRLf3bR8S0hFf+NBk2OJCCWf87HmFDKZpLs XrkxqQ0rIWPjY7b1ZIw4gdGpzCMV3yn2zLPcK+xhukKBKCpRPmkoG/HkL627ovDjBGcMtZwzc93 +CG8Jd9g3XlXeWjnzsyrx X-Received: by 2002:a05:6000:40dc:b0:38d:dc03:a3d6 with SMTP id ffacd0b85a97d-3a0b43afdb6mr23610f8f.4.1746542381427; Tue, 06 May 2025 07:39:41 -0700 (PDT) Received: from localhost.localdomain (91-163-26-170.subs.proxad.net. [91.163.26.170]) by smtp.gmail.com with ESMTPSA id 5b1f17b1804b1-441b2ad7688sm219322085e9.3.2025.05.06.07.39.40 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Tue, 06 May 2025 07:39:40 -0700 (PDT) From: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: Kevin Wolf , =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= , Yanan Wang , Paolo Bonzini , Eduardo Habkost , Fam Zheng , Hanna Reitz , Zhao Liu , qemu-block@nongnu.org, Dmitry Fleytman , Richard Henderson , Laurent Vivier , John Snow , Jason Wang , Marcel Apfelbaum , "Michael S. Tsirkin" , Gerd Hoffmann , Fabiano Rosas , =?utf-8?q?Daniel_P=2E_Berrang=C3=A9?= , Thomas Huth Subject: [PATCH v3 07/19] hw/virtio/virtio-pci: Remove VIRTIO_PCI_FLAG_MIGRATE_EXTRA definition Date: Tue, 6 May 2025 16:38:53 +0200 Message-ID: <20250506143905.4961-8-philmd@linaro.org> X-Mailer: git-send-email 2.47.1 In-Reply-To: <20250506143905.4961-1-philmd@linaro.org> References: <20250506143905.4961-1-philmd@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::32e; envelope-from=philmd@linaro.org; helo=mail-wm1-x32e.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=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 VIRTIO_PCI_FLAG_MIGRATE_EXTRA was only used by the hw_compat_2_4[] array, via the 'migrate-extra=true' property. We removed all machines using that array, lets remove all the code around VIRTIO_PCI_FLAG_MIGRATE_EXTRA. Signed-off-by: Philippe Mathieu-Daudé Reviewed-by: Daniel P. Berrangé Reviewed-by: Thomas Huth Reviewed-by: Zhao Liu --- include/hw/virtio/virtio-pci.h | 4 ---- hw/virtio/virtio-pci.c | 6 +----- 2 files changed, 1 insertion(+), 9 deletions(-) diff --git a/include/hw/virtio/virtio-pci.h b/include/hw/virtio/virtio-pci.h index 31ec144509f..d39161766e0 100644 --- a/include/hw/virtio/virtio-pci.h +++ b/include/hw/virtio/virtio-pci.h @@ -32,7 +32,6 @@ DECLARE_OBJ_CHECKERS(VirtioPCIBusState, VirtioPCIBusClass, enum { VIRTIO_PCI_FLAG_BUS_MASTER_BUG_MIGRATION_BIT, VIRTIO_PCI_FLAG_USE_IOEVENTFD_BIT, - VIRTIO_PCI_FLAG_MIGRATE_EXTRA_BIT, VIRTIO_PCI_FLAG_MODERN_PIO_NOTIFY_BIT, VIRTIO_PCI_FLAG_DISABLE_PCIE_BIT, VIRTIO_PCI_FLAG_PAGE_PER_VQ_BIT, @@ -57,9 +56,6 @@ enum { /* virtio version flags */ #define VIRTIO_PCI_FLAG_DISABLE_PCIE (1 << VIRTIO_PCI_FLAG_DISABLE_PCIE_BIT) -/* migrate extra state */ -#define VIRTIO_PCI_FLAG_MIGRATE_EXTRA (1 << VIRTIO_PCI_FLAG_MIGRATE_EXTRA_BIT) - /* have pio notification for modern device ? */ #define VIRTIO_PCI_FLAG_MODERN_PIO_NOTIFY \ (1 << VIRTIO_PCI_FLAG_MODERN_PIO_NOTIFY_BIT) diff --git a/hw/virtio/virtio-pci.c b/hw/virtio/virtio-pci.c index 0fa8fe49556..a3e2e007d6c 100644 --- a/hw/virtio/virtio-pci.c +++ b/hw/virtio/virtio-pci.c @@ -146,9 +146,7 @@ static const VMStateDescription vmstate_virtio_pci = { static bool virtio_pci_has_extra_state(DeviceState *d) { - VirtIOPCIProxy *proxy = to_virtio_pci_proxy(d); - - return proxy->flags & VIRTIO_PCI_FLAG_MIGRATE_EXTRA; + return true; } static void virtio_pci_save_extra_state(DeviceState *d, QEMUFile *f) @@ -2349,8 +2347,6 @@ static void virtio_pci_bus_reset_hold(Object *obj, ResetType type) static const Property virtio_pci_properties[] = { DEFINE_PROP_BIT("virtio-pci-bus-master-bug-migration", VirtIOPCIProxy, flags, VIRTIO_PCI_FLAG_BUS_MASTER_BUG_MIGRATION_BIT, false), - DEFINE_PROP_BIT("migrate-extra", VirtIOPCIProxy, flags, - VIRTIO_PCI_FLAG_MIGRATE_EXTRA_BIT, true), DEFINE_PROP_BIT("modern-pio-notify", VirtIOPCIProxy, flags, VIRTIO_PCI_FLAG_MODERN_PIO_NOTIFY_BIT, false), DEFINE_PROP_BIT("x-disable-pcie", VirtIOPCIProxy, flags,