kvm: Change kvm_set_signal_mask() argument to CPUState
CPUArchState is no longer needed. Prepares for changing qemu_kvm_init_cpu_signals() argument to CPUState. Acked-by: Paolo Bonzini <pbonzini@redhat.com> Reviewed-by: Richard Henderson <rth@twiddle.net> Signed-off-by: Andreas Färber <afaerber@suse.de>
This commit is contained in:
		
							parent
							
								
									fd529e8f46
								
							
						
					
					
						commit
						491d6e80ea
					
				
							
								
								
									
										3
									
								
								cpus.c
									
									
									
									
									
								
							
							
						
						
									
										3
									
								
								cpus.c
									
									
									
									
									
								
							| @ -570,6 +570,7 @@ static void dummy_signal(int sig) | ||||
| 
 | ||||
| static void qemu_kvm_init_cpu_signals(CPUArchState *env) | ||||
| { | ||||
|     CPUState *cpu = ENV_GET_CPU(env); | ||||
|     int r; | ||||
|     sigset_t set; | ||||
|     struct sigaction sigact; | ||||
| @ -581,7 +582,7 @@ static void qemu_kvm_init_cpu_signals(CPUArchState *env) | ||||
|     pthread_sigmask(SIG_BLOCK, NULL, &set); | ||||
|     sigdelset(&set, SIG_IPI); | ||||
|     sigdelset(&set, SIGBUS); | ||||
|     r = kvm_set_signal_mask(env, &set); | ||||
|     r = kvm_set_signal_mask(cpu, &set); | ||||
|     if (r) { | ||||
|         fprintf(stderr, "kvm_set_signal_mask: %s\n", strerror(-r)); | ||||
|         exit(1); | ||||
|  | ||||
| @ -166,7 +166,7 @@ int kvm_remove_breakpoint(CPUArchState *current_env, target_ulong addr, | ||||
| void kvm_remove_all_breakpoints(CPUArchState *current_env); | ||||
| int kvm_update_guest_debug(CPUArchState *env, unsigned long reinject_trap); | ||||
| #ifndef _WIN32 | ||||
| int kvm_set_signal_mask(CPUArchState *env, const sigset_t *sigset); | ||||
| int kvm_set_signal_mask(CPUState *cpu, const sigset_t *sigset); | ||||
| #endif | ||||
| 
 | ||||
| int kvm_on_sigbus_vcpu(CPUState *cpu, int code, void *addr); | ||||
|  | ||||
| @ -2039,9 +2039,8 @@ void kvm_remove_all_breakpoints(CPUArchState *current_env) | ||||
| } | ||||
| #endif /* !KVM_CAP_SET_GUEST_DEBUG */ | ||||
| 
 | ||||
| int kvm_set_signal_mask(CPUArchState *env, const sigset_t *sigset) | ||||
| int kvm_set_signal_mask(CPUState *cpu, const sigset_t *sigset) | ||||
| { | ||||
|     CPUState *cpu = ENV_GET_CPU(env); | ||||
|     struct kvm_signal_mask *sigmask; | ||||
|     int r; | ||||
| 
 | ||||
|  | ||||
| @ -100,7 +100,7 @@ void kvm_remove_all_breakpoints(CPUArchState *current_env) | ||||
| } | ||||
| 
 | ||||
| #ifndef _WIN32 | ||||
| int kvm_set_signal_mask(CPUArchState *env, const sigset_t *sigset) | ||||
| int kvm_set_signal_mask(CPUState *cpu, const sigset_t *sigset) | ||||
| { | ||||
|     abort(); | ||||
| } | ||||
|  | ||||
		Loading…
	
	
			
			x
			
			
		
	
		Reference in New Issue
	
	Block a user
	 Andreas Färber
						Andreas Färber