From patchwork Thu May 19 11:18:29 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Paolo Bonzini X-Patchwork-Id: 9126971 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 5BC499FCE6 for ; Thu, 19 May 2016 11:45:10 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id A890E20212 for ; Thu, 19 May 2016 11:45:08 +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 EFE9E2020F for ; Thu, 19 May 2016 11:45:07 +0000 (UTC) Received: from localhost ([::1]:49813 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1b3MO2-0002I1-VF for patchwork-qemu-devel@patchwork.kernel.org; Thu, 19 May 2016 07:45:07 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:37102) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1b3LzC-0004T9-Fm for qemu-devel@nongnu.org; Thu, 19 May 2016 07:19:27 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1b3LzB-0004E9-Cn for qemu-devel@nongnu.org; Thu, 19 May 2016 07:19:26 -0400 Received: from mail-wm0-x242.google.com ([2a00:1450:400c:c09::242]:32772) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1b3LzA-0004DR-Ke for qemu-devel@nongnu.org; Thu, 19 May 2016 07:19:25 -0400 Received: by mail-wm0-x242.google.com with SMTP id r12so20129486wme.0 for ; Thu, 19 May 2016 04:19:24 -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=xonB+0fOsLa9unWuf6lcBn51MvBGqWHKfh6hGZVlD3I=; b=WJkEecYSGnaNZUiXO242tBZ43bIcaP5zgn8DW7s+x32gaxZvq5G14gEBs6/ApvTweb mUnSp/ON1bCLjza1C9sidSvBSfVILwV9K4sZ64FQTpwb8LXgQdDLCsRtlj5hDqXSc61T uCGzjpnBC9w2jO35mfEMfgf3s6MaxZx1ZS6RlFlZ3UpFDDnP8nM3+LJn/6fgsQUF7BZJ 9qtwRMqnH5yW8XPFRy54Oj4qWtcXwJFcczwXLe4JThfx7WDZsIQvimGJT7W/XBqW+oOk EqNPX7O0RzlTk0dyVvuASlFrnjg8nQisD5klLiRjgr7q7Y8Nfo6wI19lDsuaf8Szo9q4 jEuw== 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=xonB+0fOsLa9unWuf6lcBn51MvBGqWHKfh6hGZVlD3I=; b=OAEZ/BVq3h36vTzassd9K64Dxx0sf8VJNSP3Ncgi5440805Dif0+wugw0oFUfodlpV r1i3wVP5mNis3+oGtPTVARF2f7BEGX5dE21Zq8mCaj8dAvexWE+9XOY937ztx9YIhZo5 ZJUad5mj1SXvY5HIPLNQIQghwOfDINQ8Y2u9zqSLr92f7RkoNt1Ph33KyfMSDfQVcZXl 4daMwR2msh4h+dHNXMwhezZCzl8YD152mWPXKzWrHphfq8G3b/zvhVn8majl5SWGt7EJ tOrmg1peySl9X0Qy+xJQd+8uj04bQpwm9iajZacXcAQO5G2frZQRi3MuctlLBAVv9iYZ Bmiw== X-Gm-Message-State: AOPr4FXXXRCx5zRQ52eh2/q9zuE1VxZz6xBL+Q2SaJnauvSpKShu8V2wpJ6XJPxjV016jw== X-Received: by 10.28.169.11 with SMTP id s11mr37275620wme.62.1463656764085; Thu, 19 May 2016 04:19:24 -0700 (PDT) Received: from 640k.lan (dynamic-adsl-78-12-252-58.clienti.tiscali.it. [78.12.252.58]) by smtp.gmail.com with ESMTPSA id c7sm8374317wji.38.2016.05.19.04.19.23 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 19 May 2016 04:19:23 -0700 (PDT) From: Paolo Bonzini To: qemu-devel@nongnu.org Date: Thu, 19 May 2016 13:18:29 +0200 Message-Id: <1463656726-35952-36-git-send-email-pbonzini@redhat.com> X-Mailer: git-send-email 1.8.3.1 In-Reply-To: <1463656726-35952-1-git-send-email-pbonzini@redhat.com> References: <1463656726-35952-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::242 Subject: [Qemu-devel] [PULL 35/52] hw: do not use VMSTATE_*TL 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: , Errors-To: qemu-devel-bounces+patchwork-qemu-devel=patchwork.kernel.org@nongnu.org Sender: "Qemu-devel" 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 a647f25..db97da3 100644 --- a/hw/net/spapr_llan.c +++ b/hw/net/spapr_llan.c @@ -106,9 +106,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; uint32_t compat_flags; /* Compatability flags for migration */ RxBufPool *rx_pool[RX_MAX_POOLS]; /* Receive buffer descriptor pools */ } VIOsPAPRVLANDevice; @@ -765,11 +765,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;