From c7bde572058ab22ee166f5040a34bbb2a3c97f7a Mon Sep 17 00:00:00 2001 From: Juan Quintela Date: Fri, 16 Oct 2009 13:29:48 +0200 Subject: [PATCH] vmstate: Unfold VMSTATE_INT32_VARRAY() only use and remove it Signed-off-by: Juan Quintela Signed-off-by: Anthony Liguori --- hw/hw.h | 6 ------ hw/pci.c | 2 +- 2 files changed, 1 insertion(+), 7 deletions(-) diff --git a/hw/hw.h b/hw/hw.h index 2a9d0bd421..531031dc1f 100644 --- a/hw/hw.h +++ b/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))) diff --git a/hw/pci.c b/hw/pci.c index 553febbdea..ef134f7e5c 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() } };