From patchwork Thu Feb 14 17:15:03 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Michael S. Tsirkin" X-Patchwork-Id: 220472 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (Client did not present a certificate) by ozlabs.org (Postfix) with ESMTPS id D3FD42C0085 for ; Fri, 15 Feb 2013 04:15:24 +1100 (EST) Received: from localhost ([::1]:42619 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1U62P3-0006LN-M7 for incoming@patchwork.ozlabs.org; Thu, 14 Feb 2013 12:15:21 -0500 Received: from eggs.gnu.org ([208.118.235.92]:58200) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1U62Ov-0006LC-9A for qemu-devel@nongnu.org; Thu, 14 Feb 2013 12:15:15 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1U62Oq-00035L-Qp for qemu-devel@nongnu.org; Thu, 14 Feb 2013 12:15:12 -0500 Received: from mx1.redhat.com ([209.132.183.28]:8925) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1U62Oq-00034i-JW for qemu-devel@nongnu.org; Thu, 14 Feb 2013 12:15:08 -0500 Received: from int-mx09.intmail.prod.int.phx2.redhat.com (int-mx09.intmail.prod.int.phx2.redhat.com [10.5.11.22]) by mx1.redhat.com (8.14.4/8.14.4) with ESMTP id r1EHF74G011160 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK); Thu, 14 Feb 2013 12:15:07 -0500 Received: from redhat.com (vpn1-6-92.ams2.redhat.com [10.36.6.92]) by int-mx09.intmail.prod.int.phx2.redhat.com (8.14.4/8.14.4) with SMTP id r1EHF35X009614; Thu, 14 Feb 2013 12:15:04 -0500 Date: Thu, 14 Feb 2013 19:15:03 +0200 From: "Michael S. Tsirkin" To: qemu-devel@nongnu.org Message-ID: <20130214171503.GA20373@redhat.com> MIME-Version: 1.0 Content-Disposition: inline X-Scanned-By: MIMEDefang 2.68 on 10.5.11.22 X-detected-operating-system: by eggs.gnu.org: GNU/Linux 3.x X-Received-From: 209.132.183.28 Cc: Anthony Liguori , Jan Kiszka , Jason Wang , Gerd Hoffmann , Stefan Hajnoczi , Paolo Bonzini , Amos Kong Subject: [Qemu-devel] [PATCH for-1.4] e1000: unbreak the guest network migration to 1.3 X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org QEMU 1.3 does not emulate the link auto negotiation, so if migrate to a 1.3 machine during link auto negotiation, the guest link will be set to down. Fix this by just disabling auto negotiation for 1.3. Signed-off-by: Michael S. Tsirkin Reviewed-by: Stefan Hajnoczi --- hw/e1000.c | 25 +++++++++++++++++++++++++ hw/pc_piix.c | 4 ++++ 2 files changed, 29 insertions(+) diff --git a/hw/e1000.c b/hw/e1000.c index d6fe815..263f2f4 100644 --- a/hw/e1000.c +++ b/hw/e1000.c @@ -131,6 +131,11 @@ typedef struct E1000State_st { } eecd_state; QEMUTimer *autoneg_timer; + +/* Enabled compatibility for migration to/from rhel6.3.0 and older */ +#define E1000_FLAG_QEMU_13_BIT 0 +#define E1000_FLAG_QEMU_13 (1 << E1000_FLAG_QEMU_13_BIT) + uint32_t compat_flags; } E1000State; #define defreg(x) x = (E1000_##x>>2) @@ -165,6 +170,14 @@ e1000_link_up(E1000State *s) static void set_phy_ctrl(E1000State *s, int index, uint16_t val) { + /* + * QEMU 1.3 does not support link auto-negotiation emulation, so if we + * migrate during auto negotiation, after migration the link will be + * down. + */ + if (s->compat_flags & E1000_FLAG_QEMU_13) { + return; + } if ((val & MII_CR_AUTO_NEG_EN) && (val & MII_CR_RESTART_AUTO_NEG)) { e1000_link_down(s); s->phy_reg[PHY_STATUS] &= ~MII_SR_AUTONEG_COMPLETE; @@ -1120,6 +1133,11 @@ static void e1000_pre_save(void *opaque) { E1000State *s = opaque; NetClientState *nc = qemu_get_queue(s->nic); + + if (s->compat_flags & E1000_FLAG_QEMU_13) { + return; + } + /* * If link is down and auto-negotiation is ongoing, complete * auto-negotiation immediately. This allows is to look at @@ -1141,6 +1159,11 @@ static int e1000_post_load(void *opaque, int version_id) * to link status bit in mac_reg[STATUS]. * Alternatively, restart link negotiation if it was in progress. */ nc->link_down = (s->mac_reg[STATUS] & E1000_STATUS_LU) == 0; + + if (s->compat_flags & E1000_FLAG_QEMU_13) { + return 0; + } + if (s->phy_reg[PHY_CTRL] & MII_CR_AUTO_NEG_EN && s->phy_reg[PHY_CTRL] & MII_CR_RESTART_AUTO_NEG && !(s->phy_reg[PHY_STATUS] & MII_SR_AUTONEG_COMPLETE)) { @@ -1343,6 +1366,8 @@ static void qdev_e1000_reset(DeviceState *dev) static Property e1000_properties[] = { DEFINE_NIC_PROPERTIES(E1000State, conf), + DEFINE_PROP_BIT("x-qemu_13_compat", E1000State, + compat_flags, E1000_FLAG_QEMU_13, false), DEFINE_PROP_END_OF_LIST(), }; diff --git a/hw/pc_piix.c b/hw/pc_piix.c index ba09714..89a3f1f 100644 --- a/hw/pc_piix.c +++ b/hw/pc_piix.c @@ -537,6 +537,10 @@ static QEMUMachine pc_machine_v0_13 = { .driver = "vmware-svga", .property = "rombar", .value = stringify(0), + },{ + .driver = "e1000", + .property = "x-qemu_13_compat", + .value = "on", }, { /* end of list */ } },