From patchwork Mon Oct 19 18:42:57 2009 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Juan Quintela X-Patchwork-Id: 36403 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [199.232.76.165]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (Client did not present a certificate) by ozlabs.org (Postfix) with ESMTPS id 485C2B7B72 for ; Tue, 20 Oct 2009 06:05:30 +1100 (EST) Received: from localhost ([127.0.0.1]:38344 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1MzxXr-0007Oc-Fz for incoming@patchwork.ozlabs.org; Mon, 19 Oct 2009 15:05:27 -0400 Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43) id 1MzxD8-0006AG-NJ for qemu-devel@nongnu.org; Mon, 19 Oct 2009 14:44:02 -0400 Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43) id 1MzxD3-00066X-24 for qemu-devel@nongnu.org; Mon, 19 Oct 2009 14:44:01 -0400 Received: from [199.232.76.173] (port=49045 helo=monty-python.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1MzxD2-00066C-Fd for qemu-devel@nongnu.org; Mon, 19 Oct 2009 14:43:56 -0400 Received: from mx1.redhat.com ([209.132.183.28]:30101) by monty-python.gnu.org with esmtp (Exim 4.60) (envelope-from ) id 1MzxD1-0006KC-S8 for qemu-devel@nongnu.org; Mon, 19 Oct 2009 14:43:56 -0400 Received: from int-mx04.intmail.prod.int.phx2.redhat.com (int-mx04.intmail.prod.int.phx2.redhat.com [10.5.11.17]) by mx1.redhat.com (8.13.8/8.13.8) with ESMTP id n9JIhtu7005000 for ; Mon, 19 Oct 2009 14:43:55 -0400 Received: from localhost.localdomain (ovpn01.gateway.prod.ext.phx2.redhat.com [10.5.9.1]) by int-mx04.intmail.prod.int.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id n9JIhcC5012656; Mon, 19 Oct 2009 14:43:54 -0400 From: Juan Quintela To: qemu-devel@nongnu.org Date: Mon, 19 Oct 2009 20:42:57 +0200 Message-Id: In-Reply-To: References: In-Reply-To: References: X-Scanned-By: MIMEDefang 2.67 on 10.5.11.17 X-detected-operating-system: by monty-python.gnu.org: Genre and OS details not recognized. Subject: [Qemu-devel] [PATCH 12/25] vmstate: Unfold VMSTATE_INT32_VARRAY() only use and remove it X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: qemu-devel.nongnu.org List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Signed-off-by: Juan Quintela --- hw/hw.h | 6 ------ hw/pci.c | 2 +- 2 files changed, 1 insertions(+), 7 deletions(-) diff --git a/hw/hw.h b/hw/hw.h index dd065c8..5edfff7 100644 --- a/hw/hw.h +++ b/hw/hw.h @@ -599,12 +599,6 @@ extern const VMStateDescription vmstate_i2c_slave; #define VMSTATE_INT32_ARRAY(_f, _s, _n) \ VMSTATE_INT32_ARRAY_V(_f, _s, _n, 0) -#define VMSTATE_INT32_VARRAY_V(_f, _s, _f_n, _v) \ - VMSTATE_VARRAY_INT32(_f, _s, _f_n, _v, vmstate_info_int32, int32_t) - -#define VMSTATE_INT32_VARRAY(_f, _s, _f_n) \ - VMSTATE_INT32_VARRAY_V(_f, _s, _f_n, 0) - #define VMSTATE_BUFFER_V(_f, _s, _v) \ VMSTATE_STATIC_BUFFER(_f, _s, _v, 0, sizeof(typeof_field(_s, _f))) diff --git a/hw/pci.c b/hw/pci.c index abf07ca..a632818 100644 --- a/hw/pci.c +++ b/hw/pci.c @@ -79,7 +79,7 @@ static const VMStateDescription vmstate_pcibus = { .minimum_version_id_old = 1, .fields = (VMStateField []) { VMSTATE_INT32_EQUAL(nirq, PCIBus), - VMSTATE_INT32_VARRAY(irq_count, PCIBus, nirq), + VMSTATE_VARRAY_INT32(irq_count, PCIBus, nirq, 0, vmstate_info_int32, int32_t), VMSTATE_END_OF_LIST() } };