mirror of
https://github.com/xen-project/xen.git
synced 2026-10-29 10:40:03 +01:00
Revert "xen/domctl: Introduce XEN_DOMCTL_CDF_vpci flag"
This reverts commit 2075b410ee.
During the discussion [1] that took place after
the patch was merged it was agreed that it should
be reverted to avoid introducing a bad interface.
Furthermore, the patch rejected usage of flag
XEN_DOMCTL_CDF_vpci for x86 which is not true
as it should be set for dom0 PVH.
Due to XEN_DOMCTL_CDF_vpmu being introduced after
XEN_DOMCTL_CDF_vpci, modify its bit position
from 8 to 7.
[1] https://marc.info/?t=163354215300039&r=1&w=2
Signed-off-by: Michal Orzel <michal.orzel@arm.com>
Acked-by: Jan Beulich <jbeulich@suse.com>
Acked-by: Christian Lindig <christian.lindig@citrix.com<mailto:christian.lindig@citrix.com>>
Acked-by: Julien Grall <jgrall@amazon.com>
Reviewed-by: Bertrand Marquis <bertrand.marquis@arm.com>
This commit is contained in:
Michal Orzel authored and 
Julien Grall committed
1 parent
4cfab4425d
commit
9516d01ac3
6 files changed
+3
-14
No files matched your search
@@ -69,7 +69,6 @@ type domain_create_flag =
|
||||
| CDF_XS_DOMAIN
|
||||
| CDF_IOMMU
|
||||
| CDF_NESTED_VIRT
|
||||
| CDF_VPCI
|
||||
| CDF_VPMU
|
||||
|
||||
type domain_create_iommu_opts =
|
||||
|
||||
@@ -62,7 +62,6 @@ type domain_create_flag =
|
||||
| CDF_XS_DOMAIN
|
||||
| CDF_IOMMU
|
||||
| CDF_NESTED_VIRT
|
||||
| CDF_VPCI
|
||||
| CDF_VPMU
|
||||
|
||||
type domain_create_iommu_opts =
|
||||
|
||||
@@ -628,8 +628,7 @@ int arch_sanitise_domain_config(struct xen_domctl_createdomain *config)
|
||||
{
|
||||
unsigned int max_vcpus;
|
||||
unsigned int flags_required = (XEN_DOMCTL_CDF_hvm | XEN_DOMCTL_CDF_hap);
|
||||
unsigned int flags_optional = (XEN_DOMCTL_CDF_iommu | XEN_DOMCTL_CDF_vpci |
|
||||
XEN_DOMCTL_CDF_vpmu);
|
||||
unsigned int flags_optional = (XEN_DOMCTL_CDF_iommu | XEN_DOMCTL_CDF_vpmu);
|
||||
|
||||
if ( (config->flags & ~flags_optional) != flags_required )
|
||||
{
|
||||
|
||||
@@ -662,12 +662,6 @@ int arch_sanitise_domain_config(struct xen_domctl_createdomain *config)
|
||||
return -EINVAL;
|
||||
}
|
||||
|
||||
if ( config->flags & XEN_DOMCTL_CDF_vpci )
|
||||
{
|
||||
dprintk(XENLOG_INFO, "vPCI cannot be enabled yet\n");
|
||||
return -EINVAL;
|
||||
}
|
||||
|
||||
if ( config->vmtrace_size )
|
||||
{
|
||||
unsigned int size = config->vmtrace_size;
|
||||
|
||||
+1
-2
@@ -486,8 +486,7 @@ static int sanitise_domain_config(struct xen_domctl_createdomain *config)
|
||||
~(XEN_DOMCTL_CDF_hvm | XEN_DOMCTL_CDF_hap |
|
||||
XEN_DOMCTL_CDF_s3_integrity | XEN_DOMCTL_CDF_oos_off |
|
||||
XEN_DOMCTL_CDF_xs_domain | XEN_DOMCTL_CDF_iommu |
|
||||
XEN_DOMCTL_CDF_nested_virt | XEN_DOMCTL_CDF_vpci |
|
||||
XEN_DOMCTL_CDF_vpmu) )
|
||||
XEN_DOMCTL_CDF_nested_virt | XEN_DOMCTL_CDF_vpmu) )
|
||||
{
|
||||
dprintk(XENLOG_INFO, "Unknown CDF flags %#x\n", config->flags);
|
||||
return -EINVAL;
|
||||
|
||||
@@ -70,9 +70,8 @@ struct xen_domctl_createdomain {
|
||||
#define XEN_DOMCTL_CDF_iommu (1U<<_XEN_DOMCTL_CDF_iommu)
|
||||
#define _XEN_DOMCTL_CDF_nested_virt 6
|
||||
#define XEN_DOMCTL_CDF_nested_virt (1U << _XEN_DOMCTL_CDF_nested_virt)
|
||||
#define XEN_DOMCTL_CDF_vpci (1U << 7)
|
||||
/* Should we expose the vPMU to the guest? */
|
||||
#define XEN_DOMCTL_CDF_vpmu (1U << 8)
|
||||
#define XEN_DOMCTL_CDF_vpmu (1U << 7)
|
||||
|
||||
/* Max XEN_DOMCTL_CDF_* constant. Used for ABI checking. */
|
||||
#define XEN_DOMCTL_CDF_MAX XEN_DOMCTL_CDF_vpmu
|
||||
|
||||