* [PULL v2 01/19] linux-user, alpha: fix oldumount syscall
2020-06-06 13:14 [PULL v2 00/19] Linux user for 5.1 patches Laurent Vivier
@ 2020-06-06 13:14 ` Laurent Vivier
2020-06-06 13:15 ` [PULL v2 02/19] linux-user: return target error codes for socket() and prctl() Laurent Vivier
` (2 subsequent siblings)
3 siblings, 0 replies; 7+ messages in thread
From: Laurent Vivier @ 2020-06-06 13:14 UTC (permalink / raw)
To: qemu-devel; +Cc: Riku Voipio, Laurent Vivier
When we try to bootstrap debian/lenny for alpha, it fails because
it cannot umount /.root directory:
...
Setting up initscripts (2.86.ds1-61) ...
umount: /.root: Function not implemented
dpkg: error processing initscripts (--configure):
subprocess post-installation script returned error exit status 1
dpkg: sysvinit: dependency problems, but configuring anyway as you request:
sysvinit depends on initscripts; however:
Package initscripts is not configured yet.
This is because, when we switched from syscall_nr.h to syscall.tbl,
the syscall #321 has been renamed from umount to oldumount and
syscall.c has not been updated to manage the new name.
oldumount has been introduced in linux 2.1.116pre1 by:
7d32756b2 ("Import 2.1.116pre1")
...
* We now support a flag for forced unmount like the other 'big iron'
* unixes. Our API is identical to OSF/1 to avoid making a mess of AMD
...
Fixes: 6116aea994 ("linux-user, alpha: add syscall table generation support")
Signed-off-by: Laurent Vivier <laurent@vivier.eu>
Message-Id: <20200502194642.32823-1-laurent@vivier.eu>
Signed-off-by: Laurent Vivier <laurent@vivier.eu>
---
linux-user/syscall.c | 7 ++++++-
1 file changed, 6 insertions(+), 1 deletion(-)
diff --git a/linux-user/syscall.c b/linux-user/syscall.c
index 05f03919ff07..e89b815ce983 100644
--- a/linux-user/syscall.c
+++ b/linux-user/syscall.c
@@ -8028,8 +8028,13 @@ static abi_long do_syscall1(void *cpu_env, int num, abi_long arg1,
}
}
return ret;
-#ifdef TARGET_NR_umount
+#if defined(TARGET_NR_umount) || defined(TARGET_NR_oldumount)
+#if defined(TARGET_NR_umount)
case TARGET_NR_umount:
+#endif
+#if defined(TARGET_NR_oldumount)
+ case TARGET_NR_oldumount:
+#endif
if (!(p = lock_user_string(arg1)))
return -TARGET_EFAULT;
ret = get_errno(umount(p));
--
2.26.2
^ permalink raw reply related [flat|nested] 7+ messages in thread
* [PULL v2 02/19] linux-user: return target error codes for socket() and prctl()
2020-06-06 13:14 [PULL v2 00/19] Linux user for 5.1 patches Laurent Vivier
2020-06-06 13:14 ` [PULL v2 01/19] linux-user, alpha: fix oldumount syscall Laurent Vivier
@ 2020-06-06 13:15 ` Laurent Vivier
2020-06-06 13:15 ` [PULL v2 03/19] linux-user: Add support for /proc/cpuinfo on hppa platform Laurent Vivier
2020-06-06 13:19 ` [PULL v2 00/19] Linux user for 5.1 patches Laurent Vivier
3 siblings, 0 replies; 7+ messages in thread
From: Laurent Vivier @ 2020-06-06 13:15 UTC (permalink / raw)
To: qemu-devel; +Cc: Helge Deller, Riku Voipio, Laurent Vivier
From: Helge Deller <deller@gmx.de>
Return target error codes instead of host error codes.
Signed-off-by: Helge Deller <deller@gmx.de>
Reviewed-by: Laurent Vivier <laurent@vivier.eu>
Message-Id: <20200424220033.GA28140@ls3530.fritz.box>
Signed-off-by: Laurent Vivier <laurent@vivier.eu>
---
linux-user/syscall.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/linux-user/syscall.c b/linux-user/syscall.c
index e89b815ce983..fd5c4f1d73e6 100644
--- a/linux-user/syscall.c
+++ b/linux-user/syscall.c
@@ -2987,7 +2987,7 @@ static abi_long do_socket(int domain, int type, int protocol)
#endif
protocol == NETLINK_KOBJECT_UEVENT ||
protocol == NETLINK_AUDIT)) {
- return -EPFNOSUPPORT;
+ return -TARGET_EPFNOSUPPORT;
}
if (domain == AF_PACKET ||
@@ -5856,7 +5856,7 @@ static abi_long do_get_thread_area(CPUX86State *env, abi_ulong ptr)
abi_long do_arch_prctl(CPUX86State *env, int code, abi_ulong addr)
{
- return -ENOSYS;
+ return -TARGET_ENOSYS;
}
#else
abi_long do_arch_prctl(CPUX86State *env, int code, abi_ulong addr)
--
2.26.2
^ permalink raw reply related [flat|nested] 7+ messages in thread
* [PULL v2 03/19] linux-user: Add support for /proc/cpuinfo on hppa platform
2020-06-06 13:14 [PULL v2 00/19] Linux user for 5.1 patches Laurent Vivier
2020-06-06 13:14 ` [PULL v2 01/19] linux-user, alpha: fix oldumount syscall Laurent Vivier
2020-06-06 13:15 ` [PULL v2 02/19] linux-user: return target error codes for socket() and prctl() Laurent Vivier
@ 2020-06-06 13:15 ` Laurent Vivier
2020-06-06 13:19 ` [PULL v2 00/19] Linux user for 5.1 patches Laurent Vivier
3 siblings, 0 replies; 7+ messages in thread
From: Laurent Vivier @ 2020-06-06 13:15 UTC (permalink / raw)
To: qemu-devel; +Cc: Helge Deller, Riku Voipio, Richard Henderson, Laurent Vivier
From: Helge Deller <deller@gmx.de>
Provide our own /proc/cpuinfo file for the hppa (parisc) platform.
Signed-off-by: Helge Deller <deller@gmx.de>
Reviewed-by: Richard Henderson <richard.henderson@linaro.org>
Reviewed-by: Laurent Vivier <laurent@vivier.eu>
Message-Id: <20200424210648.GA26715@ls3530.fritz.box>
[lv: s/an/our/ and add TARGET_HPPA to guard is_proc()]
Signed-off-by: Laurent Vivier <laurent@vivier.eu>
---
linux-user/syscall.c | 16 ++++++++++++++--
1 file changed, 14 insertions(+), 2 deletions(-)
diff --git a/linux-user/syscall.c b/linux-user/syscall.c
index fd5c4f1d73e6..9ac3af20c176 100644
--- a/linux-user/syscall.c
+++ b/linux-user/syscall.c
@@ -7378,7 +7378,7 @@ static int is_proc_myself(const char *filename, const char *entry)
}
#if defined(HOST_WORDS_BIGENDIAN) != defined(TARGET_WORDS_BIGENDIAN) || \
- defined(TARGET_SPARC) || defined(TARGET_M68K)
+ defined(TARGET_SPARC) || defined(TARGET_M68K) || defined(TARGET_HPPA)
static int is_proc(const char *filename, const char *entry)
{
return strcmp(filename, entry) == 0;
@@ -7438,6 +7438,18 @@ static int open_cpuinfo(void *cpu_env, int fd)
}
#endif
+#if defined(TARGET_HPPA)
+static int open_cpuinfo(void *cpu_env, int fd)
+{
+ dprintf(fd, "cpu family\t: PA-RISC 1.1e\n");
+ dprintf(fd, "cpu\t\t: PA7300LC (PCX-L2)\n");
+ dprintf(fd, "capabilities\t: os32\n");
+ dprintf(fd, "model\t\t: 9000/778/B160L\n");
+ dprintf(fd, "model name\t: Merlin L2 160 QEMU (9000/778/B160L)\n");
+ return 0;
+}
+#endif
+
#if defined(TARGET_M68K)
static int open_hardware(void *cpu_env, int fd)
{
@@ -7462,7 +7474,7 @@ static int do_openat(void *cpu_env, int dirfd, const char *pathname, int flags,
#if defined(HOST_WORDS_BIGENDIAN) != defined(TARGET_WORDS_BIGENDIAN)
{ "/proc/net/route", open_net_route, is_proc },
#endif
-#if defined(TARGET_SPARC)
+#if defined(TARGET_SPARC) || defined(TARGET_HPPA)
{ "/proc/cpuinfo", open_cpuinfo, is_proc },
#endif
#if defined(TARGET_M68K)
--
2.26.2
^ permalink raw reply related [flat|nested] 7+ messages in thread
* Re: [PULL v2 00/19] Linux user for 5.1 patches
2020-06-06 13:14 [PULL v2 00/19] Linux user for 5.1 patches Laurent Vivier
` (2 preceding siblings ...)
2020-06-06 13:15 ` [PULL v2 03/19] linux-user: Add support for /proc/cpuinfo on hppa platform Laurent Vivier
@ 2020-06-06 13:19 ` Laurent Vivier
2020-06-07 0:32 ` Aleksandar Markovic
3 siblings, 1 reply; 7+ messages in thread
From: Laurent Vivier @ 2020-06-06 13:19 UTC (permalink / raw)
To: qemu-devel; +Cc: Riku Voipio
Le 06/06/2020 à 15:14, Laurent Vivier a écrit :
> The following changes since commit ddc760832fa8cf5e93b9d9e6e854a5114ac63510:
>
> Merge remote-tracking branch 'remotes/gkurz/tags/9p-next-2020-05-26' into s=
> taging (2020-05-26 14:05:53 +0100)
>
> are available in the Git repository at:
>
> git://github.com/vivier/qemu.git tags/linux-user-for-5.1-pull-request
>
> for you to fetch changes up to 95722b27845b972250a7d4f93b693b01e2a0c3a1:
>
> stubs: Restrict ui/win32-kbd-hook to system-mode (2020-06-05 21:23:22 +0200)
>
> ----------------------------------------------------------------
> linux-user pull request 20200605-v2
>
> Implement F_OFD_ fcntl() command, /proc/cpuinfo for hppa
> Fix socket(), prnctl() error codes, underflow in target_mremap,
> epoll_create() strace, oldumount for alpha
> User-mode build dependencies improvement
>
> ----------------------------------------------------------------
>
> Andreas Schwab (1):
> linux-user: implement OFD locks
>
> Helge Deller (2):
> linux-user: return target error codes for socket() and prctl()
> linux-user: Add support for /proc/cpuinfo on hppa platform
>
> Jonathan Marler (1):
> linux-user/mmap.c: fix integer underflow in target_mremap
>
> Laurent Vivier (1):
> linux-user, alpha: fix oldumount syscall
>
> Philippe Mathieu-Daud=C3=A9 (13):
> Makefile: Only build virtiofsd if system-mode is enabled
> configure: Avoid building TCG when not needed
> tests/Makefile: Only display TCG-related tests when TCG is available
> tests/Makefile: Restrict some softmmu-only tests
> util/Makefile: Reduce the user-mode object list
> stubs/Makefile: Reduce the user-mode object list
> target/riscv/cpu: Restrict CPU migration to system-mode
> exec: Assert CPU migration is not used on user-only build
> arch_init: Remove unused 'qapi-commands-misc.h' include
> target/i386: Restrict CpuClass::get_crash_info() to system-mode
> target/s390x: Restrict CpuClass::get_crash_info() to system-mode
> hw/core: Restrict CpuClass::get_crash_info() to system-mode
> stubs: Restrict ui/win32-kbd-hook to system-mode
>
> Sergei Trofimovich (1):
> linux-user/strace.list: fix epoll_create{,1} -strace output
>
> Makefile | 2 +-
> arch_init.c | 1 -
> configure | 4 +++
> exec.c | 4 ++-
> hw/core/cpu.c | 2 ++
> include/hw/core/cpu.h | 7 ++++-
> linux-user/generic/fcntl.h | 4 +++
> linux-user/mmap.c | 2 +-
> linux-user/strace.list | 4 +--
> linux-user/syscall.c | 33 +++++++++++++++++----
> stubs/Makefile.objs | 52 +++++++++++++++++++--------------
> target/i386/cpu.c | 6 +++-
> target/riscv/cpu.c | 6 ++--
> target/s390x/cpu.c | 12 ++++----
> tests/Makefile.include | 18 ++++++------
> util/Makefile.objs | 59 ++++++++++++++++++++++++--------------
> 16 files changed, 143 insertions(+), 73 deletions(-)
>
> --=20
> 2.26.2
>
It has failed again on the PATCH 4/19. I think there is a problem with
one of the cc. I re-sent the series again and it has worked this time.
Thanks,
Laurent
^ permalink raw reply [flat|nested] 7+ messages in thread
* Re: [PULL v2 00/19] Linux user for 5.1 patches
2020-06-06 13:19 ` [PULL v2 00/19] Linux user for 5.1 patches Laurent Vivier
@ 2020-06-07 0:32 ` Aleksandar Markovic
0 siblings, 0 replies; 7+ messages in thread
From: Aleksandar Markovic @ 2020-06-07 0:32 UTC (permalink / raw)
To: Laurent Vivier; +Cc: Riku Voipio, QEMU Developers
суб, 6. јун 2020. у 15:24 Laurent Vivier <laurent@vivier.eu> је написао/ла:
>
> Le 06/06/2020 à 15:14, Laurent Vivier a écrit :
> > The following changes since commit ddc760832fa8cf5e93b9d9e6e854a5114ac63510:
> >
> > Merge remote-tracking branch 'remotes/gkurz/tags/9p-next-2020-05-26' into s=
> > taging (2020-05-26 14:05:53 +0100)
> >
> > are available in the Git repository at:
> >
> > git://github.com/vivier/qemu.git tags/linux-user-for-5.1-pull-request
> >
> > for you to fetch changes up to 95722b27845b972250a7d4f93b693b01e2a0c3a1:
> >
> > stubs: Restrict ui/win32-kbd-hook to system-mode (2020-06-05 21:23:22 +0200)
> >
> > ----------------------------------------------------------------
> > linux-user pull request 20200605-v2
> >
> > Implement F_OFD_ fcntl() command, /proc/cpuinfo for hppa
> > Fix socket(), prnctl() error codes, underflow in target_mremap,
> > epoll_create() strace, oldumount for alpha
> > User-mode build dependencies improvement
> >
> > ----------------------------------------------------------------
> >
> > Andreas Schwab (1):
> > linux-user: implement OFD locks
> >
> > Helge Deller (2):
> > linux-user: return target error codes for socket() and prctl()
> > linux-user: Add support for /proc/cpuinfo on hppa platform
> >
> > Jonathan Marler (1):
> > linux-user/mmap.c: fix integer underflow in target_mremap
> >
> > Laurent Vivier (1):
> > linux-user, alpha: fix oldumount syscall
> >
> > Philippe Mathieu-Daud=C3=A9 (13):
> > Makefile: Only build virtiofsd if system-mode is enabled
> > configure: Avoid building TCG when not needed
> > tests/Makefile: Only display TCG-related tests when TCG is available
> > tests/Makefile: Restrict some softmmu-only tests
> > util/Makefile: Reduce the user-mode object list
> > stubs/Makefile: Reduce the user-mode object list
> > target/riscv/cpu: Restrict CPU migration to system-mode
> > exec: Assert CPU migration is not used on user-only build
> > arch_init: Remove unused 'qapi-commands-misc.h' include
> > target/i386: Restrict CpuClass::get_crash_info() to system-mode
> > target/s390x: Restrict CpuClass::get_crash_info() to system-mode
> > hw/core: Restrict CpuClass::get_crash_info() to system-mode
> > stubs: Restrict ui/win32-kbd-hook to system-mode
> >
> > Sergei Trofimovich (1):
> > linux-user/strace.list: fix epoll_create{,1} -strace output
> >
> > Makefile | 2 +-
> > arch_init.c | 1 -
> > configure | 4 +++
> > exec.c | 4 ++-
> > hw/core/cpu.c | 2 ++
> > include/hw/core/cpu.h | 7 ++++-
> > linux-user/generic/fcntl.h | 4 +++
> > linux-user/mmap.c | 2 +-
> > linux-user/strace.list | 4 +--
> > linux-user/syscall.c | 33 +++++++++++++++++----
> > stubs/Makefile.objs | 52 +++++++++++++++++++--------------
> > target/i386/cpu.c | 6 +++-
> > target/riscv/cpu.c | 6 ++--
> > target/s390x/cpu.c | 12 ++++----
> > tests/Makefile.include | 18 ++++++------
> > util/Makefile.objs | 59 ++++++++++++++++++++++++--------------
> > 16 files changed, 143 insertions(+), 73 deletions(-)
> >
> > --=20
> > 2.26.2
> >
>
> It has failed again on the PATCH 4/19. I think there is a problem with
> one of the cc. I re-sent the series again and it has worked this time.
>
A similar problem happened to me once. I was getting a list of cc
addresses via get_maintainers.pl, and copying and pasting the
output in terminal. The problem of incomplete git send-email. in
my case, did not stop until I manually entered all email addresses
rather than copy/paste them. Still do not know what was the root
cause.
Aleksandar
> Thanks,
> Laurent
>
^ permalink raw reply [flat|nested] 7+ messages in thread