vmstate: Unfold VMSTATE_INT32_VARRAY() only use and remove it

Signed-off-by: Juan Quintela <quintela@redhat.com>
Signed-off-by: Anthony Liguori <aliguori@us.ibm.com>
diff --git a/hw/pci.c b/hw/pci.c
index 553febb..ef134f7 100644
--- a/hw/pci.c
+++ b/hw/pci.c
@@ -79,7 +79,7 @@
     .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()
     }
 };