[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index] [Xen-devel] [PATCH for-next v2 06/10] x86/domain: push some code down to hvm_domain_initialise
We want to have a single entry point to initialise hvm guest. Now the timing to set hap bit and create per domain mapping is deferred, but that's not a problem. No functional change. Signed-off-by: Wei Liu <wei.liu2@xxxxxxxxxx> --- v2: 1. reorder things to avoid rename labels 2. add config to hvm_domain_initialise Cc: Jan Beulich <jbeulich@xxxxxxxx> Cc: Andrew Cooper <andrew.cooper3@xxxxxxxxxx> --- xen/arch/x86/domain.c | 14 +++----------- xen/arch/x86/hvm/hvm.c | 11 ++++++++++- xen/include/asm-x86/hvm/hvm.h | 3 ++- 3 files changed, 15 insertions(+), 13 deletions(-) diff --git a/xen/arch/x86/domain.c b/xen/arch/x86/domain.c index 38fc4f5d8b..fd5d47ab3d 100644 --- a/xen/arch/x86/domain.c +++ b/xen/arch/x86/domain.c @@ -596,16 +596,8 @@ int arch_domain_create(struct domain *d, unsigned int domcr_flags, d->arch.emulation_flags = emflags; } - if ( is_hvm_domain(d) ) - { - d->arch.hvm_domain.hap_enabled = - hvm_funcs.hap_supported && (domcr_flags & DOMCRF_hap); - - rc = create_perdomain_mapping(d, PERDOMAIN_VIRT_START, 0, NULL, NULL); - } - else if ( is_idle_domain(d) ) - rc = 0; - else + rc = 0; /* HVM and idle domain */ + if ( is_pv_domain(d) ) { d->arch.pv_domain.gdt_ldt_l1tab = alloc_xenheap_pages(0, MEMF_node(domain_to_node(d))); @@ -672,7 +664,7 @@ int arch_domain_create(struct domain *d, unsigned int domcr_flags, if ( is_hvm_domain(d) ) { - if ( (rc = hvm_domain_initialise(d)) != 0 ) + if ( (rc = hvm_domain_initialise(d, domcr_flags, config)) != 0 ) goto fail; } else diff --git a/xen/arch/x86/hvm/hvm.c b/xen/arch/x86/hvm/hvm.c index a441955322..9e9f1dbd53 100644 --- a/xen/arch/x86/hvm/hvm.c +++ b/xen/arch/x86/hvm/hvm.c @@ -595,7 +595,8 @@ static int hvm_print_line( return X86EMUL_OKAY; } -int hvm_domain_initialise(struct domain *d) +int hvm_domain_initialise(struct domain *d, unsigned long domcr_flags, + struct xen_arch_domainconfig *config) { unsigned int nr_gsis; int rc; @@ -613,6 +614,12 @@ int hvm_domain_initialise(struct domain *d) INIT_LIST_HEAD(&d->arch.hvm_domain.write_map.list); INIT_LIST_HEAD(&d->arch.hvm_domain.g2m_ioport_list); + d->arch.hvm_domain.hap_enabled = + hvm_funcs.hap_supported && (domcr_flags & DOMCRF_hap); + rc = create_perdomain_mapping(d, PERDOMAIN_VIRT_START, 0, NULL, NULL); + if ( rc ) + goto fail; + hvm_init_cacheattr_region_list(d); rc = paging_enable(d, PG_refcounts|PG_translate|PG_external); @@ -696,6 +703,8 @@ int hvm_domain_initialise(struct domain *d) xfree(d->arch.hvm_domain.irq); fail0: hvm_destroy_cacheattr_region_list(d); + destroy_perdomain_mapping(d, PERDOMAIN_VIRT_START, 0); + fail: return rc; } diff --git a/xen/include/asm-x86/hvm/hvm.h b/xen/include/asm-x86/hvm/hvm.h index 7a85b2e3b5..b687e03dce 100644 --- a/xen/include/asm-x86/hvm/hvm.h +++ b/xen/include/asm-x86/hvm/hvm.h @@ -236,7 +236,8 @@ extern s8 hvm_port80_allowed; extern const struct hvm_function_table *start_svm(void); extern const struct hvm_function_table *start_vmx(void); -int hvm_domain_initialise(struct domain *d); +int hvm_domain_initialise(struct domain *d, unsigned long domcr_flags, + struct xen_arch_domainconfig *config); void hvm_domain_relinquish_resources(struct domain *d); void hvm_domain_destroy(struct domain *d); void hvm_domain_soft_reset(struct domain *d); -- 2.11.0 _______________________________________________ Xen-devel mailing list Xen-devel@xxxxxxxxxxxxx https://lists.xen.org/xen-devel
|
Lists.xenproject.org is hosted with RackSpace, monitoring our |