From patchwork Wed Jun 12 21:41:38 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Michael Roth X-Patchwork-Id: 250897 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [IPv6:2001:4830:134:3::11]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (Client did not present a certificate) by ozlabs.org (Postfix) with ESMTPS id 1B9BE2C0095 for ; Thu, 13 Jun 2013 07:56:37 +1000 (EST) Received: from localhost ([::1]:59223 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Umt1v-0000wK-2D for incoming@patchwork.ozlabs.org; Wed, 12 Jun 2013 17:56:35 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:40496) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Umsry-0007AU-OY for qemu-devel@nongnu.org; Wed, 12 Jun 2013 17:46:20 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1Umsrx-0001Nc-W1 for qemu-devel@nongnu.org; Wed, 12 Jun 2013 17:46:18 -0400 Received: from mail-ie0-x236.google.com ([2607:f8b0:4001:c03::236]:40062) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Umsrx-0001NO-S4; Wed, 12 Jun 2013 17:46:17 -0400 Received: by mail-ie0-f182.google.com with SMTP id s9so10043847iec.27 for ; Wed, 12 Jun 2013 14:46:17 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=sender:from:to:cc:subject:date:message-id:x-mailer:in-reply-to :references; bh=pX6q9C/UxuPAKTgbpD3f6NHSjmMaOeLrNm3tNQC6BhA=; b=Brb+ufYad3T6ObpIWxgCIZDaYMo+ZxBYGUo6BG2sfpSRKeAiUyTooOMw+NBbf4eTHq hGmYGBQnQJYqNM+AQaUqBjkvys+wF6Wor0ru5VQ2Qu8m+qmtBn+E/xEQZFc347nHvEaj jqtUBigDlz66GYddSyVlEFfxBvcIfxP4bxsvi47oH98Wscy1AYlhtXzFyzKC2cqfuK62 J/B6BGA/7+j/hS1W1A6HDKjKECxeCbCZQPdUvXUJNclrJngvZX5SB1thfzAgSD2I9Pw0 GIgUK+3xgbmZCgaTnijbA6WMeK/1tfj9mLAZDunxij/cSlio2/ELqe/TTfCK67YVNqf8 iQfg== X-Received: by 10.50.1.11 with SMTP id 11mr4421912igi.39.1371073577311; Wed, 12 Jun 2013 14:46:17 -0700 (PDT) Received: from localhost ([32.97.110.51]) by mx.google.com with ESMTPSA id qn10sm4245008igc.6.2013.06.12.14.46.15 for (version=TLSv1.2 cipher=RC4-SHA bits=128/128); Wed, 12 Jun 2013 14:46:16 -0700 (PDT) From: Michael Roth To: qemu-devel@nongnu.org Date: Wed, 12 Jun 2013 16:41:38 -0500 Message-Id: <1371073298-14519-27-git-send-email-mdroth@linux.vnet.ibm.com> X-Mailer: git-send-email 1.7.9.5 In-Reply-To: <1371073298-14519-1-git-send-email-mdroth@linux.vnet.ibm.com> References: <1371073298-14519-1-git-send-email-mdroth@linux.vnet.ibm.com> X-detected-operating-system: by eggs.gnu.org: Error: Malformed IPv6 address (bad octet value). X-Received-From: 2607:f8b0:4001:c03::236 Cc: qemu-stable@nongnu.org Subject: [Qemu-devel] [PATCH 26/26] q35: set fw_name 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: "Michael S. Tsirkin" PCI host bridges need to set fw_name to be discoverable by bios for boot device selection. In particular, seabios expects root device to be called "/pci/@i0cf8", so let's set it up like that for Q35. Cc: qemu-stable@nongnu.org Signed-off-by: Michael S. Tsirkin Tested-by: Amos Kong (cherry picked from commit 68c0e134a090666246b467deaf9046e573b089f2) Signed-off-by: Michael Roth --- hw/pci-host/q35.c | 1 + 1 file changed, 1 insertion(+) diff --git a/hw/pci-host/q35.c b/hw/pci-host/q35.c index 8467f86..24df6b5 100644 --- a/hw/pci-host/q35.c +++ b/hw/pci-host/q35.c @@ -76,6 +76,7 @@ static void q35_host_class_init(ObjectClass *klass, void *data) k->init = q35_host_init; dc->props = mch_props; + dc->fw_name = "pci"; } static void q35_host_initfn(Object *obj)