Skip to contentSkip to conversation

Fix debug log option parsing in user-mode emulation

PATCH Applied Hans N 2 participants 3 messages Jun 28, 2011 – Jun 29, 2011

lore
Share & tools
lore

Hans N

author
#0 lore raw

PATCH 1/1 Fix debug log option parsing in user-mode emulation

Fix cpu_str_to_log_mask() to actually use log_mask

Signed-off-by Hans Nielsen <[email protected]>
---
 bsd-user/main.c    |    2 +-
 darwin-user/main.c |    2 +-
 linux-user/main.c  |    2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)
bsd-user/main.c +1 -1
index 5f790b2..6018a41 100644
@@ -866,7 +866,7 @@ int main(int argc, char **argv)
         int mask;
         const CPULogItem *item;
 
-        mask = cpu_str_to_log_mask(r);
+        mask = cpu_str_to_log_mask(log_mask);
         if (!mask) {
             printf("Log items (comma separated):\n");
             for (item = cpu_log_items; item->mask != 0; item++) {
darwin-user/main.c +1 -1
index a6dc859..35196a1 100644
@@ -819,7 +819,7 @@ int main(int argc, char **argv)
         int mask;
         CPULogItem *item;
 
-        mask = cpu_str_to_log_mask(r);
+        mask = cpu_str_to_log_mask(log_mask);
         if (!mask) {
             printf("Log items (comma separated):\n");
             for (item = cpu_log_items; item->mask != 0; item++) {
linux-user/main.c +1 -1
index db5577b..289054b 100644
@@ -3030,7 +3030,7 @@ int main(int argc, char **argv, char **envp)
         int mask;
         const CPULogItem *item;
 
-        mask = cpu_str_to_log_mask(r);
+        mask = cpu_str_to_log_mask(log_mask);
         if (!mask) {
             printf("Log items (comma separated):\n");
             for (item = cpu_log_items; item->mask != 0; item++) {

--
1.7.5.4

#2 lore raw
Quoted 10 lines · Stefan Hajnoczi
Quoted 8 lines · Hans N

Fix cpu_str_to_log_mask() to actually use log_mask

Signed-off-by Hans Nielsen <[email protected]>

---
 bsd-user/main.c    |    2 +-
 darwin-user/main.c |    2 +-
 linux-user/main.c  |    2 +-

 3 files changed, 3 insertions(+), 3 deletions(-)
Quoted 2 lines

Thanks, applied to the trivial patches tree:
http://repo.or.cz/w/qemu/stefanha.git/shortlog/refs/heads/trivial-patches

Edgar E. Iglesias <[email protected]> has already merged an identical fix into qemu.git:

http://repo.or.cz/w/qemu.git/commitdiff/1dfdcaa83f9ce34aded8bc0669e81753d94f1b7d

I am dropping your patch since the issue has been fixed.

Stefan