From mboxrd@z Thu Jan  1 00:00:00 1970
From: Avi Kivity <avi@redhat.com>
Subject: Re: [PATCH] kvm: qemu: virtio-net: migration fixes
Date: Mon, 12 Jan 2009 09:09:01 +0200
Message-ID: <496AEC8D.2070208@redhat.com>
References: <20090111142130.3EEC625000B@cleopatra.tlv.redhat.com> <496AA0B2.1080909@codemonkey.ws>
Mime-Version: 1.0
Content-Type: text/plain; charset=ISO-8859-1; format=flowed
Content-Transfer-Encoding: 7bit
Cc: Mark McLoughlin <markmc@redhat.com>,
	kvm-devel <kvm@vger.kernel.org>
To: Anthony Liguori <anthony@codemonkey.ws>
Return-path: <kvm-owner@vger.kernel.org>
Received: from mx2.redhat.com ([66.187.237.31]:53831 "EHLO mx2.redhat.com"
	rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP
	id S1750903AbZALHIp (ORCPT <rfc822;kvm@vger.kernel.org>);
	Mon, 12 Jan 2009 02:08:45 -0500
In-Reply-To: <496AA0B2.1080909@codemonkey.ws>
Sender: kvm-owner@vger.kernel.org
List-ID: <kvm.vger.kernel.org>

Anthony Liguori wrote:
>> +
>> +#ifdef TAP_VNET_HDR
>> +    qemu_put_be32(f, tap_has_vnet_hdr(n->vc->vlan->first_client));
>> +#endif
>>   
>
> This should increment the save/restore format version number to 
> preserve backwards compatibility.  It'll also be required for merging 
> into QEMU upstream.
>
> As a rule, if new fields are added to a save/load function, the 
> version number should be incremented.

That only works if this is the very next change in qemu upstream.  If 
you accept another fix first, or require changes to this fix, then we're 
out of luck.

I don't see any solution except continuing to merge.

-- 
I have a truly marvellous patch that fixes the bug which this
signature is too narrow to contain.