On 06/04/2013 10:20 PM, Alexey Kardashevskiy wrote:
> From: David Gibson <da...@gibson.dropbear.id.au>
>
> From: David Gibson <da...@gibson.dropbear.id.au>
>
> This patch adds the necessary VMStateDescription information to support
> savevm/loadvm for the XICS interrupt controller used on the pseries
> machine.
>
> [aik: added ics_resend() on post_load]
> Signed-off-by: David Gibson <da...@gibson.dropbear.id.au>
> Signed-off-by: Alexey Kardashevskiy <a...@ozlabs.ru>
> ---
> hw/ppc/xics.c | 70
> +++++++++++++++++++++++++++++++++++++++++++++++++++++----
> 1 file changed, 66 insertions(+), 4 deletions(-)
>
> diff --git a/hw/ppc/xics.c b/hw/ppc/xics.c
> index 1b25075..8a17175 100644
> --- a/hw/ppc/xics.c
> +++ b/hw/ppc/xics.c
> @@ -50,7 +50,7 @@ struct icp_server_state {
> struct ics_state;
>
> struct icp_state {
> - long nr_servers;
> + uint32_t nr_servers;
> struct icp_server_state *ss;
> struct ics_state *ics;
> };
> @@ -173,7 +173,7 @@ static void icp_irq(struct icp_state *icp, int server,
> int nr, uint8_t priority)
> */
>
> struct ics_irq_state {
> - int server;
> + uint32_t server;
> uint8_t priority;
> uint8_t saved_priority;
> #define XICS_STATUS_ASSERTED 0x1
> @@ -184,8 +184,8 @@ struct ics_irq_state {
> };
>
> struct ics_state {
> - int nr_irqs;
> - int offset;
> + uint32_t nr_irqs;
> + uint32_t offset;
> qemu_irq *qirqs;
> bool *islsi;
> struct ics_irq_state *irqs;
> @@ -523,6 +523,61 @@ static void xics_reset(void *opaque)
> }
> }
>
> +static int ics_post_load(void *opaque, int version_id)
> +{
> + int i;
> + struct ics_state *ics = opaque;
> +
> + for (i = 0; i < ics->nr_irqs; i++) {
Obviously here is a bug...
- for (i = 0; i < ics->nr_irqs; i++) {
+ for (i = 0; i < ics->icp->nr_servers; i++) {
> + icp_resend(ics->icp, i);
> + }
> +
> + return 0;
> +}
> +
> +static const VMStateDescription vmstate_icp_server = {
> + .name = "icp/server",
> + .version_id = 1,
> + .minimum_version_id = 1,
> + .minimum_version_id_old = 1,
> + .fields = (VMStateField []) {
> + /* Sanity check */
> + VMSTATE_UINT32(xirr, struct icp_server_state),
> + VMSTATE_UINT8(pending_priority, struct icp_server_state),
> + VMSTATE_UINT8(mfrr, struct icp_server_state),
> + VMSTATE_END_OF_LIST()
> + },
> +};
> +
> +static const VMStateDescription vmstate_ics_irq = {
> + .name = "ics/irq",
> + .version_id = 1,
> + .minimum_version_id = 1,
> + .minimum_version_id_old = 1,
> + .fields = (VMStateField []) {
> + VMSTATE_UINT32(server, struct ics_irq_state),
> + VMSTATE_UINT8(priority, struct ics_irq_state),
> + VMSTATE_UINT8(saved_priority, struct ics_irq_state),
> + VMSTATE_UINT8(status, struct ics_irq_state),
> + VMSTATE_END_OF_LIST()
> + },
> +};
> +
> +static const VMStateDescription vmstate_ics = {
> + .name = "ics",
> + .version_id = 1,
> + .minimum_version_id = 1,
> + .minimum_version_id_old = 1,
> + .post_load = ics_post_load,
> + .fields = (VMStateField []) {
> + /* Sanity check */
> + VMSTATE_UINT32_EQUAL(nr_irqs, struct ics_state),
> +
> + VMSTATE_STRUCT_VARRAY_POINTER_UINT32(irqs, struct ics_state,
> nr_irqs, vmstate_ics_irq, struct ics_irq_state),
> + VMSTATE_END_OF_LIST()
> + },
> +};
> +
> void xics_cpu_setup(struct icp_state *icp, PowerPCCPU *cpu)
> {
> CPUState *cs = CPU(cpu);
> @@ -545,6 +600,8 @@ void xics_cpu_setup(struct icp_state *icp, PowerPCCPU
> *cpu)
> "bus model\n");
> abort();
> }
> +
> + vmstate_register(NULL, cs->cpu_index, &vmstate_icp_server, ss);
> }
>
> struct icp_state *xics_system_init(int nr_servers, int nr_irqs)
> @@ -579,5 +636,10 @@ struct icp_state *xics_system_init(int nr_servers, int
> nr_irqs)
>
> qemu_register_reset(xics_reset, icp);
>
> + /* We use each the ICS's offset into the global irq number space
> + * as an instance id. This means we can extend to multiple ICS
> + * instances without needing to change the savevm format */
> + vmstate_register(NULL, ics->offset, &vmstate_ics, ics);
> +
> return icp;
> }
>
--
Alexey
