From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:59050) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1XzVkC-00032b-7u for qemu-devel@nongnu.org; Fri, 12 Dec 2014 14:19:22 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1XzVk6-0005W3-2x for qemu-devel@nongnu.org; Fri, 12 Dec 2014 14:19:16 -0500 Received: from mail-yh0-x22d.google.com ([2607:f8b0:4002:c01::22d]:46048) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1XzVk5-0005Vw-VG for qemu-devel@nongnu.org; Fri, 12 Dec 2014 14:19:10 -0500 Received: by mail-yh0-f45.google.com with SMTP id f10so3558499yha.32 for ; Fri, 12 Dec 2014 11:19:09 -0800 (PST) Sender: Corey Minyard From: minyard@acm.org Date: Fri, 12 Dec 2014 13:15:44 -0600 Message-Id: <1418411751-3614-10-git-send-email-minyard@acm.org> In-Reply-To: <1418411751-3614-1-git-send-email-minyard@acm.org> References: <1418411751-3614-1-git-send-email-minyard@acm.org> Subject: [Qemu-devel] [PATCH 09/16] ipmi: Add migration capability to the IPMI device. List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: Corey Minyard From: Corey Minyard Signed-off-by: Corey Minyard io_length = 3; memory_region_init_io(&s->io, NULL, &ipmi_bt_io_ops, bt, "ipmi-bt", 3); + vmstate_register(NULL, 0, &vmstate_ipmi_bt, bt); } static void ipmi_bt_class_init(ObjectClass *klass, void *data) diff --git a/hw/ipmi/ipmi_extern.c b/hw/ipmi/ipmi_extern.c index b59ff8a..aace0b3 100644 --- a/hw/ipmi/ipmi_extern.c +++ b/hw/ipmi/ipmi_extern.c @@ -63,10 +63,10 @@ typedef struct IPMIExternBmc { unsigned char inbuf[MAX_IPMI_MSG_SIZE + 2]; unsigned int inpos; - int in_escape; - int in_too_many; - int waiting_rsp; - int sending_cmd; + bool in_escape; + bool in_too_many; + bool waiting_rsp; + bool sending_cmd; unsigned char outbuf[(MAX_IPMI_MSG_SIZE + 2) * 2 + 1]; unsigned int outpos; @@ -425,12 +425,46 @@ static void ipmi_extern_handle_reset(IPMIBmc *b) continue_send(es); } +static int ipmi_extern_post_migrate(void *opaque, int version_id) +{ + IPMIExternBmc *es = opaque; + + /* + * We don't directly restore waiting_rsp, Instead, we return an + * error on the interface if a response was being waited for. + */ + if (es->waiting_rsp) { + IPMIInterface *s = es->parent.intf; + IPMIInterfaceClass *k = IPMI_INTERFACE_GET_CLASS(s); + + es->waiting_rsp = 0; + es->inbuf[1] = es->outbuf[1] | 0x04; + es->inbuf[2] = es->outbuf[2]; + es->inbuf[3] = IPMI_CC_BMC_INIT_IN_PROGRESS; + k->handle_rsp(s, es->outbuf[0], es->inbuf + 1, 3); + } + return 0; +} + +static const VMStateDescription vmstate_ipmi_extern = { + .name = TYPE_IPMI_BMC_EXTERN, + .version_id = 1, + .minimum_version_id = 1, + .post_load = ipmi_extern_post_migrate, + .fields = (VMStateField[]) { + VMSTATE_BOOL(send_reset, IPMIExternBmc), + VMSTATE_BOOL(waiting_rsp, IPMIExternBmc), + VMSTATE_END_OF_LIST() + } +}; + static void ipmi_extern_init(IPMIBmc *b, Error **errp) { IPMIExternBmc *es = IPMI_BMC_EXTERN(b); es->extern_timer = timer_new_ns(QEMU_CLOCK_VIRTUAL, extern_timeout, es); qemu_chr_add_handlers(es->parent.chr, can_receive, receive, chr_event, es); + vmstate_register(NULL, 0, &vmstate_ipmi_extern, es); } static void ipmi_extern_class_init(ObjectClass *klass, void *data) diff --git a/hw/ipmi/ipmi_kcs.c b/hw/ipmi/ipmi_kcs.c index 411799e..e3af39e 100644 --- a/hw/ipmi/ipmi_kcs.c +++ b/hw/ipmi/ipmi_kcs.c @@ -299,6 +299,20 @@ static void ipmi_kcs_set_atn(IPMIInterface *s, int val, int irq) } } +static const VMStateDescription vmstate_ipmi_kcs = { + .name = TYPE_IPMI_INTERFACE_KCS, + .version_id = 1, + .minimum_version_id = 1, + .fields = (VMStateField[]) { + VMSTATE_UINT8(status_reg, IPMIKcsInterface), + VMSTATE_UINT8(data_out_reg, IPMIKcsInterface), + VMSTATE_INT16(data_in_reg, IPMIKcsInterface), + VMSTATE_INT16(cmd_reg, IPMIKcsInterface), + VMSTATE_UINT8(waiting_rsp, IPMIKcsInterface), + VMSTATE_END_OF_LIST() + } +}; + static void ipmi_kcs_init(IPMIInterface *s, Error **errp) { IPMIKcsInterface *kcs = IPMI_INTERFACE_KCS(s); @@ -309,6 +323,7 @@ static void ipmi_kcs_init(IPMIInterface *s, Error **errp) s->io_length = 2; memory_region_init_io(&s->io, NULL, &ipmi_kcs_io_ops, kcs, "ipmi-kcs", 2); + vmstate_register(NULL, 0, &vmstate_ipmi_kcs, kcs); } static void ipmi_kcs_class_init(ObjectClass *class, void *data) diff --git a/hw/ipmi/ipmi_sim.c b/hw/ipmi/ipmi_sim.c index 8028f40..7480d00 100644 --- a/hw/ipmi/ipmi_sim.c +++ b/hw/ipmi/ipmi_sim.c @@ -1657,6 +1657,34 @@ static const uint8_t init_sdrs[] = { 0xff, 0xff, 0x00, 0x00, 0x00 }; +static const VMStateDescription vmstate_ipmi_sim = { + .name = TYPE_IPMI_BMC_SIMULATOR, + .version_id = 1, + .minimum_version_id = 1, + .fields = (VMStateField[]) { + VMSTATE_UINT8(bmc_global_enables, IPMISimBmc), + VMSTATE_UINT8(msg_flags, IPMISimBmc), + VMSTATE_BOOL(watchdog_initialized, IPMISimBmc), + VMSTATE_UINT8(watchdog_use, IPMISimBmc), + VMSTATE_UINT8(watchdog_action, IPMISimBmc), + VMSTATE_UINT8(watchdog_pretimeout, IPMISimBmc), + VMSTATE_BOOL(watchdog_expired, IPMISimBmc), + VMSTATE_UINT16(watchdog_timeout, IPMISimBmc), + VMSTATE_BOOL(watchdog_running, IPMISimBmc), + VMSTATE_BOOL(watchdog_preaction_ran, IPMISimBmc), + VMSTATE_INT64(watchdog_expiry, IPMISimBmc), + VMSTATE_UINT8_ARRAY(evtbuf, IPMISimBmc, 16), + VMSTATE_UINT8(sensors[IPMI_WATCHDOG_SENSOR].status, IPMISimBmc), + VMSTATE_UINT8(sensors[IPMI_WATCHDOG_SENSOR].reading, IPMISimBmc), + VMSTATE_UINT16(sensors[IPMI_WATCHDOG_SENSOR].states, IPMISimBmc), + VMSTATE_UINT16(sensors[IPMI_WATCHDOG_SENSOR].assert_states, IPMISimBmc), + VMSTATE_UINT16(sensors[IPMI_WATCHDOG_SENSOR].deassert_states, + IPMISimBmc), + VMSTATE_UINT16(sensors[IPMI_WATCHDOG_SENSOR].assert_enable, IPMISimBmc), + VMSTATE_END_OF_LIST() + } +}; + static void ipmi_sim_init(IPMIBmc *b, Error **errp) { unsigned int i; @@ -1703,6 +1731,8 @@ static void ipmi_sim_init(IPMIBmc *b, Error **errp) register_cmds(ss); ss->timer = timer_new_ns(QEMU_CLOCK_VIRTUAL, ipmi_timeout, ss); + + vmstate_register(NULL, 0, &vmstate_ipmi_sim, ss); } static void ipmi_sim_class_init(ObjectClass *klass, void *data) diff --git a/hw/ipmi/isa_ipmi.c b/hw/ipmi/isa_ipmi.c index 1c1ab8d..e62f744 100644 --- a/hw/ipmi/isa_ipmi.c +++ b/hw/ipmi/isa_ipmi.c @@ -121,11 +121,23 @@ static Property ipmi_isa_properties[] = { DEFINE_PROP_END_OF_LIST(), }; +static const VMStateDescription vmstate_isa_ipmi = { + .name = TYPE_ISA_IPMI, + .version_id = 1, + .minimum_version_id = 1, + .fields = (VMStateField[]) { + VMSTATE_STRUCT_POINTER(intf, ISAIPMIDevice, vmstate_IPMIInterface, + IPMIInterface), + VMSTATE_END_OF_LIST() + } +}; + static void ipmi_isa_class_initfn(ObjectClass *klass, void *data) { DeviceClass *dc = DEVICE_CLASS(klass); dc->realize = ipmi_isa_realizefn; dc->reset = ipmi_isa_reset; + dc->vmsd = &vmstate_isa_ipmi; dc->props = ipmi_isa_properties; } -- 1.8.3.1