From patchwork Sat Aug 4 11:29:55 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: dunrong huang X-Patchwork-Id: 175083 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 6059B2C0084 for ; Sat, 4 Aug 2012 21:30:16 +1000 (EST) Received: from localhost ([::1]:57949 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1SxcYg-00056g-Ep for incoming@patchwork.ozlabs.org; Sat, 04 Aug 2012 07:30:14 -0400 Received: from eggs.gnu.org ([208.118.235.92]:42476) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1SxcYY-00054l-Vf for qemu-devel@nongnu.org; Sat, 04 Aug 2012 07:30:07 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1SxcYW-0000oj-MJ for qemu-devel@nongnu.org; Sat, 04 Aug 2012 07:30:06 -0400 Received: from mail-pb0-f45.google.com ([209.85.160.45]:57655) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1SxcYW-0000he-9c; Sat, 04 Aug 2012 07:30:04 -0400 Received: by pbbro12 with SMTP id ro12so2651225pbb.4 for ; Sat, 04 Aug 2012 04:30:00 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=from:to:cc:subject:date:message-id:x-mailer; bh=1H1RwF17126vHH8RI2UDMsvsWI5TIMdaubEWShPNsK4=; b=RqnDy/sltxcWH+WTKKC39RkhBCB+4+F2u1O+3pB4dC1zqJz6s3aEZKmQN+6C6KsEW/ MSwMWLnS+M2in09twC44qamYerCuI6fp0mjemW+7H1he/tL9Z+N7tGvJ/0M6cjeJYxAq sdwNsHb7FgekKtDpvc7oXzCsx2S1rdaG72UJ8ZVqbM7qDqoMCAUvX8wAHoVUx/IjhaLl 3Y/AiHsQLVOBXL+8EyXXKfxlC0qdxTEQmGujXDjRWmUZH0ojHBaUDO6MlQhEG8qOAHQZ JoTLdZICuiZcePqoVwUBnDrAKdpX+UNCb2PdOKo/Ka3zgVcgn6FCAULVjUmbbSTqpxIW tfog== Received: by 10.66.74.100 with SMTP id s4mr4822909pav.27.1344079800390; Sat, 04 Aug 2012 04:30:00 -0700 (PDT) Received: from localhost.localdomain ([114.249.89.76]) by mx.google.com with ESMTPS id og7sm4468928pbb.62.2012.08.04.04.29.56 (version=TLSv1/SSLv3 cipher=OTHER); Sat, 04 Aug 2012 04:29:59 -0700 (PDT) From: riegamaths@gmail.com To: qemu-devel , Date: Sat, 4 Aug 2012 19:29:55 +0800 Message-Id: <1344079795-8050-1-git-send-email-riegamaths@gmail.com> X-Mailer: git-send-email 1.7.8.6 X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 209.85.160.45 Cc: Stefan Hajnoczi , Dunrong Huang Subject: [Qemu-devel] [PATCH] build: Fix build breakage detected by buildbot 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 From: Dunrong Huang More details: http://buildbot.b1-systems.de/qemu/builders/xen_unstable/builds/83/steps/compile/logs/stdio VLANState has been removed since commit a005d07, so "vlan id" should be fetched using net_hub_id_for_client(). Signed-off-by: Dunrong Huang --- hw/xen_backend.h | 1 + hw/xen_devconfig.c | 10 ++++++---- 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/hw/xen_backend.h b/hw/xen_backend.h index 3305630..fea86dd 100644 --- a/hw/xen_backend.h +++ b/hw/xen_backend.h @@ -4,6 +4,7 @@ #include "xen_common.h" #include "sysemu.h" #include "net.h" +#include "net/hub.h" /* ------------------------------------------------------------- */ diff --git a/hw/xen_devconfig.c b/hw/xen_devconfig.c index 0928613..d83e8d0 100644 --- a/hw/xen_devconfig.c +++ b/hw/xen_devconfig.c @@ -123,19 +123,21 @@ int xen_config_dev_nic(NICInfo *nic) { char fe[256], be[256]; char mac[20]; + int vlan_id = -1; + net_hub_id_for_client(nic->netdev, &vlan_id); snprintf(mac, sizeof(mac), "%02x:%02x:%02x:%02x:%02x:%02x", nic->macaddr.a[0], nic->macaddr.a[1], nic->macaddr.a[2], nic->macaddr.a[3], nic->macaddr.a[4], nic->macaddr.a[5]); - xen_be_printf(NULL, 1, "config nic %d: mac=\"%s\"\n", nic->vlan->id, mac); - xen_config_dev_dirs("vif", "qnic", nic->vlan->id, fe, be, sizeof(fe)); + xen_be_printf(NULL, 1, "config nic %d: mac=\"%s\"\n", vlan_id, mac); + xen_config_dev_dirs("vif", "qnic", vlan_id, fe, be, sizeof(fe)); /* frontend */ - xenstore_write_int(fe, "handle", nic->vlan->id); + xenstore_write_int(fe, "handle", vlan_id); xenstore_write_str(fe, "mac", mac); /* backend */ - xenstore_write_int(be, "handle", nic->vlan->id); + xenstore_write_int(be, "handle", vlan_id); xenstore_write_str(be, "mac", mac); /* common stuff */