diff options
author | Keir Fraser <keir.fraser@citrix.com> | 2009-10-29 11:14:54 +0000 |
---|---|---|
committer | Keir Fraser <keir.fraser@citrix.com> | 2009-10-29 11:14:54 +0000 |
commit | bde7d0c41aaf5d38d0697feb2750df61685960f7 (patch) | |
tree | 054effc61576f6f5bffb089305dbc9fc68ef47fc /xen/common/keyhandler.c | |
parent | 4e69eb152ebb1f81b539eb4c1decb372ad29242b (diff) | |
download | xen-bde7d0c41aaf5d38d0697feb2750df61685960f7.tar.gz xen-bde7d0c41aaf5d38d0697feb2750df61685960f7.tar.bz2 xen-bde7d0c41aaf5d38d0697feb2750df61685960f7.zip |
Point per-vcpu vcpu_info at a dummy structure by default, avoiding
need for scattered NULL-pointer checks.
Signed-off-by: Keir Fraser <keir.fraser@citrix.com>
Diffstat (limited to 'xen/common/keyhandler.c')
-rw-r--r-- | xen/common/keyhandler.c | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/xen/common/keyhandler.c b/xen/common/keyhandler.c index 844d890df7..8ddfa95db9 100644 --- a/xen/common/keyhandler.c +++ b/xen/common/keyhandler.c @@ -209,8 +209,8 @@ static void dump_domains(unsigned char key) v->vcpu_id, v->processor, v->is_running ? 'T':'F', v->pause_flags, v->poll_evtchn, - v->vcpu_info ? vcpu_info(v, evtchn_upcall_pending) : 0, - v->vcpu_info ? vcpu_info(v, evtchn_upcall_mask) : 1); + vcpu_info(v, evtchn_upcall_pending), + vcpu_info(v, evtchn_upcall_mask)); cpuset_print(tmpstr, sizeof(tmpstr), v->vcpu_dirty_cpumask); printk("dirty_cpus=%s ", tmpstr); cpuset_print(tmpstr, sizeof(tmpstr), v->cpu_affinity); @@ -218,8 +218,6 @@ static void dump_domains(unsigned char key) arch_dump_vcpu_info(v); periodic_timer_print(tmpstr, sizeof(tmpstr), v->periodic_period); printk(" %s\n", tmpstr); - if ( !v->vcpu_info ) - continue; printk(" Notifying guest (virq %d, port %d, stat %d/%d/%d)\n", VIRQ_DEBUG, v->virq_to_evtchn[VIRQ_DEBUG], test_bit(v->virq_to_evtchn[VIRQ_DEBUG], |