From mboxrd@z Thu Jan  1 00:00:00 1970
Received: from eggs.gnu.org ([2001:4830:134:3::10]:59220)
	by lists.gnu.org with esmtp (Exim 4.71)
	(envelope-from <mst@redhat.com>) id 1bcJKx-0001Y1-P6
	for qemu-devel@nongnu.org; Tue, 23 Aug 2016 17:34:24 -0400
Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71)
	(envelope-from <mst@redhat.com>) id 1bcJKt-0007lv-K0
	for qemu-devel@nongnu.org; Tue, 23 Aug 2016 17:34:22 -0400
Received: from mx1.redhat.com ([209.132.183.28]:46856)
	by eggs.gnu.org with esmtp (Exim 4.71)
	(envelope-from <mst@redhat.com>) id 1bcJKt-0007ll-Dv
	for qemu-devel@nongnu.org; Tue, 23 Aug 2016 17:34:19 -0400
Date: Wed, 24 Aug 2016 00:34:16 +0300
From: "Michael S. Tsirkin" <mst@redhat.com>
Message-ID: <20160824003306-mutt-send-email-mst@kernel.org>
References: <1471853367-18474-1-git-send-email-jasowang@redhat.com>
	<1471853367-18474-3-git-send-email-jasowang@redhat.com>
	<20160823191651.GA2555@localhost.localdomain>
	<87oa4jmbpm.fsf@dusky.pond.sub.org>
MIME-Version: 1.0
Content-Type: text/plain; charset=us-ascii
Content-Disposition: inline
In-Reply-To: <87oa4jmbpm.fsf@dusky.pond.sub.org>
Subject: Re: [Qemu-devel] [PULL 2/2] e1000e: remove internal interrupt flag
List-Id: <qemu-devel.nongnu.org>
List-Unsubscribe: <https://lists.nongnu.org/mailman/options/qemu-devel>,
	<mailto:qemu-devel-request@nongnu.org?subject=unsubscribe>
List-Archive: <http://lists.nongnu.org/archive/html/qemu-devel/>
List-Post: <mailto:qemu-devel@nongnu.org>
List-Help: <mailto:qemu-devel-request@nongnu.org?subject=help>
List-Subscribe: <https://lists.nongnu.org/mailman/listinfo/qemu-devel>,
	<mailto:qemu-devel-request@nongnu.org?subject=subscribe>
To: Markus Armbruster <armbru@redhat.com>
Cc: Amit Shah <amit.shah@redhat.com>, Jason Wang <jasowang@redhat.com>, peter.maydell@linaro.org, qemu-devel@nongnu.org, Dmitry Fleytman <dmitry@daynix.com>, Cao jin <caoj.fnst@cn.fujitsu.com>, Marcel Apfelbaum <marcel@redhat.com>, Paolo Bonzini <pbonzini@redhat.com>

On Tue, Aug 23, 2016 at 11:12:21PM +0200, Markus Armbruster wrote:
> Amit Shah <amit.shah@redhat.com> writes:
> 
> > On (Mon) 22 Aug 2016 [16:09:27], Jason Wang wrote:
> >> From: Cao jin <caoj.fnst@cn.fujitsu.com>
> >> 
> >> Commit 66bf7d58 removed internal msi state flag E1000E_USE_MSI, E1000E_USE_MSIX
> >> is not necessary too, remove it now. And interrupt flag field intr_state also
> >> can be removed now.
> >> 
> >> CC: Dmitry Fleytman <dmitry@daynix.com>
> >> CC: Jason Wang <jasowang@redhat.com>
> >> CC: Markus Armbruster <armbru@redhat.com>
> >> CC: Marcel Apfelbaum <marcel@redhat.com>
> >> CC: Michael S. Tsirkin <mst@redhat.com>
> >> CC: Paolo Bonzini <pbonzini@redhat.com>
> >> Signed-off-by: Cao jin <caoj.fnst@cn.fujitsu.com>
> >> Reviewed-by: Markus Armbruster <armbru@redhat.com>
> >> Acked-by: Dmitry Fleytman <dmitry@daynix.com>
> >> Reviewed-by: Paolo Bonzini <pbonzini@redhat.com>
> >> Signed-off-by: Jason Wang <jasowang@redhat.com>
> >> ---
> >>  hw/net/e1000e.c | 8 +-------
> >>  1 file changed, 1 insertion(+), 7 deletions(-)
> >
> >
> >> @@ -601,7 +596,6 @@ static const VMStateDescription e1000e_vmstate = {
> >>          VMSTATE_MSIX(parent_obj, E1000EState),
> >>  
> >>          VMSTATE_UINT32(ioaddr, E1000EState),
> >> -        VMSTATE_UINT32(intr_state, E1000EState),
> >>          VMSTATE_UINT32(core.rxbuf_min_shift, E1000EState),
> >>          VMSTATE_UINT8(core.rx_desc_len, E1000EState),
> >>          VMSTATE_UINT32_ARRAY(core.rxbuf_sizes, E1000EState,
> >
> > This breaks migration - please mark that field 'unused'.
> 
> Does it matter?  The device hasn't been in any released version of
> QEMU...

Ah so that's why we are merging this patch before 2.7 - to keep
migration format clean.
I withdraw my objection.

-- 
MST