From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from [140.186.70.92] (port=34145 helo=eggs.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1Oxksz-0005qw-NI for qemu-devel@nongnu.org; Mon, 20 Sep 2010 14:14:42 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.69) (envelope-from ) id 1Oxksy-0006hn-C1 for qemu-devel@nongnu.org; Mon, 20 Sep 2010 14:14:41 -0400 Received: from mx1.redhat.com ([209.132.183.28]:42594) by eggs.gnu.org with esmtp (Exim 4.69) (envelope-from ) id 1Oxksy-0006hh-5Y for qemu-devel@nongnu.org; Mon, 20 Sep 2010 14:14:40 -0400 Date: Mon, 20 Sep 2010 20:08:40 +0200 From: "Michael S. Tsirkin" Message-ID: <20100920180840.GA31179@redhat.com> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline Subject: [Qemu-devel] [PULL] vhost,e1000 fixes List-Id: qemu-devel.nongnu.org List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: blauwirbel@gmail.com, Anthony Liguori , qemu-devel@nongnu.org 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. 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(-) -- MST