|
 |
9ae3a8 |
From 8ca5737b301aa2fe62dcb749c9c559195b534dd3 Mon Sep 17 00:00:00 2001
|
|
|
9ae3a8 |
From: Marcel Apfelbaum <marcel.a@redhat.com>
|
|
|
9ae3a8 |
Date: Wed, 6 Nov 2013 16:32:35 +0100
|
|
|
9ae3a8 |
Subject: [PATCH 76/81] gdbstub: fix for commit 87f25c12bfeaaa0c41fb857713bbc7e8a9b757dc
|
|
|
9ae3a8 |
|
|
|
9ae3a8 |
RH-Author: Marcel Apfelbaum <marcel.a@redhat.com>
|
|
|
9ae3a8 |
Message-id: <1383755557-21590-8-git-send-email-marcel.a@redhat.com>
|
|
|
9ae3a8 |
Patchwork-id: 55552
|
|
|
9ae3a8 |
O-Subject: [RHEL-7 qemu-kvm PATCH v3 7/9] gdbstub: fix for commit 87f25c12bfeaaa0c41fb857713bbc7e8a9b757dc
|
|
|
9ae3a8 |
Bugzilla: 990601
|
|
|
9ae3a8 |
RH-Acked-by: Paolo Bonzini <pbonzini@redhat.com>
|
|
|
9ae3a8 |
RH-Acked-by: Michael S. Tsirkin <mst@redhat.com>
|
|
|
9ae3a8 |
RH-Acked-by: Alex Williamson <alex.williamson@redhat.com>
|
|
|
9ae3a8 |
|
|
|
9ae3a8 |
From: Paolo Bonzini <pbonzini@redhat.com>
|
|
|
9ae3a8 |
|
|
|
9ae3a8 |
This commit used the wrong check to prevent an assertion failure.
|
|
|
9ae3a8 |
After this commit, you need to start a guest in the monitor, you
|
|
|
9ae3a8 |
cannot use anymore the "c" command in the debugger. This is
|
|
|
9ae3a8 |
undesirable. The commit's aim was to prevent a restart
|
|
|
9ae3a8 |
after a KVM internal error or something like that; use
|
|
|
9ae3a8 |
runstate_needs_reset() for that.
|
|
|
9ae3a8 |
|
|
|
9ae3a8 |
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
|
|
|
9ae3a8 |
Reviewed-by: Luiz Capitulino <lcapitulino@redhat.com>
|
|
|
9ae3a8 |
Message-id: 1370272015-9659-2-git-send-email-pbonzini@redhat.com
|
|
|
9ae3a8 |
Signed-off-by: Anthony Liguori <aliguori@us.ibm.com>
|
|
|
9ae3a8 |
(cherry picked from commit 26ac7a31fbf5522d2ca3f0e2e5b5c8e915701f66)
|
|
|
9ae3a8 |
Signed-off-by: Marcel Apfelbaum <marcel.a@redhat.com>
|
|
|
9ae3a8 |
---
|
|
|
9ae3a8 |
gdbstub.c | 2 +-
|
|
|
9ae3a8 |
1 file changed, 1 insertion(+), 1 deletion(-)
|
|
|
9ae3a8 |
|
|
|
9ae3a8 |
Signed-off-by: Miroslav Rezanina <mrezanin@redhat.com>
|
|
|
9ae3a8 |
---
|
|
|
9ae3a8 |
gdbstub.c | 2 +-
|
|
|
9ae3a8 |
1 files changed, 1 insertions(+), 1 deletions(-)
|
|
|
9ae3a8 |
|
|
|
9ae3a8 |
diff --git a/gdbstub.c b/gdbstub.c
|
|
|
9ae3a8 |
index 90e54cb..e8541f3 100644
|
|
|
9ae3a8 |
--- a/gdbstub.c
|
|
|
9ae3a8 |
+++ b/gdbstub.c
|
|
|
9ae3a8 |
@@ -371,7 +371,7 @@ static inline void gdb_continue(GDBState *s)
|
|
|
9ae3a8 |
#ifdef CONFIG_USER_ONLY
|
|
|
9ae3a8 |
s->running_state = 1;
|
|
|
9ae3a8 |
#else
|
|
|
9ae3a8 |
- if (runstate_check(RUN_STATE_DEBUG)) {
|
|
|
9ae3a8 |
+ if (!runstate_needs_reset()) {
|
|
|
9ae3a8 |
vm_start();
|
|
|
9ae3a8 |
}
|
|
|
9ae3a8 |
#endif
|
|
|
9ae3a8 |
--
|
|
|
9ae3a8 |
1.7.1
|
|
|
9ae3a8 |
|