From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([208.118.235.92]:55080) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1T4G5F-0002rB-FS for qemu-devel@nongnu.org; Wed, 22 Aug 2012 14:55:18 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1T4G5A-0007QK-Ee for qemu-devel@nongnu.org; Wed, 22 Aug 2012 14:55:17 -0400 Received: from smtp.citrix.com ([66.165.176.89]:13432) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1T4G5A-0007FA-8f for qemu-devel@nongnu.org; Wed, 22 Aug 2012 14:55:12 -0400 From: Julien Grall Date: Wed, 22 Aug 2012 13:31:50 +0100 Message-ID: In-Reply-To: References: MIME-Version: 1.0 Content-Type: text/plain Subject: [Qemu-devel] [XEN][RFC PATCH V2 04/17] hvm: Change initialization/destruction of an hvm List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: Julien Grall , christian.limpach@gmail.com, Stefano.Stabellini@eu.citrix.com, xen-devel@lists.xen.org Prepare/Release structure for multiple ioreq servers. Signed-off-by: Julien Grall --- xen/arch/x86/hvm/hvm.c | 33 ++++++++++----------------------- 1 files changed, 10 insertions(+), 23 deletions(-) diff --git a/xen/arch/x86/hvm/hvm.c b/xen/arch/x86/hvm/hvm.c index 687e480..292d57b 100644 --- a/xen/arch/x86/hvm/hvm.c +++ b/xen/arch/x86/hvm/hvm.c @@ -567,10 +567,13 @@ int hvm_domain_initialise(struct domain *d) rtc_init(d); hvm_init_ioreq_page(d, &d->arch.hvm_domain.ioreq); - hvm_init_ioreq_page(d, &d->arch.hvm_domain.buf_ioreq); + hvm_init_ioreq_servers(d); register_portio_handler(d, 0xe9, 1, hvm_print_line); + if ( hvm_init_pci_emul(d) ) + goto fail2; + rc = hvm_funcs.domain_initialise(d); if ( rc != 0 ) goto fail2; @@ -645,8 +648,8 @@ static void hvm_destroy_ioreq_servers(struct domain *d) void hvm_domain_relinquish_resources(struct domain *d) { - hvm_destroy_ioreq_page(d, &d->arch.hvm_domain.ioreq); - hvm_destroy_ioreq_page(d, &d->arch.hvm_domain.buf_ioreq); + hvm_destroy_ioreq_servers(d); + hvm_destroy_pci_emul(d); msixtbl_pt_cleanup(d); @@ -1104,27 +1107,11 @@ int hvm_vcpu_initialise(struct vcpu *v) && (rc = nestedhvm_vcpu_initialise(v)) < 0 ) goto fail3; - /* Create ioreq event channel. */ - rc = alloc_unbound_xen_event_channel(v, 0, NULL); - if ( rc < 0 ) - goto fail4; - - /* Register ioreq event channel. */ - v->arch.hvm_vcpu.xen_port = rc; - - if ( v->vcpu_id == 0 ) - { - /* Create bufioreq event channel. */ - rc = alloc_unbound_xen_event_channel(v, 0, NULL); - if ( rc < 0 ) - goto fail2; - v->domain->arch.hvm_domain.params[HVM_PARAM_BUFIOREQ_EVTCHN] = rc; - } + rc = hvm_ioreq_servers_new_vcpu(v); + if ( rc != 0 ) + goto fail3; - spin_lock(&v->domain->arch.hvm_domain.ioreq.lock); - if ( v->domain->arch.hvm_domain.ioreq.va != NULL ) - get_ioreq(v)->vp_eport = v->arch.hvm_vcpu.xen_port; - spin_unlock(&v->domain->arch.hvm_domain.ioreq.lock); + v->arch.hvm_vcpu.ioreq = &v->domain->arch.hvm_domain.ioreq; spin_lock_init(&v->arch.hvm_vcpu.tm_lock); INIT_LIST_HEAD(&v->arch.hvm_vcpu.tm_list); -- Julien Grall