vmstate: Unfold VMSTATE_INT32_VARRAY() only use and remove it

Signed-off-by: NJuan Quintela <quintela@redhat.com>
Signed-off-by: NAnthony Liguori <aliguori@us.ibm.com>

hw/hw.h

@@ -600,12 +600,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, NULL, 0, sizeof(typeof_field(_s, _f)))
 

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