From patchwork Fri Jan 5 15:42:30 2024 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: 760187 Delivered-To: patch@linaro.org Received: by 2002:a5d:678d:0:b0:336:6142:bf13 with SMTP id v13csp107000wru; Fri, 5 Jan 2024 07:52:15 -0800 (PST) X-Google-Smtp-Source: AGHT+IFC+cFSpX2rJ+aJ5GS/CQdCYRmVcwf2jwF4rlb19mAA1dADOfLCN8FKFut4LolfRd++FJn0 X-Received: by 2002:a05:6808:f0f:b0:3bc:2ea6:c93c with SMTP id m15-20020a0568080f0f00b003bc2ea6c93cmr2597812oiw.29.1704469934653; Fri, 05 Jan 2024 07:52:14 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1704469934; cv=none; d=google.com; s=arc-20160816; b=U74gfZ220bnj4WmNeU0ZmTiosg1iPyqtOJ0u/0hf5aWA9tcmZd2BqimjEznTvlvon4 4CExqKTbf5Q3fn9twoVVskcQoi5HBXuJrdA58uSfhCCTA/uCsbKQTdi6GsmrpyiJ1jYW RLXRfvXOrQwB+b9ZsEjfc/CbGZvvQBo5MYSFo2+3SThtkM95VgWRAfpcADt34WVT3mPw UbiSHWLVy7J99Un8eiGlGetxr5FQJqPx1TZJv1WYIQiteKRqYyVmlFdxCH4CTSrT5Yyt CxqyzjOoHGSxPXOor2mjh+B58pvjrXuTLB3Y50nOxZ94xL3Ku23xtKdx4pAZ3QZSMXx6 Lljw== 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:cc:to :from:dkim-signature; bh=foPbRN9kgz3ubIukCDMoVcakJKSu99lNJLUQRej2Dsg=; fh=E/IMe+HuIHQOh8W/HP3CMZ0nY1WkCNldb1wsyc7BhE0=; b=GOERoIpsBvSqtCopLtCQfv0Z94WpiNQQdmCUxzhNktw1hPLCHmrfpNJ+Q8qR/xyl3B +3yunhKwyrcetkndUFzLEQW6MU/OX5wWtv7rjL5lQvD4rKmbJjnzcx3QjCpYpyRI+EOR r4qfcX/X9GNy5vrh9jU42GPfTiaq5qplUV79NBVIj2UUnzWMRx5DH8/dpRv5f6J82HYZ 4NGzBNUSio6GZnMZ87DlA5x0FqHj0OPG6dC6lKIGD+p01AXr9AFxSMBiC2yDl27rOu+j IdkyVatzSR5CHouPYj2rHZsaX+NtMQFN0uqcrDTosbelLBwUnet2wHfKPqpsEdhocVfZ IFZQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=pAJGDXvC; 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 j10-20020a05620a288a00b0078126fbd340si2019523qkp.596.2024.01.05.07.52.14 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Fri, 05 Jan 2024 07:52:14 -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=pAJGDXvC; 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 1rLmR2-0002Ab-0v; Fri, 05 Jan 2024 10:48:36 -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 1rLmPl-0005MS-La for qemu-devel@nongnu.org; Fri, 05 Jan 2024 10:47:19 -0500 Received: from mail-wr1-x42e.google.com ([2a00:1450:4864:20::42e]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1rLmPj-00045A-UF for qemu-devel@nongnu.org; Fri, 05 Jan 2024 10:47:17 -0500 Received: by mail-wr1-x42e.google.com with SMTP id ffacd0b85a97d-33748c4f33dso1402314f8f.1 for ; Fri, 05 Jan 2024 07:47:15 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1704469634; x=1705074434; 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=foPbRN9kgz3ubIukCDMoVcakJKSu99lNJLUQRej2Dsg=; b=pAJGDXvCXqCWtmEX24PENeF/S6BWfWmbADoC/oGYDGPwQKutZ5aONcv7Q3kSxSaRsj Vu1dKH40+YAhYVZ7ElIXYKG0OUx6y6xhkG8jaidL7xoZVDljyNVB9qb/gcn66glAF2Ej VADCTDYsNLlH/NBBSWO8K0crq+FVsvtxd1WsgGMiKvJDumxUi3bpkr0+gz1s5XSO55CQ 2H1E3rcmYnn9EzUtcSsrdkwF3eoYzC0hlkyc7a0GnoOvAgaf278CFXcxQKO9qj8ggKRE dolEz3LzOa9vJ4XLQMRq/OC+E2g2ngAL1ZDrJWgWWG3DDk2OpuAsv+t9H7skvwZJxfuG htyA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1704469634; x=1705074434; 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=foPbRN9kgz3ubIukCDMoVcakJKSu99lNJLUQRej2Dsg=; b=AYBWjTv2WOVeTbjsp0IL+3uy3VlAwnoXFSsKl8tr7yj29aWJGjEcwwui1IDaLEUc8F TFuMja47zyNBShc0s93HDyXLsLn83f2rNnwfchaGvcLbWadX9b+8e0Jgy1wc8+MW6G94 M7wUlpciROWugSKi4LKwAFFyZFC7LIWB88cBgjTLFJ+gE70yLquKncjP4q71BMpe9Vl0 b03SW56QZB/6aHfrG3BxglxS8Jw/ancUFyc4iYaGciwIz30rfnE6NkWR7LAN7wh+oDEr bOlCsZNpOgbnrN7zma6z9KKuCmJCDcHrxfRlKEsIXj1X3yd1f/FGsXesxvKHYzmMxqel D4jw== X-Gm-Message-State: AOJu0YydBaZuhR5jcHE43LVwZ2pKJchD7QP6GSteBwPBF4V/FribfeA/ DTwtw+yU7Lvk43zJjwk/QBbUiE8TcBcrhPp0RPepPjlZ9ss= X-Received: by 2002:a5d:550d:0:b0:332:e667:4277 with SMTP id b13-20020a5d550d000000b00332e6674277mr1265526wrv.40.1704469634427; Fri, 05 Jan 2024 07:47:14 -0800 (PST) Received: from m1x-phil.lan (juv34-h02-176-184-26-1.dsl.sta.abo.bbox.fr. [176.184.26.1]) by smtp.gmail.com with ESMTPSA id g18-20020adfa492000000b003365f5e87f4sm1623391wrb.95.2024.01.05.07.47.13 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Fri, 05 Jan 2024 07:47:14 -0800 (PST) From: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: qemu-ppc@nongnu.org, qemu-arm@nongnu.org, qemu-riscv@nongnu.org, =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= , Fabiano Rosas , Gerd Hoffmann Subject: [PULL 37/71] hw/audio/sb16: Do not migrate qdev properties Date: Fri, 5 Jan 2024 16:42:30 +0100 Message-ID: <20240105154307.21385-38-philmd@linaro.org> X-Mailer: git-send-email 2.41.0 In-Reply-To: <20240105154307.21385-1-philmd@linaro.org> References: <20240105154307.21385-1-philmd@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::42e; envelope-from=philmd@linaro.org; helo=mail-wr1-x42e.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 Since commit f7b4f61f63 ("qdev/isa: convert soundblaster") these fields have been converted to qdev properties, so don't need to be migrated: static Property sb16_properties[] = { DEFINE_AUDIO_PROPERTIES(SB16State, card), DEFINE_PROP_UINT32 ("version", SB16State, ver, 0x0405), /* 4.5 */ DEFINE_PROP_UINT32 ("iobase", SB16State, port, 0x220), DEFINE_PROP_UINT32 ("irq", SB16State, irq, 5), DEFINE_PROP_UINT32 ("dma", SB16State, dma, 1), DEFINE_PROP_UINT32 ("dma16", SB16State, hdma, 5), DEFINE_PROP_END_OF_LIST (), }; Signed-off-by: Philippe Mathieu-Daudé Reviewed-by: Fabiano Rosas Message-Id: <20231124182615.94943-1-philmd@linaro.org> --- hw/audio/sb16.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/hw/audio/sb16.c b/hw/audio/sb16.c index bf7f35a42b..fd76e78d18 100644 --- a/hw/audio/sb16.c +++ b/hw/audio/sb16.c @@ -1325,11 +1325,11 @@ static const VMStateDescription vmstate_sb16 = { .minimum_version_id = 1, .post_load = sb16_post_load, .fields = (const VMStateField[]) { - VMSTATE_UINT32 (irq, SB16State), - VMSTATE_UINT32 (dma, SB16State), - VMSTATE_UINT32 (hdma, SB16State), - VMSTATE_UINT32 (port, SB16State), - VMSTATE_UINT32 (ver, SB16State), + VMSTATE_UNUSED( 4 /* irq */ + + 4 /* dma */ + + 4 /* hdma */ + + 4 /* port */ + + 4 /* ver */), VMSTATE_INT32 (in_index, SB16State), VMSTATE_INT32 (out_data_len, SB16State), VMSTATE_INT32 (fmt_stereo, SB16State),