From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([140.186.70.92]:46949) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1QbuCT-0000zJ-P2 for qemu-devel@nongnu.org; Wed, 29 Jun 2011 08:49:03 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1QbuCS-00086t-Bj for qemu-devel@nongnu.org; Wed, 29 Jun 2011 08:49:01 -0400 Received: from mail-qy0-f180.google.com ([209.85.216.180]:65075) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1QbuCR-00086e-Ur for qemu-devel@nongnu.org; Wed, 29 Jun 2011 08:49:00 -0400 Received: by qyk30 with SMTP id 30so693429qyk.4 for ; Wed, 29 Jun 2011 05:48:58 -0700 (PDT) MIME-Version: 1.0 In-Reply-To: <20110628190212.GB30019@laped.lan> References: <4DEDE627.1070907@redhat.com> <20110628190212.GB30019@laped.lan> Date: Wed, 29 Jun 2011 22:48:58 +1000 Message-ID: From: Matthew Fernandez Content-Type: text/plain; charset=ISO-8859-1 Content-Transfer-Encoding: quoted-printable Subject: Re: [Qemu-devel] [PATCH] Command line support for altering the log file location List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: "Edgar E. Iglesias" Cc: Kevin Wolf , Blue Swirl , Anthony Liguori , qemu-devel@nongnu.org On 29 June 2011 05:02, Edgar E. Iglesias 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 >> ---- > > 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 > Date: =A0 Tue Jun 28 20:57:09 2011 +0200 > > =A0 =A0user: Fix -d debug logging for usermode emulation > > =A0 =A0Signed-off-by: Edgar E. Iglesias > > 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) > =A0 =A0 =A0 =A0 int mask; > =A0 =A0 =A0 =A0 const CPULogItem *item; > > - =A0 =A0 =A0 =A0mask =3D cpu_str_to_log_mask(r); > + =A0 =A0 =A0 =A0mask =3D cpu_str_to_log_mask(log_mask); > =A0 =A0 =A0 =A0 if (!mask) { > =A0 =A0 =A0 =A0 =A0 =A0 printf("Log items (comma separated):\n"); > =A0 =A0 =A0 =A0 =A0 =A0 for (item =3D cpu_log_items; item->mask !=3D 0; i= tem++) { > 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) > =A0 =A0 =A0 =A0 int mask; > =A0 =A0 =A0 =A0 CPULogItem *item; > > - =A0 =A0 =A0 =A0mask =3D cpu_str_to_log_mask(r); > + =A0 =A0 =A0 =A0mask =3D cpu_str_to_log_mask(log_mask); > =A0 =A0 =A0 =A0 if (!mask) { > =A0 =A0 =A0 =A0 =A0 =A0 printf("Log items (comma separated):\n"); > =A0 =A0 =A0 =A0 =A0 =A0 for (item =3D cpu_log_items; item->mask !=3D 0; i= tem++) { > 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) > =A0 =A0 =A0 =A0 int mask; > =A0 =A0 =A0 =A0 const CPULogItem *item; > > - =A0 =A0 =A0 =A0mask =3D cpu_str_to_log_mask(r); > + =A0 =A0 =A0 =A0mask =3D cpu_str_to_log_mask(log_mask); > =A0 =A0 =A0 =A0 if (!mask) { > =A0 =A0 =A0 =A0 =A0 =A0 printf("Log items (comma separated):\n"); > =A0 =A0 =A0 =A0 =A0 =A0 for (item =3D cpu_log_items; item->mask !=3D 0; i= tem++) { >