From patchwork Thu May 30 06:09:05 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: 247459 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 A4A202C0096 for ; Thu, 30 May 2013 16:09:14 +1000 (EST) Received: from localhost ([::1]:55352 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Uhw2y-0004j2-K3 for incoming@patchwork.ozlabs.org; Thu, 30 May 2013 02:09:12 -0400 Received: from eggs.gnu.org ([208.118.235.92]:36749) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Uhw2f-0004iu-Pj for qemu-devel@nongnu.org; Thu, 30 May 2013 02:08:59 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1Uhw2Z-0001Lu-LW for qemu-devel@nongnu.org; Thu, 30 May 2013 02:08:53 -0400 Received: from mx1.redhat.com ([209.132.183.28]:59030) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Uhw2Z-0001L4-DS for qemu-devel@nongnu.org; Thu, 30 May 2013 02:08:47 -0400 Received: from int-mx02.intmail.prod.int.phx2.redhat.com (int-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.12]) by mx1.redhat.com (8.14.4/8.14.4) with ESMTP id r4U68hYI015384 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK); Thu, 30 May 2013 02:08:44 -0400 Received: from redhat.com (vpn-203-5.tlv.redhat.com [10.35.203.5]) by int-mx02.intmail.prod.int.phx2.redhat.com (8.13.8/8.13.8) with SMTP id r4U68ZTN031877; Thu, 30 May 2013 02:08:37 -0400 Date: Thu, 30 May 2013 09:09:05 +0300 From: "Michael S. Tsirkin" To: Amos Kong Message-ID: <20130530060905.GB9952@redhat.com> References: <1369882068-5483-1-git-send-email-akong@redhat.com> MIME-Version: 1.0 Content-Disposition: inline In-Reply-To: <1369882068-5483-1-git-send-email-akong@redhat.com> X-Scanned-By: MIMEDefang 2.67 on 10.5.11.12 X-detected-operating-system: by eggs.gnu.org: GNU/Linux 3.x X-Received-From: 209.132.183.28 Cc: pbonzini@redhat.com, kevin@koconnor.net, seabios@seabios.org, qemu-devel@nongnu.org, aliguori@us.ibm.com Subject: Re: [Qemu-devel] [PATCH] pci: change typename of q35 to pci-q35 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 On Thu, May 30, 2013 at 10:47:48AM +0800, Amos Kong wrote: > In QEMU, we set the firmware name of pc-i440fx is 'pci', and set the > firmware name of q35 is 'q35-pcihost'. > > The seabios pattern matching code isn't sophisticated, and we want to > match those two devices with exact pattern. > > This patch changes the typename of q35 to 'pci-q35', all pci devices > use same prefix 'pci' in fireware name. And I will change pattern in > seabios to "/pci*@i0cf8". > > Signed-off-by: Amos Kong Let's just not leak name to the guest - there's no reason to. Won't the following address the issue without bios changes? Maybe we should find some way to set fw_name in hw/pci/pci_host.c, worth looking into. Signed-off-by: Michael S. Tsirkin 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)