Re: [Xen-devel] [PATCH v4 1/7] x86/p2m/pod: make it build with !CONFIG_HVM

[Tamas K Lengyel <tamas@xxxxxxxxxxxxx>]

> diff --git a/xen/common/vm_event.c b/xen/common/vm_event.c
> index 4793aac..50d5ebc 100644
> --- a/xen/common/vm_event.c
> +++ b/xen/common/vm_event.c
> @@ -630,8 +630,6 @@ int vm_event_domctl(struct domain *d, struct 
> xen_domctl_vm_event_op *vec,
>          {
>          case XEN_VM_EVENT_ENABLE:
>          {
> -            struct p2m_domain *p2m = p2m_get_hostp2m(d);
> -
>              rc = -EOPNOTSUPP;
>              /* hvm fixme: p2m_is_foreign types need addressing */
>              if ( is_hvm_domain(hardware_domain) )
> @@ -647,10 +645,12 @@ int vm_event_domctl(struct domain *d, struct 
> xen_domctl_vm_event_op *vec,
>              if ( unlikely(need_iommu(d)) )
>                  break;
>
> +#ifdef CONFIG_HVM

Again, please don't put CONFIG_HVM in common code. If p2m->pod is now
conditionally available we will need a p2m wrapper function that is
arch-aware.

>              rc = -EXDEV;
>              /* Disallow paging in a PoD guest */
> -            if ( p2m->pod.entry_count )
> +            if ( p2m_get_hostp2m(d)->pod.entry_count )
>                  break;
> +#endif

Thanks,
Tamas

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