From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:59497) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1XMAyV-0003At-S8 for qemu-devel@nongnu.org; Tue, 26 Aug 2014 03:15:34 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1XMAyP-0005aM-2i for qemu-devel@nongnu.org; Tue, 26 Aug 2014 03:15:27 -0400 Received: from mail.ispras.ru ([83.149.199.45]:33284) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1XMAyO-0005a1-RZ for qemu-devel@nongnu.org; Tue, 26 Aug 2014 03:15:21 -0400 From: Pavel Dovgalyuk Date: Tue, 26 Aug 2014 11:15:20 +0400 Message-ID: <20140826071519.1672.54843.stgit@PASHA-ISP> In-Reply-To: <20140826071427.1672.48119.stgit@PASHA-ISP> References: <20140826071427.1672.48119.stgit@PASHA-ISP> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: 7bit Subject: [Qemu-devel] [PATCH 09/12] rtl8139: adding new fields to vmstate List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: pbonzini@redhat.com, zealot351@gmail.com, maria.klimushenkova@ispras.ru, pavel.dovgaluk@ispras.ru This patch adds virtual clock-dependent timers to VMState to allow correct saving and restoring the state of RTL8139 network controller. Signed-off-by: Pavel Dovgalyuk --- hw/net/rtl8139.c | 50 ++++++++++++++++++++++++++++++++++++++++++++++++-- 1 files changed, 48 insertions(+), 2 deletions(-) diff --git a/hw/net/rtl8139.c b/hw/net/rtl8139.c index 6e59f38..cc2f705 100644 --- a/hw/net/rtl8139.c +++ b/hw/net/rtl8139.c @@ -3246,10 +3246,17 @@ static uint32_t rtl8139_mmio_readl(void *opaque, hwaddr addr) return val; } +static int rtl8139_pre_load(void *opaque) +{ + RTL8139State *s = opaque; + s->TimerExpire = 0; + timer_del(s->timer); + return 0; +} + static int rtl8139_post_load(void *opaque, int version_id) { RTL8139State* s = opaque; - rtl8139_set_next_tctr_time(s, qemu_clock_get_ns(QEMU_CLOCK_VIRTUAL)); if (version_id < 4) { s->cplus_enabled = s->CpCmd != 0; } @@ -3275,6 +3282,38 @@ static const VMStateDescription vmstate_rtl8139_hotplug_ready ={ } }; +static bool rtl8139_TimerExpire_needed(void *opaque) +{ + RTL8139State *s = (RTL8139State *)opaque; + return s->TimerExpire != 0; +} + +static const VMStateDescription vmstate_rtl8139_TimerExpire = { + .name = "rtl8139/TimerExpire", + .version_id = 1, + .minimum_version_id = 1, + .fields = (VMStateField[]) { + VMSTATE_INT64(TimerExpire, RTL8139State), + VMSTATE_END_OF_LIST() + } +}; + +static bool rtl8139_timer_needed(void *opaque) +{ + RTL8139State *s = (RTL8139State *)opaque; + return timer_pending(s->timer); +} + +static const VMStateDescription vmstate_rtl8139_timer = { + .name = "rtl8139/timer", + .version_id = 1, + .minimum_version_id = 1, + .fields = (VMStateField[]) { + VMSTATE_TIMER(timer, RTL8139State), + VMSTATE_END_OF_LIST() + } +}; + static void rtl8139_pre_save(void *opaque) { RTL8139State* s = opaque; @@ -3289,8 +3328,9 @@ static void rtl8139_pre_save(void *opaque) static const VMStateDescription vmstate_rtl8139 = { .name = "rtl8139", - .version_id = 4, + .version_id = 5, .minimum_version_id = 3, + .pre_load = rtl8139_pre_load, .post_load = rtl8139_post_load, .pre_save = rtl8139_pre_save, .fields = (VMStateField[]) { @@ -3371,6 +3411,12 @@ static const VMStateDescription vmstate_rtl8139 = { .vmsd = &vmstate_rtl8139_hotplug_ready, .needed = rtl8139_hotplug_ready_needed, }, { + .vmsd = &vmstate_rtl8139_TimerExpire, + .needed = rtl8139_TimerExpire_needed, + }, { + .vmsd = &vmstate_rtl8139_timer, + .needed = rtl8139_timer_needed, + }, { /* empty */ } }