From patchwork Mon Nov 28 22:40:35 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Paolo Bonzini X-Patchwork-Id: 700185 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [IPv6:2001:4830:134:3::11]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 3tSMMl6FMBz9vDt for ; Tue, 29 Nov 2016 09:50:27 +1100 (AEDT) Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="UVpPNQ61"; dkim-atps=neutral Received: from localhost ([::1]:33522 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1cBUkj-0000Kc-0d for incoming@patchwork.ozlabs.org; Mon, 28 Nov 2016 17:50:25 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:50486) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1cBUcO-0002If-3C for qemu-devel@nongnu.org; Mon, 28 Nov 2016 17:41:48 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1cBUcL-0002rQ-Bf for qemu-devel@nongnu.org; Mon, 28 Nov 2016 17:41:48 -0500 Received: from mail-wm0-f66.google.com ([74.125.82.66]:33161) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1cBUcL-0002r9-5a for qemu-devel@nongnu.org; Mon, 28 Nov 2016 17:41:45 -0500 Received: by mail-wm0-f66.google.com with SMTP id u144so21427943wmu.0 for ; Mon, 28 Nov 2016 14:41:45 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references; bh=2R7a9avEcCzsbrmMF7AkqW0B72GxpA8aclbXQ8DraZ0=; b=UVpPNQ61NoS42Ep5bMDW9iJ0Q/AzjdYwONpzx9ilfM7bfPa3pzL3qfoeGM9JDQkQe0 lOt5Ex92ggSt8EQ2COHbdfCUW17W6JprFd6P+HDF7lydV/270m8OB07fhRCBquOSMtwA FuGFthQFDqaCXu91ZHQIRWT2WIf3v2HCqcRmSf1+u+N3LThwY7ZtPteVgoqAPmNFWdGU +R78BmtQTgTL1HEI3lErsLQLDwZSGWw0635nRoeRGAAoXjkzpLTplKrTRIQ5V1cz/cVV hflGOvlqc+A8OoXdDB/mbUKRacTRpInDC2i89z2dT9x0Yz2dxVLwoWwhRZVcJHCbBnxw 8HkQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :in-reply-to:references; bh=2R7a9avEcCzsbrmMF7AkqW0B72GxpA8aclbXQ8DraZ0=; b=Y583z17byqmG4tLNy7MHOWcx+i9rAYhpdOipVkZgcZYiTWXKmI1+XqHDmUanZIX3/k 7aRmd0DcS7ONr4IyDl6TdkVY/OpVBVRZdH4m4o9ZUla1VDrSQX20Lm26LR0TEHu5FO3Z FTwL3Aevkf5Wv1cXdVZ3IbDryz6GDcBem0bfWpDSwPEbTUGvYNItlPUVUdUq5OoZ36Hy c3e6NZ0AEbKVIOwj8JvkwqI6rob7YJyYkqPDXBZDNyp6oXxekpmXIyZyOrBcI4Fn6T3W rZTdqtdqnjorPSHcNZnU35GZvzSfnmiL+oiRdG66MHxwMQWjZfyrsNQJa6twOgsXA+8d y0lA== X-Gm-Message-State: AKaTC019rJlhS77sh/3dZhpVgGWTGTzuirWT9VLSCn6Kk2DMZzdspmnFD0yYtMplLpnZww== X-Received: by 10.28.189.69 with SMTP id n66mr20345953wmf.35.1480372844085; Mon, 28 Nov 2016 14:40:44 -0800 (PST) Received: from 640k.lan (94-39-142-71.adsl-ull.clienti.tiscali.it. [94.39.142.71]) by smtp.gmail.com with ESMTPSA id x5sm64602508wje.36.2016.11.28.14.40.42 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 28 Nov 2016 14:40:43 -0800 (PST) From: Paolo Bonzini To: qemu-devel@nongnu.org Date: Mon, 28 Nov 2016 23:40:35 +0100 Message-Id: <1480372837-109736-5-git-send-email-pbonzini@redhat.com> X-Mailer: git-send-email 1.8.3.1 In-Reply-To: <1480372837-109736-1-git-send-email-pbonzini@redhat.com> References: <1480372837-109736-1-git-send-email-pbonzini@redhat.com> X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] [fuzzy] X-Received-From: 74.125.82.66 Subject: [Qemu-devel] [PULL 4/6] migration/pcspk: Add a property to state if pcspk is migrated X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: "Dr. David Alan Gilbert" Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: "Qemu-devel" From: "Dr. David Alan Gilbert" Allow us to turn migration of pcspk off for compatibility. Signed-off-by: Dr. David Alan Gilbert Message-Id: <20161128133201.16104-2-dgilbert@redhat.com> Signed-off-by: Paolo Bonzini --- hw/audio/pcspk.c | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/hw/audio/pcspk.c b/hw/audio/pcspk.c index 984534b..7980022 100644 --- a/hw/audio/pcspk.c +++ b/hw/audio/pcspk.c @@ -54,6 +54,7 @@ typedef struct { unsigned int play_pos; uint8_t data_on; uint8_t dummy_refresh_clock; + bool migrate; } PCSpkState; static const char *s_spk = "pcspk"; @@ -187,11 +188,19 @@ static void pcspk_realizefn(DeviceState *dev, Error **errp) pcspk_state = s; } +static bool migrate_needed(void *opaque) +{ + PCSpkState *s = opaque; + + return s->migrate; +} + static const VMStateDescription vmstate_spk = { .name = "pcspk", .version_id = 1, .minimum_version_id = 1, .minimum_version_id_old = 1, + .needed = migrate_needed, .fields = (VMStateField[]) { VMSTATE_UINT8(data_on, PCSpkState), VMSTATE_UINT8(dummy_refresh_clock, PCSpkState), @@ -201,6 +210,7 @@ static const VMStateDescription vmstate_spk = { static Property pcspk_properties[] = { DEFINE_PROP_UINT32("iobase", PCSpkState, iobase, -1), + DEFINE_PROP_BOOL("migrate", PCSpkState, migrate, true), DEFINE_PROP_END_OF_LIST(), };