From 40493c5f2b0f124c9b2581e539bba14522e51269 Mon Sep 17 00:00:00 2001 From: Laurent Vivier Date: Thu, 26 Jan 2017 09:04:48 +0100 Subject: linux-user: fix "apt-get update" on linux-user hppa apt-get was hanging on linux-user hppa. strace has shown the netlink data stream was not correctly byte swapped. It appears the fd translator function is unregistered just after it has been registered, so the translator function is not called. This patch removes the fd_trans_unregister() after the do_socket() in the TARGET_NR_socket case. This fd_trans_unregister() was added by commit e36800c linux-user: add signalfd/signalfd4 syscalls when do_socket() was not registering any fd translator. And as now it is, we must remove this fd_trans_unregister() to keep them. Reported-by: John Paul Adrian Glaubitz Signed-off-by: Laurent Vivier Tested-by: John Paul Adrian Glaubitz Message-Id: <20170126080449.28255-3-laurent@vivier.eu> Signed-off-by: Richard Henderson --- linux-user/syscall.c | 1 - 1 file changed, 1 deletion(-) (limited to 'linux-user') diff --git a/linux-user/syscall.c b/linux-user/syscall.c index 11a311f9db..9be8e9530e 100644 --- a/linux-user/syscall.c +++ b/linux-user/syscall.c @@ -9343,7 +9343,6 @@ abi_long do_syscall(void *cpu_env, int num, abi_long arg1, #ifdef TARGET_NR_socket case TARGET_NR_socket: ret = do_socket(arg1, arg2, arg3); - fd_trans_unregister(ret); break; #endif #ifdef TARGET_NR_socketpair -- cgit v1.2.3-55-g7522 From 3d96995decb33e49503e30899098e3d3289c9e0d Mon Sep 17 00:00:00 2001 From: Laurent Vivier Date: Thu, 26 Jan 2017 09:04:49 +0100 Subject: linux-user: define correct UTS machine name for hppa the correct UTS machine name (as expected by systemd) is "parisc", not "hppa". Signed-off-by: Laurent Vivier Message-Id: <20170126080449.28255-4-laurent@vivier.eu> Signed-off-by: Richard Henderson --- linux-user/hppa/target_syscall.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'linux-user') diff --git a/linux-user/hppa/target_syscall.h b/linux-user/hppa/target_syscall.h index ac18a9c575..e2f366839d 100644 --- a/linux-user/hppa/target_syscall.h +++ b/linux-user/hppa/target_syscall.h @@ -19,7 +19,7 @@ struct target_pt_regs { target_ulong ipsw; }; -#define UNAME_MACHINE "hppa" +#define UNAME_MACHINE "parisc" #define UNAME_MINIMUM_RELEASE "2.6.32" #define TARGET_CLONE_BACKWARDS #define TARGET_MINSIGSTKSZ 2048 -- cgit v1.2.3-55-g7522