From patchwork Fri Apr 8 20:28:53 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Paolo Bonzini X-Patchwork-Id: 8786011 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 884019F659 for ; Fri, 8 Apr 2016 20:49:02 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id D45CD202B8 for ; Fri, 8 Apr 2016 20:49:01 +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 1D43920172 for ; Fri, 8 Apr 2016 20:49:01 +0000 (UTC) Received: from localhost ([::1]:58216 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1aodKu-0001DJ-GE for patchwork-qemu-devel@patchwork.kernel.org; Fri, 08 Apr 2016 16:49:00 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:40015) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1aod2M-0004XN-JY for qemu-devel@nongnu.org; Fri, 08 Apr 2016 16:29:51 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1aod2L-00029l-JW for qemu-devel@nongnu.org; Fri, 08 Apr 2016 16:29:50 -0400 Received: from mail-wm0-x244.google.com ([2a00:1450:400c:c09::244]:33103) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1aod2L-000295-C4 for qemu-devel@nongnu.org; Fri, 08 Apr 2016 16:29:49 -0400 Received: by mail-wm0-x244.google.com with SMTP id y144so6824064wmd.0 for ; Fri, 08 Apr 2016 13:29:47 -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=Gvk1VcOABMa32Wgffvi3a6Mx7yxxQeQ5Xh0NoIEdMt4/NmOo2gtLVov/FI1UzPWAQi g8hdNTiBqmq2CxAnp+41REUWV+RPntMaPlkoCVs4gYhoKrhVl7f/9RE7XcIJnEElBYcE pETenUPhcAON7wCcvXI30GMENihMX7h7GFj5wCN3WBAaqoSW2gj+nKk9AuBwa12dh4na P41GrWFz9dj3AvFLIQR9jiok39EHMOhOFg5GPlJmfT0bfioN4HlC1m460XR972QCkfxo fiEXeriv5B71MjdMmpvro5Bl3R1orFBAmvbhhcL9aRm7quJrhSr9QeYQBhboyMTaAW+H zUQA== 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=TW39qL2PrjJCJhGFbTlkONieeWEwZaRREeFL17apx1NP9WweFl+iSkJOMdwP85nnd5 cW9ZIjq2ArK2dgalVmdrRbfhjl1Fx+YdAygUBFaPyER88BjifZSYgakbMchy2yI2z1nR K4wR03zHPzh0iC0P20Lg2GJojplyjZ397RSoof3wtAD+cebjtN977m/gkIpoEv7nj+YK EM123X1mlhgZ5/0PJJfiM/CireOW6qIjdcvc6zMLgRPq/+KPSdHPGhhTWcX1dmad0OJ3 val1J6Vc+YAnmzHxfl0FxqdCrHfaBdKQjWz5PHTbdTXtOMx0/Qm2NddVvLEVu9ugL6ab xSbQ== X-Gm-Message-State: AD7BkJJju8kwYZnLyzViKwRssC/+Ba9dURLv4ALFcU0an7CLmcgnTpdSH9jQNpmf27iOUw== X-Received: by 10.28.176.200 with SMTP id z191mr5826345wme.91.1460147386701; Fri, 08 Apr 2016 13:29:46 -0700 (PDT) Received: from 640k.lan (94-39-141-76.adsl-ull.clienti.tiscali.it. [94.39.141.76]) by smtp.gmail.com with ESMTPSA id w10sm3849168wjz.9.2016.04.08.13.29.45 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Fri, 08 Apr 2016 13:29:46 -0700 (PDT) From: Paolo Bonzini To: qemu-devel@nongnu.org Date: Fri, 8 Apr 2016 22:28:53 +0200 Message-Id: <1460147350-7601-34-git-send-email-pbonzini@redhat.com> X-Mailer: git-send-email 1.8.3.1 In-Reply-To: <1460147350-7601-1-git-send-email-pbonzini@redhat.com> References: <1460147350-7601-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::244 Subject: [Qemu-devel] [PATCH 33/50] 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;