[Qemu-trivial] [PATCH] Fix debug log option parsing in user-mode emulation

[Qemu-trivial] [PATCH] Fix debug log option parsing in user-mode emulation

[Hans N]

Fix cpu_str_to_log_mask() to actually use log_mask

Signed-off-by: Hans Nielsen <agenthh@gmail.com>
---
  bsd-user/main.c    |    2 +-
  darwin-user/main.c |    2 +-
  linux-user/main.c  |    2 +-
  3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/bsd-user/main.c b/bsd-user/main.c
index 5f790b2..6018a41 100644
--- a/bsd-user/main.c
+++ b/bsd-user/main.c
@@ -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++) {
diff --git a/darwin-user/main.c b/darwin-user/main.c
index a6dc859..35196a1 100644
--- a/darwin-user/main.c
+++ b/darwin-user/main.c
@@ -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++) {
diff --git a/linux-user/main.c b/linux-user/main.c
index db5577b..289054b 100644
--- a/linux-user/main.c
+++ b/linux-user/main.c
@@ -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

Re: [Qemu-trivial] [PATCH] Fix debug log option parsing in user-mode emulation

[Stefan Hajnoczi]

On Mon, Jun 27, 2011 at 11:11:54PM -0700, Hans N wrote:
> Fix cpu_str_to_log_mask() to actually use log_mask
> 
> Signed-off-by: Hans Nielsen <agenthh@gmail.com>
> ---
>  bsd-user/main.c    |    2 +-
>  darwin-user/main.c |    2 +-
>  linux-user/main.c  |    2 +-
>  3 files changed, 3 insertions(+), 3 deletions(-)

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

Stefan

Re: [Qemu-trivial] [PATCH] Fix debug log option parsing in user-mode emulation

[Stefan Hajnoczi]

On Tue, Jun 28, 2011 at 11:33 AM, Stefan Hajnoczi <stefanha@gmail.com> wrote:
> On Mon, Jun 27, 2011 at 11:11:54PM -0700, Hans N wrote:
>> Fix cpu_str_to_log_mask() to actually use log_mask
>>
>> Signed-off-by: Hans Nielsen <agenthh@gmail.com>
>> ---
>>  bsd-user/main.c    |    2 +-
>>  darwin-user/main.c |    2 +-
>>  linux-user/main.c  |    2 +-
>>  3 files changed, 3 insertions(+), 3 deletions(-)
>
> Thanks, applied to the trivial patches tree:
> http://repo.or.cz/w/qemu/stefanha.git/shortlog/refs/heads/trivial-patches

Edgar E. Iglesias <edgar.iglesias@gmail.com> 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