| Message ID | 20110628190212.GB30019@laped.lan |
|---|---|
| State | New |
| Headers | show |
On 29 June 2011 05:02, Edgar E. Iglesias <edgar.iglesias@gmail.com> wrote: > On Wed, Jun 08, 2011 at 12:32:40PM +1000, Matthew Fernandez wrote: >> Add command line support for logging to a location other than /tmp/qemu.log. >> >> With logging enabled (command line option -d), the log is written to >> the hard-coded path /tmp/qemu.log. This patch adds support for writing >> the log to a different location by passing the -D option. >> >> Signed-off-by: Matthew Fernandez <matthew.fernandez@gmail.com> >> ---- > > Hi, > > I've applied the following, only tested on linux-user. > > Cheers Sorry about that. Looks like I mangled lines during a merge. I thought I'd tested after the merge. Thanks for catching that, Edgar. > commit 1dfdcaa83f9ce34aded8bc0669e81753d94f1b7d > Author: Edgar E. Iglesias <edgar.iglesias@gmail.com> > Date: Tue Jun 28 20:57:09 2011 +0200 > > user: Fix -d debug logging for usermode emulation > > Signed-off-by: Edgar E. Iglesias <edgar.iglesias@gmail.com> > > 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++) { >
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++) {