From patchwork Wed Mar 16 10:46:43 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Paolo Bonzini X-Patchwork-Id: 8598271 Return-Path: X-Original-To: patchwork-qemu-devel@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork1.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.136]) by patchwork1.web.kernel.org (Postfix) with ESMTP id BF21C9F3D1 for ; Wed, 16 Mar 2016 11:05:42 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 113902008F for ; Wed, 16 Mar 2016 11:05:42 +0000 (UTC) Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 605832026C for ; Wed, 16 Mar 2016 11:05:41 +0000 (UTC) Received: from localhost ([::1]:55091 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ag9Gm-0002mL-KM for patchwork-qemu-devel@patchwork.kernel.org; Wed, 16 Mar 2016 07:05:40 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:37177) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ag8zM-0003Vn-I3 for qemu-devel@nongnu.org; Wed, 16 Mar 2016 06:47:43 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1ag8zL-0002Ds-JU for qemu-devel@nongnu.org; Wed, 16 Mar 2016 06:47:40 -0400 Received: from mail-wm0-x22d.google.com ([2a00:1450:400c:c09::22d]:33735) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ag8zL-0002DY-Df for qemu-devel@nongnu.org; Wed, 16 Mar 2016 06:47:39 -0400 Received: by mail-wm0-x22d.google.com with SMTP id l68so183852816wml.0 for ; Wed, 16 Mar 2016 03:47:39 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=sender:from:to:subject:date:message-id:in-reply-to:references; bh=QE0ug6xc82xPlSFYQO2YE9z1SPibFrreEFRvQnvkmUo=; b=Xzqw9WgU8Hv/4wsapdkQPAfYsqudwsZmtZce5yzX+YCbqUu1lTh6vDGgDLbQfn1mqD Th/Roen9DaWSDCYNqvhwUWJN23K69w1XiUcEV5LYxNQueRxCb1Nw+WYfS/eRwpHh+fco oZZJt6ZQ1eOVfdmFyXyt2Q0o9vjM8/9DSTa2nQYZl4S4MBqyTxGesSKQpoc6ZtF6VLQG QiCR9I+rivIwcPHmoZrUZNqHnHfubE6rq+FHBNV9OJVNApBURozQ/ilLxETfA3UMAr2K HjiQuMF2hLYeKAifBjBgqYvkibbjTT/oXRy+6+76QZzS49zscZn0PnEadBgbv6fTO9CR +Weg== 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:subject:date:message-id :in-reply-to:references; bh=QE0ug6xc82xPlSFYQO2YE9z1SPibFrreEFRvQnvkmUo=; b=Tpb15UJ49+okmrLZPg3tgjay7OpvJSniGQ3xYS75hYqkznG9tLuuaAg8fBo2TamNVn 7Dfxga3jdps735RRhmjGT2UxEyvxr/a4ld1Gib8WKznpWCIt9w53+lGc5tFnIitWROEj ovTEQs2jI1m4czJV5oOfW8xTTrgQ3SoQ7vmDIil4rfSi0vvKSDGpah7NS1Fea8wzre28 4oVuCA+oaGKDRF/A7bL9XqEe3BndDRnqIY4mHf4VZ8b9wA1sik3dWG8u9KDp3wHIWoe0 vgtk5UpTDslj0EsdMTSt7Vm8UFw8CvVdzJ/6Hcj83WfoBcdagJj6sV5NqB1TmD4ufGEk g9qA== X-Gm-Message-State: AD7BkJI5tyhY4NNQZE15KBosaHmpSQKHlZUa4BRcHBhkPy6tM20vUTdsj1vLmN54uN6v6A== X-Received: by 10.28.73.66 with SMTP id w63mr3731230wma.53.1458125258806; Wed, 16 Mar 2016 03:47:38 -0700 (PDT) Received: from 640k.lan (94-39-161-17.adsl-ull.clienti.tiscali.it. [94.39.161.17]) by smtp.gmail.com with ESMTPSA id wr2sm2418094wjc.49.2016.03.16.03.47.37 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 16 Mar 2016 03:47:37 -0700 (PDT) From: Paolo Bonzini To: qemu-devel@nongnu.org Date: Wed, 16 Mar 2016 11:46:43 +0100 Message-Id: <1458125219-131698-34-git-send-email-pbonzini@redhat.com> X-Mailer: git-send-email 1.8.3.1 In-Reply-To: <1458125219-131698-1-git-send-email-pbonzini@redhat.com> References: <1458125219-131698-1-git-send-email-pbonzini@redhat.com> X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 2a00:1450:400c:c09::22d Subject: [Qemu-devel] [PATCH 33/49] hw: do not use VMSTATE_*TL X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+patchwork-qemu-devel=patchwork.kernel.org@nongnu.org Sender: qemu-devel-bounces+patchwork-qemu-devel=patchwork.kernel.org@nongnu.org X-Spam-Status: No, score=-6.8 required=5.0 tests=BAYES_00,DKIM_SIGNED, RCVD_IN_DNSWL_HI, T_DKIM_INVALID, UNPARSEABLE_RELAY autolearn=ham version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP Reserve this to CPU state serialization. Luckily, they were only used by sPAPR devices and these are ppc64 only. So there is no change to migration format. Signed-off-by: Paolo Bonzini --- hw/net/spapr_llan.c | 8 ++++---- hw/ppc/spapr_vio.c | 2 +- include/hw/ppc/spapr_vio.h | 2 +- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/hw/net/spapr_llan.c b/hw/net/spapr_llan.c index 6aa06cc..e08c20e 100644 --- a/hw/net/spapr_llan.c +++ b/hw/net/spapr_llan.c @@ -93,9 +93,9 @@ typedef struct VIOsPAPRVLANDevice { NICConf nicconf; NICState *nic; bool isopen; - target_ulong buf_list; + hwaddr buf_list; uint32_t add_buf_ptr, use_buf_ptr, rx_bufs; - target_ulong rxq_ptr; + hwaddr rxq_ptr; } VIOsPAPRVLANDevice; static int spapr_vlan_can_receive(NetClientState *nc) @@ -522,11 +522,11 @@ static const VMStateDescription vmstate_spapr_llan = { VMSTATE_SPAPR_VIO(sdev, VIOsPAPRVLANDevice), /* LLAN state */ VMSTATE_BOOL(isopen, VIOsPAPRVLANDevice), - VMSTATE_UINTTL(buf_list, VIOsPAPRVLANDevice), + VMSTATE_UINT64(buf_list, VIOsPAPRVLANDevice), VMSTATE_UINT32(add_buf_ptr, VIOsPAPRVLANDevice), VMSTATE_UINT32(use_buf_ptr, VIOsPAPRVLANDevice), VMSTATE_UINT32(rx_bufs, VIOsPAPRVLANDevice), - VMSTATE_UINTTL(rxq_ptr, VIOsPAPRVLANDevice), + VMSTATE_UINT64(rxq_ptr, VIOsPAPRVLANDevice), VMSTATE_END_OF_LIST() }, diff --git a/hw/ppc/spapr_vio.c b/hw/ppc/spapr_vio.c index 8aa021f..6b20b40 100644 --- a/hw/ppc/spapr_vio.c +++ b/hw/ppc/spapr_vio.c @@ -584,7 +584,7 @@ const VMStateDescription vmstate_spapr_vio = { VMSTATE_UINT32_EQUAL(irq, VIOsPAPRDevice), /* General VIO device state */ - VMSTATE_UINTTL(signal_state, VIOsPAPRDevice), + VMSTATE_UINT64(signal_state, VIOsPAPRDevice), VMSTATE_UINT64(crq.qladdr, VIOsPAPRDevice), VMSTATE_UINT32(crq.qsize, VIOsPAPRDevice), VMSTATE_UINT32(crq.qnext, VIOsPAPRDevice), diff --git a/include/hw/ppc/spapr_vio.h b/include/hw/ppc/spapr_vio.h index c9733e7..5f8b042 100644 --- a/include/hw/ppc/spapr_vio.h +++ b/include/hw/ppc/spapr_vio.h @@ -61,7 +61,7 @@ struct VIOsPAPRDevice { DeviceState qdev; uint32_t reg; uint32_t irq; - target_ulong signal_state; + uint64_t signal_state; VIOsPAPR_CRQ crq; AddressSpace as; MemoryRegion mrroot;