From: Richard Weinberger <richard@nod.at>
To: Mattia Dongili <malattia@linux.it>
Cc: linux-kernel@vger.kernel.org,
user-mode-linux-devel@lists.sourceforge.net
Subject: Re: [uml-devel] [PATCH 1/4] um: fix UML_LIB_PATH
Date: Mon, 9 May 2011 00:24:04 +0200 [thread overview]
Message-ID: <201105090024.05212.richard@nod.at> (raw)
In-Reply-To: <20110508221952.GA26304@kamineko.org>
Am Montag 09 Mai 2011, 00:19:53 schrieb Mattia Dongili:
> On Sun, May 08, 2011 at 11:59:42PM +0200, Richard Weinberger wrote:
> > UML_LIB_PATH is hardcoded to /usr/lib/uml/,
> > on 64bit systems UML_LIB_PATH needs to be /usr/lib64/uml/.
> >
> > Signed-off-by: Richard Weinberger <richard@nod.at>
> > ---
> >
> > arch/um/drivers/xterm.c | 2 +-
> > arch/um/include/shared/os.h | 7 +++++++
> > arch/um/os-Linux/main.c | 2 +-
> > 3 files changed, 9 insertions(+), 2 deletions(-)
> >
> > diff --git a/arch/um/drivers/xterm.c b/arch/um/drivers/xterm.c
> > index da2caa5..8ac7146 100644
> > --- a/arch/um/drivers/xterm.c
> > +++ b/arch/um/drivers/xterm.c
> > @@ -90,7 +90,7 @@ static int xterm_open(int input, int output, int
> > primary, void *d,
> >
> > int pid, fd, new, err;
> > char title[256], file[] = "/tmp/xterm-pipeXXXXXX";
> > char *argv[] = { terminal_emulator, title_switch, title, exec_switch,
> >
> > - "/usr/lib/uml/port-helper", "-uml-socket",
> > + OS_LIB_PATH "/uml/port-helper", "-uml-socket",
> >
> > file, NULL };
> >
> > if (access(argv[4], X_OK) < 0)
> >
> > diff --git a/arch/um/include/shared/os.h b/arch/um/include/shared/os.h
> > index c4617ba..83c7c2e 100644
> > --- a/arch/um/include/shared/os.h
> > +++ b/arch/um/include/shared/os.h
> > @@ -29,6 +29,12 @@
> >
> > #define OS_ACC_R_OK 4 /* Test for read permission. */
> > #define OS_ACC_RW_OK (OS_ACC_W_OK | OS_ACC_R_OK) /* Test for RW
> > permission */
> >
> > +#ifdef CONFIG_64BIT
> > +#define OS_LIB_PATH "/usr/lib64/"
> > +#else
> > +#define OS_LIB_PATH "/usr/lib/"
> > +#endif
> > +
> >
> > /*
> >
> > * types taken from stat_file() in hostfs_user.c
> > * (if they are wrong here, they are wrong there...).
> >
> > @@ -238,6 +244,7 @@ extern int raw(int fd);
> >
> > extern void setup_machinename(char *machine_out);
> > extern void setup_hostinfo(char *buf, int len);
> > extern void os_dump_core(void) __attribute__ ((noreturn));
> >
> > +extern void um_early_printk(const char *s, unsigned int n);
>
> this hunk seems unrelated to this change.
Good catch!
Thanks,
//richard
------------------------------------------------------------------------------
WhatsUp Gold - Download Free Network Management Software
The most intuitive, comprehensive, and cost-effective network
management toolset available today. Delivers lowest initial
acquisition cost and overall TCO of any competing solution.
http://p.sf.net/sfu/whatsupgold-sd
_______________________________________________
User-mode-linux-devel mailing list
User-mode-linux-devel@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/user-mode-linux-devel
WARNING: multiple messages have this Message-ID (diff)
From: Richard Weinberger <richard@nod.at>
To: Mattia Dongili <malattia@linux.it>
Cc: linux-kernel@vger.kernel.org,
user-mode-linux-devel@lists.sourceforge.net
Subject: Re: [uml-devel] [PATCH 1/4] um: fix UML_LIB_PATH
Date: Mon, 9 May 2011 00:24:04 +0200 [thread overview]
Message-ID: <201105090024.05212.richard@nod.at> (raw)
In-Reply-To: <20110508221952.GA26304@kamineko.org>
Am Montag 09 Mai 2011, 00:19:53 schrieb Mattia Dongili:
> On Sun, May 08, 2011 at 11:59:42PM +0200, Richard Weinberger wrote:
> > UML_LIB_PATH is hardcoded to /usr/lib/uml/,
> > on 64bit systems UML_LIB_PATH needs to be /usr/lib64/uml/.
> >
> > Signed-off-by: Richard Weinberger <richard@nod.at>
> > ---
> >
> > arch/um/drivers/xterm.c | 2 +-
> > arch/um/include/shared/os.h | 7 +++++++
> > arch/um/os-Linux/main.c | 2 +-
> > 3 files changed, 9 insertions(+), 2 deletions(-)
> >
> > diff --git a/arch/um/drivers/xterm.c b/arch/um/drivers/xterm.c
> > index da2caa5..8ac7146 100644
> > --- a/arch/um/drivers/xterm.c
> > +++ b/arch/um/drivers/xterm.c
> > @@ -90,7 +90,7 @@ static int xterm_open(int input, int output, int
> > primary, void *d,
> >
> > int pid, fd, new, err;
> > char title[256], file[] = "/tmp/xterm-pipeXXXXXX";
> > char *argv[] = { terminal_emulator, title_switch, title, exec_switch,
> >
> > - "/usr/lib/uml/port-helper", "-uml-socket",
> > + OS_LIB_PATH "/uml/port-helper", "-uml-socket",
> >
> > file, NULL };
> >
> > if (access(argv[4], X_OK) < 0)
> >
> > diff --git a/arch/um/include/shared/os.h b/arch/um/include/shared/os.h
> > index c4617ba..83c7c2e 100644
> > --- a/arch/um/include/shared/os.h
> > +++ b/arch/um/include/shared/os.h
> > @@ -29,6 +29,12 @@
> >
> > #define OS_ACC_R_OK 4 /* Test for read permission. */
> > #define OS_ACC_RW_OK (OS_ACC_W_OK | OS_ACC_R_OK) /* Test for RW
> > permission */
> >
> > +#ifdef CONFIG_64BIT
> > +#define OS_LIB_PATH "/usr/lib64/"
> > +#else
> > +#define OS_LIB_PATH "/usr/lib/"
> > +#endif
> > +
> >
> > /*
> >
> > * types taken from stat_file() in hostfs_user.c
> > * (if they are wrong here, they are wrong there...).
> >
> > @@ -238,6 +244,7 @@ extern int raw(int fd);
> >
> > extern void setup_machinename(char *machine_out);
> > extern void setup_hostinfo(char *buf, int len);
> > extern void os_dump_core(void) __attribute__ ((noreturn));
> >
> > +extern void um_early_printk(const char *s, unsigned int n);
>
> this hunk seems unrelated to this change.
Good catch!
Thanks,
//richard
next prev parent reply other threads:[~2011-05-08 22:25 UTC|newest]
Thread overview: 10+ messages / expand[flat|nested] mbox.gz Atom feed top
2011-05-08 21:59 [uml-devel] [PATCH 1/4] um: fix UML_LIB_PATH Richard Weinberger
2011-05-08 21:59 ` Richard Weinberger
2011-05-08 21:59 ` [uml-devel] [PATCH 2/4] um: fix abort Richard Weinberger
2011-05-08 21:59 ` Richard Weinberger
2011-05-08 21:59 ` [PATCH 3/4] um: remove SIGHUP handler Richard Weinberger
2011-05-08 21:59 ` [PATCH 4/4] um: os_dump_core() cleanup Richard Weinberger
2011-05-08 22:19 ` [uml-devel] [PATCH 1/4] um: fix UML_LIB_PATH Mattia Dongili
2011-05-08 22:19 ` Mattia Dongili
2011-05-08 22:24 ` Richard Weinberger [this message]
2011-05-08 22:24 ` Richard Weinberger
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=201105090024.05212.richard@nod.at \
--to=richard@nod.at \
--cc=linux-kernel@vger.kernel.org \
--cc=malattia@linux.it \
--cc=user-mode-linux-devel@lists.sourceforge.net \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.