From patchwork Wed Oct 17 18:31:47 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Dmitry Fleytman X-Patchwork-Id: 192119 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 C71302C008E for ; Thu, 18 Oct 2012 05:44:25 +1100 (EST) Received: from localhost ([::1]:50799 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1TOYbQ-0004ZB-1k for incoming@patchwork.ozlabs.org; Wed, 17 Oct 2012 14:44:24 -0400 Received: from eggs.gnu.org ([208.118.235.92]:39477) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1TOYas-0003DJ-12 for qemu-devel@nongnu.org; Wed, 17 Oct 2012 14:43:50 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1TOYaq-0003TO-To for qemu-devel@nongnu.org; Wed, 17 Oct 2012 14:43:49 -0400 Received: from mail-wi0-f181.google.com ([209.85.212.181]:63119) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1TOYaq-0003SM-O6 for qemu-devel@nongnu.org; Wed, 17 Oct 2012 14:43:48 -0400 Received: by mail-wi0-f181.google.com with SMTP id hq12so835736wib.10 for ; Wed, 17 Oct 2012 11:43:48 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20120113; h=from:to:cc:subject:date:message-id:x-mailer:in-reply-to:references :x-gm-message-state; bh=BRercPkU2T/A68rKWlJeT7TXz/rj09e2RVIqnxrmAUo=; b=WHtGKHIbOteq2M4b6mH+kKyof0KzJQoP5Y9zJ/FD6ooQeesjRaHpii+qEGdJPkqIHY iAGynZdN5BB155rsV3oDG0LVHwYm6RAAJMSLVktq3nsY2X8pcAETi0Jtk7EvysRAxK1k BASYkZir5266mxv64yz7cOZOCzOHNi6j63lBkNkc9LMDfiMMwMWhysjOS6VJQ6ePiXcO VLkVyBqPahbWR2DFoR0OR6hUiZmPRFQ8Rm5dKw+KQ3/PYhTe0hFkwEQdaE6eQ+gJ0/E2 ug0fidSHgsyUPDZSi4dCEnM/RlTigT36O/gouWUE01IMjQLQ8k/a4TI/W9AtqK6EmbGj 8SiQ== Received: by 10.180.99.133 with SMTP id eq5mr5860231wib.21.1350499428264; Wed, 17 Oct 2012 11:43:48 -0700 (PDT) Received: from Snarl.daynix ([91.205.155.63]) by mx.google.com with ESMTPS id v3sm29023767wiy.5.2012.10.17.11.43.46 (version=TLSv1/SSLv3 cipher=OTHER); Wed, 17 Oct 2012 11:43:47 -0700 (PDT) From: Dmitry Fleytman To: qemu-devel@nongnu.org Date: Wed, 17 Oct 2012 20:31:47 +0200 Message-Id: <1350498707-6749-3-git-send-email-dmitry@daynix.com> X-Mailer: git-send-email 1.7.11.4 In-Reply-To: <1350498707-6749-1-git-send-email-dmitry@daynix.com> References: <1350498707-6749-1-git-send-email-dmitry@daynix.com> X-Gm-Message-State: ALoCoQlcYWiTlLB+UI7/ZQ+HI3pGPi9KWuLoEFxgdCjRQLQkzAxt8/uH/b1imWfGb8Tix2gztWm5 X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 209.85.212.181 Cc: Yan Vugenfirer , Dmitry Fleytman , Chris Webb , Richard Davies Subject: [Qemu-devel] [PATCH 2/2] Add check_rxov into VMState. 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 E1000State::check_rxov field must be preserved on live migration. Signed-off-by: Dmitry Fleytman --- hw/e1000.c | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/hw/e1000.c b/hw/e1000.c index 606bf3a..26ad03c 100644 --- a/hw/e1000.c +++ b/hw/e1000.c @@ -92,7 +92,7 @@ typedef struct E1000State_st { uint32_t rxbuf_size; uint32_t rxbuf_min_shift; - int check_rxov; + uint32_t check_rxov; struct e1000_tx { unsigned char header[256]; unsigned char vlan_header[4]; @@ -1100,6 +1100,11 @@ static bool is_version_1(void *opaque, int version_id) return version_id == 1; } +static bool is_version_3(void *opaque, int version_id) +{ + return version_id == 1; +} + static int e1000_post_load(void *opaque, int version_id) { E1000State *s = opaque; @@ -1113,7 +1118,7 @@ static int e1000_post_load(void *opaque, int version_id) static const VMStateDescription vmstate_e1000 = { .name = "e1000", - .version_id = 2, + .version_id = 3, .minimum_version_id = 1, .minimum_version_id_old = 1, .post_load = e1000_post_load, @@ -1123,6 +1128,7 @@ static const VMStateDescription vmstate_e1000 = { VMSTATE_UNUSED(4), /* Was mmio_base. */ VMSTATE_UINT32(rxbuf_size, E1000State), VMSTATE_UINT32(rxbuf_min_shift, E1000State), + VMSTATE_UINT32_TEST(check_rxov, E1000State, is_version_3), VMSTATE_UINT32(eecd_state.val_in, E1000State), VMSTATE_UINT16(eecd_state.bitnum_in, E1000State), VMSTATE_UINT16(eecd_state.bitnum_out, E1000State),