From mboxrd@z Thu Jan  1 00:00:00 1970
Received: from [140.186.70.92] (port=60459 helo=eggs.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1Oxl1e-0003yp-CG
	for qemu-devel@nongnu.org; Mon, 20 Sep 2010 14:23:39 -0400
Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.69)
	(envelope-from <anthony@codemonkey.ws>) id 1Oxl1d-0008Qv-7u
	for qemu-devel@nongnu.org; Mon, 20 Sep 2010 14:23:38 -0400
Received: from mail-gy0-f173.google.com ([209.85.160.173]:52097)
	by eggs.gnu.org with esmtp (Exim 4.69)
	(envelope-from <anthony@codemonkey.ws>) id 1Oxl1d-0008Qo-15
	for qemu-devel@nongnu.org; Mon, 20 Sep 2010 14:23:37 -0400
Received: by gya1 with SMTP id 1so1857137gya.4
	for <qemu-devel@nongnu.org>; Mon, 20 Sep 2010 11:23:36 -0700 (PDT)
Message-ID: <4C97A69A.1070705@codemonkey.ws>
Date: Mon, 20 Sep 2010 13:23:22 -0500
From: Anthony Liguori <anthony@codemonkey.ws>
MIME-Version: 1.0
References: <20100920180840.GA31179@redhat.com>
In-Reply-To: <20100920180840.GA31179@redhat.com>
Content-Type: text/plain; charset=ISO-8859-1; format=flowed
Content-Transfer-Encoding: 7bit
Subject: [Qemu-devel] Re: [PULL] vhost,e1000 fixes
List-Id: qemu-devel.nongnu.org
List-Unsubscribe: <http://lists.nongnu.org/mailman/listinfo/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: <http://lists.nongnu.org/mailman/listinfo/qemu-devel>,
	<mailto:qemu-devel-request@nongnu.org?subject=subscribe>
To: "Michael S. Tsirkin" <mst@redhat.com>
Cc: blauwirbel@gmail.com, qemu-devel@nongnu.org

On 09/20/2010 01:08 PM, Michael S. Tsirkin wrote:
> This fixes a bug in vhost error handling
> (also triggers build warning with vhost enabled)
> and fixes e1000 handling of short frames.
>
> Discussion on best ways to fix the e1000 issue
> is still ongoing but the  bug is severe enough
> for some guests and the fix is safe enough
> that I feel we should have it fixed ASAP
> and look for that perfect approach later.
>
> Both fixes are 0.13 material IMO.
>    

Pulled.   Thanks.

Regards,

Anthony LIguori

> The following changes since commit 952afb719f3c965bae12b5bd5f0f0f7ed0251cb8:
>
>    mingw: use ASLR, no-SEH and DEP if available (2010-09-19 08:36:34 +0000)
>
> are available in the git repository at:
>    git://git.kernel.org/pub/scm/linux/kernel/git/mst/qemu.git for_anthony
>
> Michael S. Tsirkin (1):
>        vhost: fix infinite loop on error path
>
> Stefan Hajnoczi (1):
>        e1000: Pad short frames to minimum size (60 bytes)
>
>   hw/e1000.c     |   10 ++++++++++
>   hw/vhost_net.c |    2 +-
>   2 files changed, 11 insertions(+), 1 deletions(-)
>