ia64/xen-unstable

changeset 13352:51fd5bdc2744

[HVM] Ignore evtchn_upcall_mask and initialise to zero.
Signed-off-by: Keir Fraser <keir@xensource.com>
author kfraser@localhost.localdomain
date Tue Jan 09 17:43:13 2007 +0000 (2007-01-09)
parents 7fd4e256196b
children 92977f1ce2f5
files tools/libxc/xc_hvm_build.c xen/arch/x86/hvm/irq.c
line diff
     1.1 --- a/tools/libxc/xc_hvm_build.c	Tue Jan 09 17:38:48 2007 +0000
     1.2 +++ b/tools/libxc/xc_hvm_build.c	Tue Jan 09 17:43:13 2007 +0000
     1.3 @@ -233,8 +233,7 @@ static int setup_guest(int xc_handle,
     1.4               SCRATCH_PFN)) == NULL) )
     1.5          goto error_out;
     1.6      memset(shared_info, 0, PAGE_SIZE);
     1.7 -    for ( i = 0; i < MAX_VIRT_CPUS; i++ )
     1.8 -        shared_info->vcpu_info[i].evtchn_upcall_mask = 1;
     1.9 +    /* NB. evtchn_upcall_mask is unused: leave as zero. */
    1.10      memset(&shared_info->evtchn_mask[0], 0xff,
    1.11             sizeof(shared_info->evtchn_mask));
    1.12      munmap(shared_info, PAGE_SIZE);
     2.1 --- a/xen/arch/x86/hvm/irq.c	Tue Jan 09 17:38:48 2007 +0000
     2.2 +++ b/xen/arch/x86/hvm/irq.c	Tue Jan 09 17:43:13 2007 +0000
     2.3 @@ -135,7 +135,8 @@ void hvm_set_callback_irq_level(void)
     2.4      if ( gsi == 0 )
     2.5          goto out;
     2.6  
     2.7 -    if ( local_events_need_delivery() )
     2.8 +    /* NB. Do not check the evtchn_upcall_mask. It is not used in HVM mode. */
     2.9 +    if ( vcpu_info(v, evtchn_upcall_pending) )
    2.10      {
    2.11          if ( !__test_and_set_bit(0, &hvm_irq->callback_irq_wire) &&
    2.12               (hvm_irq->gsi_assert_count[gsi]++ == 0) )