From patchwork Mon Mar 18 17:41:20 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Peter Maydell X-Patchwork-Id: 15412 Return-Path: X-Original-To: patchwork@peony.canonical.com Delivered-To: patchwork@peony.canonical.com Received: from fiordland.canonical.com (fiordland.canonical.com [91.189.94.145]) by peony.canonical.com (Postfix) with ESMTP id 25E3723E00 for ; Mon, 18 Mar 2013 17:41:24 +0000 (UTC) Received: from mail-vb0-f43.google.com (mail-vb0-f43.google.com [209.85.212.43]) by fiordland.canonical.com (Postfix) with ESMTP id B7DF3A186AD for ; Mon, 18 Mar 2013 17:41:23 +0000 (UTC) Received: by mail-vb0-f43.google.com with SMTP id fs19so3517277vbb.16 for ; Mon, 18 Mar 2013 10:41:23 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20120113; h=x-received:x-forwarded-to:x-forwarded-for:delivered-to:x-received :received-spf:from:to:cc:subject:date:message-id:x-mailer :x-gm-message-state; bh=iUxEpbuWNjAUu5NGGQwA1blIJ/M20A6FEh4Eq+GHB7o=; b=bpBmZrupkL7Qd7yioL74YtKB7FrQzJrwMTr31TiQsd/2gL5FU5D1OJdqkSlaT7nW35 EgY/E547Qkmmqwt6MArR38ygEnH3Xl5Nq2zH3ulMWprBZ6v6ADw23HtmZUl5XbG4lvXe mnikz+kS5BXDnQFGYyejhkSLCtRiutYN5SsWWoaauiZNEnYvUt+n7JfVePbklLUCcSTi 7vgXeaRdrSlEwmci0Kld7FcIswlhWxkNxwFVekeDzGcOIJJJVwYLhTmmzmj4HRtEvJs3 LThHQB6bbsa+ICCIj3rcfQM20pbFBkcfmqv9TZ9syqonfXV907XtWLdBwTr/uWlxmCl3 kzxA== X-Received: by 10.52.177.163 with SMTP id cr3mr18229001vdc.94.1363628483205; Mon, 18 Mar 2013 10:41:23 -0700 (PDT) X-Forwarded-To: linaro-patchwork@canonical.com X-Forwarded-For: patch@linaro.org linaro-patchwork@canonical.com Delivered-To: patches@linaro.org Received: by 10.58.127.98 with SMTP id nf2csp38801veb; Mon, 18 Mar 2013 10:41:22 -0700 (PDT) X-Received: by 10.194.92.65 with SMTP id ck1mr26921023wjb.54.1363628482021; Mon, 18 Mar 2013 10:41:22 -0700 (PDT) Received: from mnementh.archaic.org.uk (1.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.d.1.0.0.b.8.0.1.0.0.2.ip6.arpa. [2001:8b0:1d0::1]) by mx.google.com with ESMTPS id kq5si6689198wjb.178.2013.03.18.10.41.21 (version=TLSv1 cipher=RC4-SHA bits=128/128); Mon, 18 Mar 2013 10:41:21 -0700 (PDT) Received-SPF: neutral (google.com: 2001:8b0:1d0::1 is neither permitted nor denied by best guess record for domain of pm215@archaic.org.uk) client-ip=2001:8b0:1d0::1; Authentication-Results: mx.google.com; spf=neutral (google.com: 2001:8b0:1d0::1 is neither permitted nor denied by best guess record for domain of pm215@archaic.org.uk) smtp.mail=pm215@archaic.org.uk Received: from pm215 by mnementh.archaic.org.uk with local (Exim 4.72) (envelope-from ) id 1UHe3k-0007d7-Cs; Mon, 18 Mar 2013 17:41:20 +0000 From: Peter Maydell To: qemu-devel@nongnu.org Cc: patches@linaro.org Subject: [PATCH] pl050: Don't send always-constant is_mouse field Date: Mon, 18 Mar 2013 17:41:20 +0000 Message-Id: <1363628480-29306-1-git-send-email-peter.maydell@linaro.org> X-Mailer: git-send-email 1.7.2.5 X-Gm-Message-State: ALoCoQlUtGw3V0C02JUd0M2eaytcj2WrI1MiUdDmSFzGZWy+w1V6Q/YYI0arKddfOi0z8zU8BNk1 The is_mouse field of the pl050 state structure is constant (it tracks whether this is a 'pl050_keyboard' or 'pl050_mouse'), so there's no need to include it in the VMState structure. Signed-off-by: Peter Maydell --- It doesn't hurt to carry around the is_mouse field, I guess, but I thought it nicer to do the cleanup now while we still don't care about between version migration. hw/pl050.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/hw/pl050.c b/hw/pl050.c index bc31ab6..76735a0 100644 --- a/hw/pl050.c +++ b/hw/pl050.c @@ -24,14 +24,13 @@ typedef struct { static const VMStateDescription vmstate_pl050 = { .name = "pl050", - .version_id = 1, - .minimum_version_id = 1, + .version_id = 2, + .minimum_version_id = 2, .fields = (VMStateField[]) { VMSTATE_UINT32(cr, pl050_state), VMSTATE_UINT32(clk, pl050_state), VMSTATE_UINT32(last, pl050_state), VMSTATE_INT32(pending, pl050_state), - VMSTATE_INT32(is_mouse, pl050_state), VMSTATE_END_OF_LIST() } };