diff mbox

pci: change typename of q35 to pci-q35

Message ID 20130530060905.GB9952@redhat.com
State New
Headers show

Commit Message

Michael S. Tsirkin May 30, 2013, 6:09 a.m. UTC
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 <akong@redhat.com>

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 <mst@redhat.com>

---

Comments

Amos Kong May 30, 2013, 7:27 a.m. UTC | #1
On Thu, May 30, 2013 at 09:09:05AM +0300, Michael S. Tsirkin wrote:
> 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 <akong@redhat.com>
> 
> 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 <mst@redhat.com>
> 
> ---
> 
> 
> 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";

It's a light change, works with current seabios.

>  }
>  
>  static void q35_host_initfn(Object *obj)
diff mbox

Patch

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)