From patchwork Fri Nov 24 18:26:15 2023 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: 746809 Delivered-To: patch@linaro.org Received: by 2002:a5d:6706:0:b0:32d:baff:b0ca with SMTP id o6csp1685306wru; Fri, 24 Nov 2023 10:26:37 -0800 (PST) X-Google-Smtp-Source: AGHT+IHcPWvOqsNDVcxenNIGA9TXatUt5UA6jSi0XUYz3+xu3MuedSfRAmBN4mZV55ubr1Md5IPk X-Received: by 2002:a05:6358:72a8:b0:16d:da67:7f7e with SMTP id w40-20020a05635872a800b0016dda677f7emr2430348rwf.32.1700850397261; Fri, 24 Nov 2023 10:26:37 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1700850397; cv=none; d=google.com; s=arc-20160816; b=XrzMyaGE20u/5pcvfOVbdNM74iH4nIW4chOPEcld059QeDNR7wgKYadsfdcNbjVx1f 0+2+nKKWrf83+W8X/0uM5d+tCQTQY0DmM67UNDerOqZLU+YNx62QTBhPb7Twk6sniF1Q iSe6jV7R7N39xm/L4udMpLBMa8sA7JEYSWNcxj4mw+rGlHE8gOZoh/zEFhWOZj8IkXr9 rmzZ5UO3cVCTv4HDz35xVpsSTKxEsBk2IxE8t77ytRuYIepMkg6qmy8LpQJUDWtTXuiG tQ/qJ7ecC3qmXZMlAy02tiZxSDApqr2O+XYyRIOH80wQ/laGFg9DMA+y+8Od1RicSgRW 7sXw== 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:message-id:date:subject:cc:to:from:dkim-signature; bh=hl3E70c6a9Q8499TAB0+ujpGO1/+WwcO05W9cq9qSTg=; fh=4Qrrx4wdS5AkOrEXAj6Tx4aJV5VT1RAJVoCqBJbdmZM=; b=iadromo+J6bdI8nwzWBwOHUwdjMmRG2P+8z4nkQR/SawZA+MtG14PwZQzAloM+sNrp HoEv4zJCZZFrplraHwZcIK05CSsCOwpnSglKcHLzjWa/4yIjNWgtK1+7yjaL/9kXaRtM rLQMI0ir67LL1xjA1ZoxiEKViZiIw/k+53/7D6xnM2wxUmcj8zKcWOCOUBJ4v/AkhRHV aHufphZgPd+oQz+SzzrFpns9ry5RYKX/+U83qx2BZcgbZU2tNDIGgkNZgHRNmHXfpcgQ jmthwv929BxT/CG/B7xBqv0f5+wdoYNQ49ZkVjykNBdPAJR58SpSFTsy0idPjhSdIqPc 10Pw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=BkEgRYCA; 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 x7-20020a1f4a07000000b004a948aae21fsi1289331vka.312.2023.11.24.10.26.37 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Fri, 24 Nov 2023 10:26:37 -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=BkEgRYCA; 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 1r6ash-0007Po-Ft; Fri, 24 Nov 2023 13:26:23 -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 1r6asf-0007OJ-RB for qemu-devel@nongnu.org; Fri, 24 Nov 2023 13:26:21 -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 1r6asd-0001mS-Gj for qemu-devel@nongnu.org; Fri, 24 Nov 2023 13:26:21 -0500 Received: by mail-wr1-x42e.google.com with SMTP id ffacd0b85a97d-332e40322f0so1193607f8f.3 for ; Fri, 24 Nov 2023 10:26:19 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1700850377; x=1701455177; darn=nongnu.org; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:from:to:cc:subject:date:message-id:reply-to; bh=hl3E70c6a9Q8499TAB0+ujpGO1/+WwcO05W9cq9qSTg=; b=BkEgRYCAVyHF6B/2QHZAe0sk+q+H28YpSpRi+bJ5Stupp1mtjjejL0eNGdjjR9cciL UGAJkHQzBqbYypgfOxx7p1hju0NGlZoi4NiXvWUObdSJIXP/jlD7ytu043JBHig8kIQw vJO3I7r1VRsohl+ZCgMAmCU0e5Tq+UZmWhS/pqRWw4WRw+7JrV0FplbH8me5DuV6ekRj 0TrPv0CJVYLdqSPoE0ZV7RgQZ42EgYNiNSAeL233UO9TbnKqqulK70kcu3NTJg0Xl95F GP/eNd1L+0zcmySC8kLPOvnIrq3/Z0RIOUdrmcaBM+P7p71G2Ba95L4Zl1gbI2J05VpV 632A== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1700850377; x=1701455177; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:x-gm-message-state:from:to:cc:subject:date:message-id :reply-to; bh=hl3E70c6a9Q8499TAB0+ujpGO1/+WwcO05W9cq9qSTg=; b=ucCMDdkSxtjvvMbY07E841GelABnq4qOiVRQK0Rsm2FHGPtTUP8bq9w/i1Cpkwi3hA t3xm1CEYlIwF4pq2l25Ef6mhRiVHNMlPDTtEeQ68RRfXEZzyWPgBJrCLdRRTEbTl7lAR z5ThA49Eiffe5vXrg22igg79exO3BeSU4eCMdaCyOrMj+mly2Fz+cfjZ4pJAuVZdPGGt 8+ehlik3qYOsCJAD//FqTs4ILkoopNUOkjB+5B1e61aimnFP6EHwlC3jkvDMSYwfwk8/ y4YPJ8kAmaHtiqd7SpP+/MS2WhOTRzMZs47sJbib5I8Adv0dqzSMVs0EJlpnVXhDvNGL MZ1w== X-Gm-Message-State: AOJu0YzZfQBkvOJ56TrzABdC0U2awSjDqPhyq3nPLt8XFAZdAK3wHDSV sgPeK6FeLuYAJuTCOm/ULHy9AKDA1d5VKgCKyB8= X-Received: by 2002:a05:6000:1188:b0:332:ef1e:bb86 with SMTP id g8-20020a056000118800b00332ef1ebb86mr334041wrx.1.1700850377533; Fri, 24 Nov 2023 10:26:17 -0800 (PST) Received: from m1x-phil.lan ([176.187.218.17]) by smtp.gmail.com with ESMTPSA id q1-20020a5d6581000000b00331a55d3875sm4886499wru.38.2023.11.24.10.26.16 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Fri, 24 Nov 2023 10:26:17 -0800 (PST) From: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: Juan Quintela , Gerd Hoffmann , =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= Subject: [PATCH] hw/audio/sb16: Do not migrate qdev properties Date: Fri, 24 Nov 2023 19:26:15 +0100 Message-ID: <20231124182615.94943-1-philmd@linaro.org> X-Mailer: git-send-email 2.41.0 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 has 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 --- 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 18f6d252db..be614d7bc3 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 = (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),