From patchwork Tue Sep 18 20:00:43 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Corey Minyard X-Patchwork-Id: 184838 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (Client did not present a certificate) by ozlabs.org (Postfix) with ESMTPS id D33812C0091 for ; Wed, 19 Sep 2012 06:09:31 +1000 (EST) Received: from localhost ([::1]:55433 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1TE46r-0005FH-Mt for incoming@patchwork.ozlabs.org; Tue, 18 Sep 2012 16:09:29 -0400 Received: from eggs.gnu.org ([208.118.235.92]:43480) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1TE46W-0004py-GO for qemu-devel@nongnu.org; Tue, 18 Sep 2012 16:09:09 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1TE46U-0006xj-Lj for qemu-devel@nongnu.org; Tue, 18 Sep 2012 16:09:08 -0400 Received: from vms173007pub.verizon.net ([206.46.173.7]:14254) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1TE46U-0006xV-F1 for qemu-devel@nongnu.org; Tue, 18 Sep 2012 16:09:06 -0400 Received: from wf-rch.minyard.home ([unknown] [173.57.151.210]) by vms173007.mailsrvcs.net (Sun Java(tm) System Messaging Server 7u2-7.02 32bit (built Apr 16 2009)) with ESMTPA id <0MAK00JFJAM8VFNS@vms173007.mailsrvcs.net> for qemu-devel@nongnu.org; Tue, 18 Sep 2012 15:08:37 -0500 (CDT) Received: from i.minyard.home (i2.minyard.home [192.168.27.116]) by wf-rch.minyard.home (Postfix) with ESMTP id 559091F960; Tue, 18 Sep 2012 15:00:53 -0500 (CDT) Received: by i.minyard.home (Postfix, from userid 1000) id 1B0F17FE3E; Tue, 18 Sep 2012 15:00:50 -0500 (CDT) From: minyard@acm.org To: qemu-devel@nongnu.org Date: Tue, 18 Sep 2012 15:00:43 -0500 Message-id: <1347998443-20599-17-git-send-email-minyard@acm.org> X-Mailer: git-send-email 1.7.4.1 In-reply-to: <1347998443-20599-1-git-send-email-minyard@acm.org> References: <1347998443-20599-1-git-send-email-minyard@acm.org> X-detected-operating-system: by eggs.gnu.org: Solaris 10 (1203?) X-Received-From: 206.46.173.7 Cc: Corey Minyard Subject: [Qemu-devel] [PATCH 16/16] ipmi: Add migration capability to the IPMI device. X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org From: Corey Minyard Signed-off-by: Corey Minyard io_length = 3; memory_region_init_io(&s->io, &ipmi_bt_io_ops, bt, "ipmi-bt", 3); + vmstate_register(NULL, 0, &vmstate_ipmi_bt, bt); return 0; } diff --git a/hw/ipmi_extern.c b/hw/ipmi_extern.c index b31aea0..803331c 100644 --- a/hw/ipmi_extern.c +++ b/hw/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; @@ -442,12 +442,46 @@ static void ipmi_extern_handle_reset(IPMIBmc *b) ipmi_unlock(s); } +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 int ipmi_extern_init(IPMIBmc *b) { IPMIExternBmc *es = IPMI_BMC_EXTERN(b); es->extern_timer = qemu_new_timer_ns(vm_clock, extern_timeout, es); qemu_chr_add_handlers(es->parent.chr, can_receive, receive, chr_event, es); + vmstate_register(NULL, 0, &vmstate_ipmi_extern, es); return 0; } diff --git a/hw/ipmi_kcs.c b/hw/ipmi_kcs.c index ca934f6..b61335f 100644 --- a/hw/ipmi_kcs.c +++ b/hw/ipmi_kcs.c @@ -302,6 +302,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 int ipmi_kcs_init(IPMIInterface *s) { IPMIKcsInterface *kcs = IPMI_INTERFACE_KCS(s); @@ -312,6 +326,7 @@ static int ipmi_kcs_init(IPMIInterface *s) s->io_length = 2; memory_region_init_io(&s->io, &ipmi_kcs_io_ops, kcs, "ipmi-kcs", 2); + vmstate_register(NULL, 0, &vmstate_ipmi_kcs, kcs); return 0; } diff --git a/hw/ipmi_sim.c b/hw/ipmi_sim.c index d41ac80..362c96e 100644 --- a/hw/ipmi_sim.c +++ b/hw/ipmi_sim.c @@ -1481,6 +1481,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 int ipmi_sim_init(IPMIBmc *b) { unsigned int i; @@ -1525,6 +1553,9 @@ static int ipmi_sim_init(IPMIBmc *b) register_cmds(ss); ss->timer = qemu_new_timer_ns(vm_clock, ipmi_timeout, ss); + + vmstate_register(NULL, 0, &vmstate_ipmi_sim, ss); + return 0; } diff --git a/hw/isa_ipmi.c b/hw/isa_ipmi.c index f8afbb9..2e4cc27 100644 --- a/hw/isa_ipmi.c +++ b/hw/isa_ipmi.c @@ -126,12 +126,24 @@ 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); ISADeviceClass *ic = ISA_DEVICE_CLASS(klass); ic->init = ipmi_isa_initfn; dc->reset = ipmi_isa_reset; + dc->vmsd = &vmstate_isa_ipmi; dc->props = ipmi_isa_properties; }