Message ID | 1396618620-27823-28-git-send-email-imammedo@redhat.com |
---|---|
State | New |
Headers | show |
Il 04/04/2014 15:36, Igor Mammedov ha scritto: > Adds an optional vmstate field that allows to migrate current > state of acpi_memory_hotplug of ACPI PM device. > > Signed-off-by: Igor Mammedov <imammedo@redhat.com> > --- > hw/acpi/ich9.c | 8 ++++++++ > hw/acpi/memory_hotplug.c | 27 +++++++++++++++++++++++++++ > hw/acpi/piix4.c | 8 ++++++++ > include/hw/acpi/memory_hotplug.h | 7 +++++++ > 4 files changed, 50 insertions(+) > > diff --git a/hw/acpi/ich9.c b/hw/acpi/ich9.c > index 86c45ba..e566f7e 100644 > --- a/hw/acpi/ich9.c > +++ b/hw/acpi/ich9.c > @@ -140,6 +140,12 @@ static int ich9_pm_post_load(void *opaque, int version_id) > .offset = vmstate_offset_pointer(_state, _field, uint8_t), \ > } > > +static bool vmstate_test_use_memhp(void *opaque, int version_id) > +{ > + ICH9LPCPMRegs *s = opaque; > + return s->acpi_memory_hotplug.is_enabled; > +} > + > const VMStateDescription vmstate_ich9_pm = { > .name = "ich9_pm", > .version_id = 1, > @@ -156,6 +162,8 @@ const VMStateDescription vmstate_ich9_pm = { > VMSTATE_GPE_ARRAY(acpi_regs.gpe.en, ICH9LPCPMRegs), > VMSTATE_UINT32(smi_en, ICH9LPCPMRegs), > VMSTATE_UINT32(smi_sts, ICH9LPCPMRegs), > + VMSTATE_MEMORY_HOTPLUG(acpi_memory_hotplug, > + ICH9LPCPMRegs, vmstate_test_use_memhp), > VMSTATE_END_OF_LIST() > } > }; > diff --git a/hw/acpi/memory_hotplug.c b/hw/acpi/memory_hotplug.c > index a5c3ef4..7d33cd7 100644 > --- a/hw/acpi/memory_hotplug.c > +++ b/hw/acpi/memory_hotplug.c > @@ -155,3 +155,30 @@ void acpi_memory_plug_cb(ACPIREGS *ar, qemu_irq irq, MemHotplugState *mem_st, > acpi_update_sci(ar, irq); > return; > } > + > +static const VMStateDescription vmstate_memhp_sts = { > + .name = "memory hotplug device state", > + .version_id = 1, > + .minimum_version_id = 1, > + .minimum_version_id_old = 1, > + .fields = (VMStateField[]) { > + VMSTATE_BOOL(is_enabled, MemStatus), > + VMSTATE_BOOL(is_inserting, MemStatus), > + VMSTATE_UINT32(ost_event, MemStatus), > + VMSTATE_UINT32(ost_status, MemStatus), > + VMSTATE_END_OF_LIST() > + } > +}; > + > +const VMStateDescription vmstate_memory_hotplug = { > + .name = "memory hotplug state", > + .version_id = 1, > + .minimum_version_id = 1, > + .minimum_version_id_old = 1, > + .fields = (VMStateField[]) { > + VMSTATE_UINT32(selector, MemHotplugState), > + VMSTATE_STRUCT_VARRAY_POINTER_UINT32(devs, MemHotplugState, dev_count, > + vmstate_memhp_sts, MemStatus), > + VMSTATE_END_OF_LIST() > + } > +}; > diff --git a/hw/acpi/piix4.c b/hw/acpi/piix4.c > index 056a7bc..3028eb6 100644 > --- a/hw/acpi/piix4.c > +++ b/hw/acpi/piix4.c > @@ -250,6 +250,12 @@ static bool vmstate_test_no_use_acpi_pci_hotplug(void *opaque, int version_id) > return !s->use_acpi_pci_hotplug; > } > > +static bool vmstate_test_use_memhp(void *opaque, int version_id) > +{ > + PIIX4PMState *s = opaque; > + return s->acpi_memory_hotplug.is_enabled; > +} > + > /* qemu-kvm 1.2 uses version 3 but advertised as 2 > * To support incoming qemu-kvm 1.2 migration, change version_id > * and minimum_version_id to 2 below (which breaks migration from > @@ -280,6 +286,8 @@ static const VMStateDescription vmstate_acpi = { > struct AcpiPciHpPciStatus), > VMSTATE_PCI_HOTPLUG(acpi_pci_hotplug, PIIX4PMState, > vmstate_test_use_acpi_pci_hotplug), > + VMSTATE_MEMORY_HOTPLUG(acpi_memory_hotplug, > + PIIX4PMState, vmstate_test_use_memhp), > VMSTATE_END_OF_LIST() > } > }; > diff --git a/include/hw/acpi/memory_hotplug.h b/include/hw/acpi/memory_hotplug.h > index 912c53f..7251dd0 100644 > --- a/include/hw/acpi/memory_hotplug.h > +++ b/include/hw/acpi/memory_hotplug.h > @@ -3,6 +3,7 @@ > > #include "hw/qdev-core.h" > #include "hw/acpi/acpi.h" > +#include "migration/vmstate.h" > > #define ACPI_MEMORY_HOTPLUG_STATUS 8 > > @@ -27,4 +28,10 @@ void acpi_memory_hotplug_init(MemoryRegion *as, Object *owner, > > void acpi_memory_plug_cb(ACPIREGS *ar, qemu_irq irq, MemHotplugState *mem_st, > DeviceState *dev, Error **errp); > + > +extern const VMStateDescription vmstate_memory_hotplug; > +#define VMSTATE_MEMORY_HOTPLUG(memhp, state, test_memhp_fn) \ > + VMSTATE_STRUCT_TEST(memhp, state, test_memhp_fn, 1, \ > + vmstate_memory_hotplug, MemHotplugState) > + > #endif > It's better to use a subsection for this. (In fact I think I had asked for the same for PCI hotplug as well, but my suggestion was ignored). :( Paolo
On Fri, 04 Apr 2014 16:16:34 +0200 Paolo Bonzini <pbonzini@redhat.com> wrote: > Il 04/04/2014 15:36, Igor Mammedov ha scritto: > > Adds an optional vmstate field that allows to migrate current > > state of acpi_memory_hotplug of ACPI PM device. > > > > Signed-off-by: Igor Mammedov <imammedo@redhat.com> > > --- > > hw/acpi/ich9.c | 8 ++++++++ > > hw/acpi/memory_hotplug.c | 27 +++++++++++++++++++++++++++ > > hw/acpi/piix4.c | 8 ++++++++ > > include/hw/acpi/memory_hotplug.h | 7 +++++++ > > 4 files changed, 50 insertions(+) > > > > diff --git a/hw/acpi/ich9.c b/hw/acpi/ich9.c > > index 86c45ba..e566f7e 100644 > > --- a/hw/acpi/ich9.c > > +++ b/hw/acpi/ich9.c > > @@ -140,6 +140,12 @@ static int ich9_pm_post_load(void *opaque, int version_id) > > .offset = vmstate_offset_pointer(_state, _field, uint8_t), \ > > } > > > > +static bool vmstate_test_use_memhp(void *opaque, int version_id) > > +{ > > + ICH9LPCPMRegs *s = opaque; > > + return s->acpi_memory_hotplug.is_enabled; > > +} > > + > > const VMStateDescription vmstate_ich9_pm = { > > .name = "ich9_pm", > > .version_id = 1, > > @@ -156,6 +162,8 @@ const VMStateDescription vmstate_ich9_pm = { > > VMSTATE_GPE_ARRAY(acpi_regs.gpe.en, ICH9LPCPMRegs), > > VMSTATE_UINT32(smi_en, ICH9LPCPMRegs), > > VMSTATE_UINT32(smi_sts, ICH9LPCPMRegs), > > + VMSTATE_MEMORY_HOTPLUG(acpi_memory_hotplug, > > + ICH9LPCPMRegs, vmstate_test_use_memhp), > > VMSTATE_END_OF_LIST() > > } > > }; > > diff --git a/hw/acpi/memory_hotplug.c b/hw/acpi/memory_hotplug.c > > index a5c3ef4..7d33cd7 100644 > > --- a/hw/acpi/memory_hotplug.c > > +++ b/hw/acpi/memory_hotplug.c > > @@ -155,3 +155,30 @@ void acpi_memory_plug_cb(ACPIREGS *ar, qemu_irq irq, MemHotplugState *mem_st, > > acpi_update_sci(ar, irq); > > return; > > } > > + > > +static const VMStateDescription vmstate_memhp_sts = { > > + .name = "memory hotplug device state", > > + .version_id = 1, > > + .minimum_version_id = 1, > > + .minimum_version_id_old = 1, > > + .fields = (VMStateField[]) { > > + VMSTATE_BOOL(is_enabled, MemStatus), > > + VMSTATE_BOOL(is_inserting, MemStatus), > > + VMSTATE_UINT32(ost_event, MemStatus), > > + VMSTATE_UINT32(ost_status, MemStatus), > > + VMSTATE_END_OF_LIST() > > + } > > +}; > > + > > +const VMStateDescription vmstate_memory_hotplug = { > > + .name = "memory hotplug state", > > + .version_id = 1, > > + .minimum_version_id = 1, > > + .minimum_version_id_old = 1, > > + .fields = (VMStateField[]) { > > + VMSTATE_UINT32(selector, MemHotplugState), > > + VMSTATE_STRUCT_VARRAY_POINTER_UINT32(devs, MemHotplugState, dev_count, > > + vmstate_memhp_sts, MemStatus), > > + VMSTATE_END_OF_LIST() > > + } > > +}; > > diff --git a/hw/acpi/piix4.c b/hw/acpi/piix4.c > > index 056a7bc..3028eb6 100644 > > --- a/hw/acpi/piix4.c > > +++ b/hw/acpi/piix4.c > > @@ -250,6 +250,12 @@ static bool vmstate_test_no_use_acpi_pci_hotplug(void *opaque, int version_id) > > return !s->use_acpi_pci_hotplug; > > } > > > > +static bool vmstate_test_use_memhp(void *opaque, int version_id) > > +{ > > + PIIX4PMState *s = opaque; > > + return s->acpi_memory_hotplug.is_enabled; > > +} > > + > > /* qemu-kvm 1.2 uses version 3 but advertised as 2 > > * To support incoming qemu-kvm 1.2 migration, change version_id > > * and minimum_version_id to 2 below (which breaks migration from > > @@ -280,6 +286,8 @@ static const VMStateDescription vmstate_acpi = { > > struct AcpiPciHpPciStatus), > > VMSTATE_PCI_HOTPLUG(acpi_pci_hotplug, PIIX4PMState, > > vmstate_test_use_acpi_pci_hotplug), > > + VMSTATE_MEMORY_HOTPLUG(acpi_memory_hotplug, > > + PIIX4PMState, vmstate_test_use_memhp), > > VMSTATE_END_OF_LIST() > > } > > }; > > diff --git a/include/hw/acpi/memory_hotplug.h b/include/hw/acpi/memory_hotplug.h > > index 912c53f..7251dd0 100644 > > --- a/include/hw/acpi/memory_hotplug.h > > +++ b/include/hw/acpi/memory_hotplug.h > > @@ -3,6 +3,7 @@ > > > > #include "hw/qdev-core.h" > > #include "hw/acpi/acpi.h" > > +#include "migration/vmstate.h" > > > > #define ACPI_MEMORY_HOTPLUG_STATUS 8 > > > > @@ -27,4 +28,10 @@ void acpi_memory_hotplug_init(MemoryRegion *as, Object *owner, > > > > void acpi_memory_plug_cb(ACPIREGS *ar, qemu_irq irq, MemHotplugState *mem_st, > > DeviceState *dev, Error **errp); > > + > > +extern const VMStateDescription vmstate_memory_hotplug; > > +#define VMSTATE_MEMORY_HOTPLUG(memhp, state, test_memhp_fn) \ > > + VMSTATE_STRUCT_TEST(memhp, state, test_memhp_fn, 1, \ > > + vmstate_memory_hotplug, MemHotplugState) > > + > > #endif > > > > It's better to use a subsection for this. (In fact I think I had asked > for the same for PCI hotplug as well, but my suggestion was ignored). :( I'm sorry about, I just followed recent code for PCI hotplug here thinking it's a more preferred way. I'll switch it to subsection on the next respin. > > Paolo >
diff --git a/hw/acpi/ich9.c b/hw/acpi/ich9.c index 86c45ba..e566f7e 100644 --- a/hw/acpi/ich9.c +++ b/hw/acpi/ich9.c @@ -140,6 +140,12 @@ static int ich9_pm_post_load(void *opaque, int version_id) .offset = vmstate_offset_pointer(_state, _field, uint8_t), \ } +static bool vmstate_test_use_memhp(void *opaque, int version_id) +{ + ICH9LPCPMRegs *s = opaque; + return s->acpi_memory_hotplug.is_enabled; +} + const VMStateDescription vmstate_ich9_pm = { .name = "ich9_pm", .version_id = 1, @@ -156,6 +162,8 @@ const VMStateDescription vmstate_ich9_pm = { VMSTATE_GPE_ARRAY(acpi_regs.gpe.en, ICH9LPCPMRegs), VMSTATE_UINT32(smi_en, ICH9LPCPMRegs), VMSTATE_UINT32(smi_sts, ICH9LPCPMRegs), + VMSTATE_MEMORY_HOTPLUG(acpi_memory_hotplug, + ICH9LPCPMRegs, vmstate_test_use_memhp), VMSTATE_END_OF_LIST() } }; diff --git a/hw/acpi/memory_hotplug.c b/hw/acpi/memory_hotplug.c index a5c3ef4..7d33cd7 100644 --- a/hw/acpi/memory_hotplug.c +++ b/hw/acpi/memory_hotplug.c @@ -155,3 +155,30 @@ void acpi_memory_plug_cb(ACPIREGS *ar, qemu_irq irq, MemHotplugState *mem_st, acpi_update_sci(ar, irq); return; } + +static const VMStateDescription vmstate_memhp_sts = { + .name = "memory hotplug device state", + .version_id = 1, + .minimum_version_id = 1, + .minimum_version_id_old = 1, + .fields = (VMStateField[]) { + VMSTATE_BOOL(is_enabled, MemStatus), + VMSTATE_BOOL(is_inserting, MemStatus), + VMSTATE_UINT32(ost_event, MemStatus), + VMSTATE_UINT32(ost_status, MemStatus), + VMSTATE_END_OF_LIST() + } +}; + +const VMStateDescription vmstate_memory_hotplug = { + .name = "memory hotplug state", + .version_id = 1, + .minimum_version_id = 1, + .minimum_version_id_old = 1, + .fields = (VMStateField[]) { + VMSTATE_UINT32(selector, MemHotplugState), + VMSTATE_STRUCT_VARRAY_POINTER_UINT32(devs, MemHotplugState, dev_count, + vmstate_memhp_sts, MemStatus), + VMSTATE_END_OF_LIST() + } +}; diff --git a/hw/acpi/piix4.c b/hw/acpi/piix4.c index 056a7bc..3028eb6 100644 --- a/hw/acpi/piix4.c +++ b/hw/acpi/piix4.c @@ -250,6 +250,12 @@ static bool vmstate_test_no_use_acpi_pci_hotplug(void *opaque, int version_id) return !s->use_acpi_pci_hotplug; } +static bool vmstate_test_use_memhp(void *opaque, int version_id) +{ + PIIX4PMState *s = opaque; + return s->acpi_memory_hotplug.is_enabled; +} + /* qemu-kvm 1.2 uses version 3 but advertised as 2 * To support incoming qemu-kvm 1.2 migration, change version_id * and minimum_version_id to 2 below (which breaks migration from @@ -280,6 +286,8 @@ static const VMStateDescription vmstate_acpi = { struct AcpiPciHpPciStatus), VMSTATE_PCI_HOTPLUG(acpi_pci_hotplug, PIIX4PMState, vmstate_test_use_acpi_pci_hotplug), + VMSTATE_MEMORY_HOTPLUG(acpi_memory_hotplug, + PIIX4PMState, vmstate_test_use_memhp), VMSTATE_END_OF_LIST() } }; diff --git a/include/hw/acpi/memory_hotplug.h b/include/hw/acpi/memory_hotplug.h index 912c53f..7251dd0 100644 --- a/include/hw/acpi/memory_hotplug.h +++ b/include/hw/acpi/memory_hotplug.h @@ -3,6 +3,7 @@ #include "hw/qdev-core.h" #include "hw/acpi/acpi.h" +#include "migration/vmstate.h" #define ACPI_MEMORY_HOTPLUG_STATUS 8 @@ -27,4 +28,10 @@ void acpi_memory_hotplug_init(MemoryRegion *as, Object *owner, void acpi_memory_plug_cb(ACPIREGS *ar, qemu_irq irq, MemHotplugState *mem_st, DeviceState *dev, Error **errp); + +extern const VMStateDescription vmstate_memory_hotplug; +#define VMSTATE_MEMORY_HOTPLUG(memhp, state, test_memhp_fn) \ + VMSTATE_STRUCT_TEST(memhp, state, test_memhp_fn, 1, \ + vmstate_memory_hotplug, MemHotplugState) + #endif
Adds an optional vmstate field that allows to migrate current state of acpi_memory_hotplug of ACPI PM device. Signed-off-by: Igor Mammedov <imammedo@redhat.com> --- hw/acpi/ich9.c | 8 ++++++++ hw/acpi/memory_hotplug.c | 27 +++++++++++++++++++++++++++ hw/acpi/piix4.c | 8 ++++++++ include/hw/acpi/memory_hotplug.h | 7 +++++++ 4 files changed, 50 insertions(+)