Patchwork [12/25] vmstate: Unfold VMSTATE_INT32_VARRAY() only use and remove it

login
register
mail settings
Submitter Juan Quintela
Date Oct. 19, 2009, 6:42 p.m.
Message ID <da0c01e81ffc068583688a1a3ad3554a9e62eb21.1255976538.git.quintela@redhat.com>
Download mbox | patch
Permalink /patch/36403/
State New
Headers show

Comments

Juan Quintela - Oct. 19, 2009, 6:42 p.m.
Signed-off-by: Juan Quintela <quintela@redhat.com>
---
 hw/hw.h  |    6 ------
 hw/pci.c |    2 +-
 2 files changed, 1 insertions(+), 7 deletions(-)

Patch

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()
     }
 };