From mboxrd@z Thu Jan 1 00:00:00 1970 From: Avi Kivity Subject: Re: [PULL REQUEST] merge latest upstream qemu networking bits Date: Mon, 02 Nov 2009 12:36:30 +0200 Message-ID: <4AEEB62E.4090206@redhat.com> References: <1256739546.5105.48.camel@blaa> Mime-Version: 1.0 Content-Type: text/plain; charset=UTF-8; format=flowed Content-Transfer-Encoding: 7bit Cc: Marcelo Tosatti , kvm To: Mark McLoughlin Return-path: Received: from mx1.redhat.com ([209.132.183.28]:4974 "EHLO mx1.redhat.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754047AbZKBKg2 (ORCPT ); Mon, 2 Nov 2009 05:36:28 -0500 Received: from int-mx03.intmail.prod.int.phx2.redhat.com (int-mx03.intmail.prod.int.phx2.redhat.com [10.5.11.16]) by mx1.redhat.com (8.13.8/8.13.8) with ESMTP id nA2AaXxL001502 for ; Mon, 2 Nov 2009 05:36:33 -0500 In-Reply-To: <1256739546.5105.48.camel@blaa> Sender: kvm-owner@vger.kernel.org List-ID: On 10/28/2009 04:19 PM, Mark McLoughlin wrote: > Hey, > > Below is a pull request to merge latest qemu.git/master into > qemu-kvm.git/next > > Pulled, thanks. > The most notable thing here is that all our networking changes are now > upstream - i.e. there are no longer qemu-kvm specific changes to > net.[ch], net-queue.[ch], savevm.c and hw/virtio-net.c > > This has resulted in one intentional regression - in order to use GSO, > you must now use '-netdev tap' rather than '-net tap'. We could continue > to support the latter, but it's never going upstream so we may as well > drop it now. > > Another regression is that virtio-net loses it's MAC address, but I've > just sent a fix for that to qemu-devel. > What does this mean? It loses the ability to set it? > The merge wasn't as straightforward as one might have hoped because many > of the intermediate upstream commits weren't actually buildable because > the patches were mangled as they were applied. I took the approach of > merging those unbuildable commits individually and applying a fixup > patch, so each merge commit should be buildable. Those fixup changes > went away in later merges. > Great, thanks. -- error compiling committee.c: too many arguments to function