From patchwork Mon Oct 15 16:48:53 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Dmitry Fleytman X-Patchwork-Id: 191601 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 42D4F2C00A7 for ; Tue, 16 Oct 2012 04:01:32 +1100 (EST) Received: from localhost ([::1]:52162 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1TNo2j-0002Zm-EX for incoming@patchwork.ozlabs.org; Mon, 15 Oct 2012 13:01:29 -0400 Received: from eggs.gnu.org ([208.118.235.92]:45783) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1TNo2P-000227-32 for qemu-devel@nongnu.org; Mon, 15 Oct 2012 13:01:18 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1TNo2K-0006Wr-7T for qemu-devel@nongnu.org; Mon, 15 Oct 2012 13:01:09 -0400 Received: from mail-we0-f173.google.com ([74.125.82.173]:38533) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1TNo2K-0006Vy-19 for qemu-devel@nongnu.org; Mon, 15 Oct 2012 13:01:04 -0400 Received: by mail-we0-f173.google.com with SMTP id t11so3220419wey.4 for ; Mon, 15 Oct 2012 10:01:03 -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=7aHf0q3kiFokfYJHli/Aaw7i6ceWnw8G6UEwx6ysLh4=; b=e97DTOPwWHlcBOIjBPKyFUfKyfOccD1OukU1P3DPDN0Gn/7JII88K2UGnojqk+nHUo 2CXoN9IMaUr68e8/6og2KxXZJ5ZTNwJ89cxQ+nGEUwOgqoAtu71bBOcAZYnvI0mcN1F5 afJSe5DFjixjAuPxUWkDw8HskMojgx9d7VLxsr32gY0/kr9F0FC/iG7tpbNCVQ3nWuTx LbKh4ewen4fEWepdVAfHDffoYbst15O1/7vc+SR9gkCnbNianWZxsuRdP7AQOMkNeB/i oPmNQ1DpL0PApgxPbeabOX8bbnqeon9wsyhEhyyhdKrYRJgWdixm5SWVtAxUCeN0FJ17 qMQg== Received: by 10.216.145.80 with SMTP id o58mr7132956wej.84.1350320463006; Mon, 15 Oct 2012 10:01:03 -0700 (PDT) Received: from Snarl.daynix ([91.205.155.63]) by mx.google.com with ESMTPS id eq2sm16794997wib.1.2012.10.15.10.01.01 (version=TLSv1/SSLv3 cipher=OTHER); Mon, 15 Oct 2012 10:01:02 -0700 (PDT) From: Dmitry Fleytman To: qemu-devel@nongnu.org Date: Mon, 15 Oct 2012 18:48:53 +0200 Message-Id: <1350319733-7306-3-git-send-email-dmitry@daynix.com> X-Mailer: git-send-email 1.7.11.4 In-Reply-To: <1350319733-7306-1-git-send-email-dmitry@daynix.com> References: <1350319733-7306-1-git-send-email-dmitry@daynix.com> X-Gm-Message-State: ALoCoQkj45ymUO3sMJX5paidyIo5YXwRgGGYD3H9Yw4ZQgniwdQeITX8jBYqlxD7eeLMeCLr9sKV X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 74.125.82.173 Cc: Yan Vugenfirer , Dmitry Fleytman , Chris Webb , Richard Davies Subject: [Qemu-devel] [PATCH 2/2] Fix a race condition in E1000 device live migration. One of data-transfer related flags not in migrated fields list. 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 Signed-off-by: Dmitry Fleytman --- hw/e1000.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/hw/e1000.c b/hw/e1000.c index 1e66ecf..efbe0c9 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; uint32_t rx_init_done; struct e1000_tx { unsigned char header[256]; @@ -1120,6 +1120,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(check_rxov, E1000State), VMSTATE_UINT32(rx_init_done, E1000State), VMSTATE_UINT32(eecd_state.val_in, E1000State), VMSTATE_UINT16(eecd_state.bitnum_in, E1000State),