From patchwork Sun May 17 15:43:19 2009 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Anthony Liguori X-Patchwork-Id: 24331 Received: from vger.kernel.org (vger.kernel.org [209.132.176.167]) by demeter.kernel.org (8.14.2/8.14.2) with ESMTP id n4HFhs9l013044 for ; Sun, 17 May 2009 15:43:56 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754752AbZEQPnx (ORCPT ); Sun, 17 May 2009 11:43:53 -0400 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1754765AbZEQPnw (ORCPT ); Sun, 17 May 2009 11:43:52 -0400 Received: from e4.ny.us.ibm.com ([32.97.182.144]:54520 "EHLO e4.ny.us.ibm.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754752AbZEQPnq (ORCPT ); Sun, 17 May 2009 11:43:46 -0400 Received: from d01relay04.pok.ibm.com (d01relay04.pok.ibm.com [9.56.227.236]) by e4.ny.us.ibm.com (8.13.1/8.13.1) with ESMTP id n4HFdUdE022601 for ; Sun, 17 May 2009 11:39:30 -0400 Received: from d01av02.pok.ibm.com (d01av02.pok.ibm.com [9.56.224.216]) by d01relay04.pok.ibm.com (8.13.8/8.13.8/NCO v9.2) with ESMTP id n4HFhldC177344 for ; Sun, 17 May 2009 11:43:47 -0400 Received: from d01av02.pok.ibm.com (loopback [127.0.0.1]) by d01av02.pok.ibm.com (8.12.11.20060308/8.13.3) with ESMTP id n4HFfkEd030751 for ; Sun, 17 May 2009 11:41:47 -0400 Received: from localhost.localdomain (sig-9-65-8-189.mts.ibm.com [9.65.8.189]) by d01av02.pok.ibm.com (8.12.11.20060308/8.12.11) with ESMTP id n4HFfPce030035; Sun, 17 May 2009 11:41:45 -0400 From: Anthony Liguori To: kvm@vger.kernel.org Cc: Glauber Costa , Alex Williamson , Avi Kivity , Anthony Liguori Subject: [PATCH 17/17] virtio-net: Refuse loading if the source requires vnet header and the host doesn't support it Date: Sun, 17 May 2009 10:43:19 -0500 Message-Id: <1242574999-20887-19-git-send-email-aliguori@us.ibm.com> X-Mailer: git-send-email 1.6.0.6 In-Reply-To: <1242574999-20887-1-git-send-email-aliguori@us.ibm.com> References: <1242574999-20887-1-git-send-email-aliguori@us.ibm.com> Sender: kvm-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: kvm@vger.kernel.org From: Alex Williamson Bail if the saved image requires vnet header support. Signed-off-by: Alex Williamson Signed-off-by: Avi Kivity Signed-off-by: Anthony Liguori diff --git a/hw/virtio-net.c b/hw/virtio-net.c index 2da4c47..f65ecd7 100644 --- a/hw/virtio-net.c +++ b/hw/virtio-net.c @@ -658,14 +658,15 @@ static int virtio_net_load(QEMUFile *f, void *opaque, int version_id) if (version_id >= 6) qemu_get_buffer(f, (uint8_t *)n->vlans, MAX_VLAN >> 3); -#ifdef TAP_VNET_HDR if (version_id == 7 && qemu_get_be32(f)) { +#ifdef TAP_VNET_HDR tap_using_vnet_hdr(n->vc->vlan->first_client, 1); - } #else - /* FIXME: error out if nonzero? */ - qemu_get_be32(f); + fprintf(stderr, + "virtio-net: saved image requires vnet header support\n"); + exit(1); #endif + } if (n->tx_timer_active) { qemu_mod_timer(n->tx_timer,