From patchwork Wed Mar 28 16:36:24 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Dr. David Alan Gilbert" X-Patchwork-Id: 892374 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (mailfrom) smtp.mailfrom=nongnu.org (client-ip=2001:4830:134:3::11; helo=lists.gnu.org; envelope-from=qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org; receiver=) Authentication-Results: ozlabs.org; dmarc=fail (p=none dis=none) header.from=redhat.com Received: from lists.gnu.org (lists.gnu.org [IPv6:2001:4830:134:3::11]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 40BDBp45Jrz9s0R for ; Thu, 29 Mar 2018 03:40:18 +1100 (AEDT) Received: from localhost ([::1]:40119 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1f1E7U-0000Fy-3j for incoming@patchwork.ozlabs.org; Wed, 28 Mar 2018 12:40:16 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:43608) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1f1E46-0005vB-3b for qemu-devel@nongnu.org; Wed, 28 Mar 2018 12:36:46 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1f1E42-0007lv-Vy for qemu-devel@nongnu.org; Wed, 28 Mar 2018 12:36:46 -0400 Received: from mx3-rdu2.redhat.com ([66.187.233.73]:59091 helo=mx1.redhat.com) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1f1E42-0007lV-RC for qemu-devel@nongnu.org; Wed, 28 Mar 2018 12:36:42 -0400 Received: from smtp.corp.redhat.com (int-mx05.intmail.prod.int.rdu2.redhat.com [10.11.54.5]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 3CC938163C52; Wed, 28 Mar 2018 16:36:39 +0000 (UTC) Received: from dgilbert-t530.redhat.com (ovpn-117-237.ams2.redhat.com [10.36.117.237]) by smtp.corp.redhat.com (Postfix) with ESMTP id BA26C84420; Wed, 28 Mar 2018 16:36:31 +0000 (UTC) From: "Dr. David Alan Gilbert (git)" To: qemu-devel@nongnu.org, eswierk@skyportsystems.com, jasowang@redhat.com, pbonzini@redhat.com Date: Wed, 28 Mar 2018 17:36:24 +0100 Message-Id: <20180328163630.48576-1-dgilbert@redhat.com> X-Scanned-By: MIMEDefang 2.79 on 10.11.54.5 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.11.55.8]); Wed, 28 Mar 2018 16:36:39 +0000 (UTC) X-Greylist: inspected by milter-greylist-4.5.16 (mx1.redhat.com [10.11.55.8]); Wed, 28 Mar 2018 16:36:39 +0000 (UTC) for IP:'10.11.54.5' DOMAIN:'int-mx05.intmail.prod.int.rdu2.redhat.com' HELO:'smtp.corp.redhat.com' FROM:'dgilbert@redhat.com' RCPT:'' X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] [fuzzy] X-Received-From: 66.187.233.73 Subject: [Qemu-devel] [PATCH v2 0/6] e1000 migration changes for 2.12 X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: peterx@redhat.com, quintela@redhat.com Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: "Qemu-devel" From: "Dr. David Alan Gilbert" Hi, This set of patches change the e1000 migration code to make it easier to keep with compatibility with older versions in backwards migration. I think the first 3 patches are fairly uncontrovercial and I would like them for 2.12; it would be nice to have the lot since changing them after we've shipped is much more difficult. v2 Ed and Paolo answered my question that I asked in the cover letter; and I think I've followed the advice - although my testing has been very light. The new patches do two things: a) When we receive a stream without the subsection we duplicate the received pops state into both props and tso_props. b) When we send without the subsection we decide which set to send in the main part of the state based on which state was last changed. Dave Dr. David Alan Gilbert (6): e1000: Convert v3 fields to subsection e1000: Dupe offload data on reading old stream e1000: wire new subsection to property e1000: Migrate props via a temporary structure e1000: Choose which set of props to migrate e1000: Old machine types, turn new subsection off hw/net/e1000.c | 103 ++++++++++++++++++++++++++++++++++++++++------------ include/hw/compat.h | 4 ++ 2 files changed, 84 insertions(+), 23 deletions(-) Reviewed-by: Jason Wang