Re: [Qemu-devel] [PATCH] pc: don't access fw cfg if NULL

[Igor Mammedov <imammedo@redhat.com>]

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>