qemu-devel.nongnu.org archive mirror
 help / color / mirror / Atom feed
* [Qemu-devel] [PATCH] pc: don't access fw cfg if NULL
@ 2013-07-11 11:52 Michael S. Tsirkin
  2013-07-11 12:18 ` Igor Mammedov
  0 siblings, 1 reply; 2+ messages in thread
From: Michael S. Tsirkin @ 2013-07-11 11:52 UTC (permalink / raw)
  To: qemu-devel
  Cc: Anthony Liguori, Stefano Stabellini, Igor Mammedov, Paolo Bonzini,
	Andreas Färber

commit f8c457b88d72a48989f190bc3d7b79f4f3b7d11c
     "pc: pass PCI hole ranges to Guests"
broke Xen as it has no fw_cfg.
Check for this configuration and boil out.

Signed-off-by: Michael S. Tsirkin <mst@redhat.com>
Tested-by: Stefano Stabellini <stefano.stabellini@eu.citrix.com>

---

Anthony, could you fast-track this into master please?
Thanks!

 hw/i386/pc.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/hw/i386/pc.c b/hw/i386/pc.c
index 9f9207d..c7fc475 100644
--- a/hw/i386/pc.c
+++ b/hw/i386/pc.c
@@ -999,7 +999,7 @@ typedef struct PcRomPciInfo {
 static void pc_fw_cfg_guest_info(PcGuestInfo *guest_info)
 {
     PcRomPciInfo *info;
-    if (!guest_info->has_pci_info) {
+    if (!guest_info->has_pci_info || !guest_info->fw_cfg) {
         return;
     }
 
-- 
MST

^ permalink raw reply related	[flat|nested] 2+ messages in thread

* Re: [Qemu-devel] [PATCH] pc: don't access fw cfg if NULL
  2013-07-11 11:52 [Qemu-devel] [PATCH] pc: don't access fw cfg if NULL Michael S. Tsirkin
@ 2013-07-11 12:18 ` Igor Mammedov
  0 siblings, 0 replies; 2+ messages in thread
From: Igor Mammedov @ 2013-07-11 12:18 UTC (permalink / raw)
  To: Michael S. Tsirkin
  Cc: Paolo Bonzini, Anthony Liguori, Stefano Stabellini, qemu-devel,
	Andreas Färber

On Thu, 11 Jul 2013 14:52:40 +0300
"Michael S. Tsirkin" <mst@redhat.com> wrote:

> commit f8c457b88d72a48989f190bc3d7b79f4f3b7d11c
>      "pc: pass PCI hole ranges to Guests"
> broke Xen as it has no fw_cfg.
> Check for this configuration and boil out.
> 
> Signed-off-by: Michael S. Tsirkin <mst@redhat.com>
> Tested-by: Stefano Stabellini <stefano.stabellini@eu.citrix.com>
> 
> ---
> 
> Anthony, could you fast-track this into master please?
> Thanks!
> 
>  hw/i386/pc.c | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
> 
> diff --git a/hw/i386/pc.c b/hw/i386/pc.c
> index 9f9207d..c7fc475 100644
> --- a/hw/i386/pc.c
> +++ b/hw/i386/pc.c
> @@ -999,7 +999,7 @@ typedef struct PcRomPciInfo {
>  static void pc_fw_cfg_guest_info(PcGuestInfo *guest_info)
>  {
>      PcRomPciInfo *info;
> -    if (!guest_info->has_pci_info) {
> +    if (!guest_info->has_pci_info || !guest_info->fw_cfg) {
>          return;
>      }
>  

Reviewed-By: Igor Mammedov <imammedo@redhat.com>

^ permalink raw reply	[flat|nested] 2+ messages in thread

end of thread, other threads:[~2013-07-11 12:18 UTC | newest]

Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2013-07-11 11:52 [Qemu-devel] [PATCH] pc: don't access fw cfg if NULL Michael S. Tsirkin
2013-07-11 12:18 ` Igor Mammedov

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).