From nobody Sun May 19 09:23:43 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1628529084; cv=none; d=zohomail.com; s=zohoarc; b=j9aIBcVCNBJsM584wMpPx+kIr9yVvDEq+xnCZVZT8oX9BunyAfxjjtEC2obrhNgKncm2g0ZM/uCGRNhF+uZsnYId+8bLDaRgnLRiIcx20KzOmrqpmTOuhJk7MTGiJqk64Vixd/GJTUYWNoqxiYhMAGf/U8mqpjw9pC8d4WWdzxA= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1628529084; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:Sender:Subject:To; bh=IYBnJuRIzCgHL2KWgXpf8LNLAVke/rdKMEJfan5NGMU=; b=Aa26+t0k9UauByzcpkal9Yaqavb+soMuHANVwlhZREJwJz0R3mmmU71vdySpk0qi+u/Tc5vqi3rOhayezRuCJm0Bspgh8HUZsAUHf6oUvGtc69BfHU/1eCjE0rWohxWGuC/ZrsACKD2Cvsb9bnO2is4cUFAObGIPirGXCVTjJqo= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass header.from= (p=none dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1628529084135129.64104725511095; Mon, 9 Aug 2021 10:11:24 -0700 (PDT) Received: from localhost ([::1]:49694 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1mD8o6-0000rU-JW for importer@patchew.org; Mon, 09 Aug 2021 13:11:22 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:33266) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1mD8n4-000073-C4 for qemu-devel@nongnu.org; Mon, 09 Aug 2021 13:10:18 -0400 Received: from us-smtp-delivery-124.mimecast.com ([216.205.24.124]:35647) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1mD8n1-0002AT-LF for qemu-devel@nongnu.org; Mon, 09 Aug 2021 13:10:17 -0400 Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-555-Yfsp_y7LNUyzkFX2_wNX7w-1; Mon, 09 Aug 2021 13:10:12 -0400 Received: from smtp.corp.redhat.com (int-mx04.intmail.prod.int.phx2.redhat.com [10.5.11.14]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 64C06801AC0 for ; Mon, 9 Aug 2021 17:10:11 +0000 (UTC) Received: from dgilbert-t580.localhost (unknown [10.39.194.89]) by smtp.corp.redhat.com (Postfix) with ESMTP id DD36C17B73; Mon, 9 Aug 2021 17:10:01 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1628529013; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=IYBnJuRIzCgHL2KWgXpf8LNLAVke/rdKMEJfan5NGMU=; b=VfRJqei8QDIVENOdXetRH7a1AViEbF5bM5P7zuu0HRGPXLeZ38nlA2bEtnRXhmLLskgpc4 UAUeU4WZCBugwpRnt5xEiKhhB1VMowaY60mnaFte7TnxdydESB0QmkaSJQnsjSCyB/QxQx f2iQ5S4NrMwkOk0b1kr9N1pRBj7jiss= X-MC-Unique: Yfsp_y7LNUyzkFX2_wNX7w-1 From: "Dr. David Alan Gilbert (git)" To: qemu-devel@nongnu.org, kraxel@redhat.com, berrange@redhat.com Subject: [PATCH] audio: Never send migration section Date: Mon, 9 Aug 2021 18:09:56 +0100 Message-Id: <20210809170956.78536-1-dgilbert@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.14 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=dgilbert@redhat.com X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: quoted-printable Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=216.205.24.124; envelope-from=dgilbert@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-Spam_score_int: -34 X-Spam_score: -3.5 X-Spam_bar: --- X-Spam_report: (-3.5 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.702, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_LOW=-0.7, RCVD_IN_MSPIKE_H2=-0.001, 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.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: quintela@redhat.com Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: pass (identity @redhat.com) X-ZM-MESSAGEID: 1628529086697100001 Content-Type: text/plain; charset="utf-8" From: "Dr. David Alan Gilbert" The audio migration vmstate is empty, and always has been; we can't just remove it though because an old qemu might send it us. Changes with -audiodev now mean it's sometimes created when it didn't used to be, and can confuse migration to old qemu. Change it so that vmstate_audio is never sent; if it's received it should still be accepted, and old qemu's shouldn't be too upset if it's missing. Signed-off-by: Dr. David Alan Gilbert Reviewed-by: Juan Quintela --- audio/audio.c | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/audio/audio.c b/audio/audio.c index 59453ef856..54a153c0ef 100644 --- a/audio/audio.c +++ b/audio/audio.c @@ -1622,10 +1622,20 @@ void audio_cleanup(void) } } =20 +static bool vmstate_audio_needed(void *opaque) +{ + /* + * Never needed, this vmstate only exists in case + * an old qemu sends it to us. + */ + return false; +} + static const VMStateDescription vmstate_audio =3D { .name =3D "audio", .version_id =3D 1, .minimum_version_id =3D 1, + .needed =3D vmstate_audio_needed, .fields =3D (VMStateField[]) { VMSTATE_END_OF_LIST() } --=20 2.31.1