Re: [Xen-devel] [PATCH] x86/mm: Drop {HAP,SHADOW}_ERROR() wrappers

["Jan Beulich" <JBeulich@xxxxxxxx>]

>>> On 28.08.18 at 20:11, <andrew.cooper3@xxxxxxxxxx> wrote:
> --- a/xen/arch/x86/mm/hap/hap.c
> +++ b/xen/arch/x86/mm/hap/hap.c
> @@ -304,10 +304,11 @@ static void hap_free_p2m_page(struct domain *d, struct 
> page_info *pg)
>      /* Should still have no owner and count zero. */
>      if ( owner || (pg->count_info & PGC_count_mask) )
>      {
> -        HAP_ERROR("d%d: Odd p2m page %"PRI_mfn" d=%d c=%lx 
> t=%"PRtype_info"\n",
> -                  d->domain_id, mfn_x(page_to_mfn(pg)),
> -                  owner ? owner->domain_id : DOMID_INVALID,
> -                  pg->count_info, pg->u.inuse.type_info);
> +        printk(XENLOG_ERR
> +               "d%d: Odd p2m page %"PRI_mfn" d=%d c=%lx t=%"PRtype_info"\n",
> +               d->domain_id, mfn_x(page_to_mfn(pg)),
> +               owner ? owner->domain_id : DOMID_INVALID,
> +               pg->count_info, pg->u.inuse.type_info);
>          WARN();

This being WARN(), perhaps then also XENLOG_WARNING?

> @@ -2478,9 +2478,7 @@ sh_map_and_validate_gl4e(struct vcpu *v, mfn_t gl4mfn,
>                                  shadow_l4_index,
>                                  validate_gl4e);
>  #else // ! GUEST_PAGING_LEVELS >= 4
> -    SHADOW_ERROR("called in wrong paging mode!\n");
> -    BUG();
> -    return 0;
> +    BUG(); /* Called in wrong paging mode! */
>  #endif
>  }

Isn't this going to break the build for certain older gcc versions?
ISTR some similar problems in the past.

Jan



_______________________________________________
Xen-devel mailing list
Xen-devel@xxxxxxxxxxxxxxxxxxxx
https://lists.xenproject.org/mailman/listinfo/xen-devel