trace: do not always call exit() in trace_enable_events
The problem is that virsh qemu-monitor-command --hmp VM log trace:help forces QEMU to exit even when running VM normally. Signed-off-by: Denis V. Lunev <den@openvz.org> Reviewed-by: Paolo Bonzini <pbonzini@redhat.com> Message-id: 1458128212-4197-2-git-send-email-den@openvz.org CC: Stefan Hajnoczi <stefanha@redhat.com> Reviewed-by: Paolo Bonzini <pbonzini@redhat.com> Signed-off-by: Stefan Hajnoczi <stefanha@redhat.com>
This commit is contained in:
		
							parent
							
								
									ab8eb29c4a
								
							
						
					
					
						commit
						acc6809ddc
					
				@ -20,6 +20,7 @@
 | 
				
			|||||||
#include "qemu/log.h"
 | 
					#include "qemu/log.h"
 | 
				
			||||||
#endif
 | 
					#endif
 | 
				
			||||||
#include "qemu/error-report.h"
 | 
					#include "qemu/error-report.h"
 | 
				
			||||||
 | 
					#include "monitor/monitor.h"
 | 
				
			||||||
 | 
					
 | 
				
			||||||
int trace_events_enabled_count;
 | 
					int trace_events_enabled_count;
 | 
				
			||||||
bool trace_events_dstate[TRACE_EVENT_COUNT];
 | 
					bool trace_events_dstate[TRACE_EVENT_COUNT];
 | 
				
			||||||
@ -132,7 +133,9 @@ void trace_enable_events(const char *line_buf)
 | 
				
			|||||||
{
 | 
					{
 | 
				
			||||||
    if (is_help_option(line_buf)) {
 | 
					    if (is_help_option(line_buf)) {
 | 
				
			||||||
        trace_list_events();
 | 
					        trace_list_events();
 | 
				
			||||||
 | 
					        if (cur_mon == NULL) {
 | 
				
			||||||
            exit(0);
 | 
					            exit(0);
 | 
				
			||||||
 | 
					        }
 | 
				
			||||||
    } else {
 | 
					    } else {
 | 
				
			||||||
        do_trace_enable_events(line_buf);
 | 
					        do_trace_enable_events(line_buf);
 | 
				
			||||||
    }
 | 
					    }
 | 
				
			||||||
 | 
				
			|||||||
		Loading…
	
	
			
			x
			
			
		
	
		Reference in New Issue
	
	Block a user