diff --git a/0075-Replace-struct-ucontext-with-uconte.patch b/0075-Replace-struct-ucontext-with-uconte.patch new file mode 100644 index 0000000..4a34b1f --- /dev/null +++ b/0075-Replace-struct-ucontext-with-uconte.patch @@ -0,0 +1,279 @@ +From 01bf5bb9169ef8963930c47a5c097ecaa2e94031 Mon Sep 17 00:00:00 2001 +From: Khem Raj +Date: Wed, 28 Jun 2017 13:44:52 -0700 +Subject: [PATCH] Replace 'struct ucontext' with 'ucontext_t' type + +glibc used to have: + + typedef struct ucontext { ... } ucontext_t; + +glibc now has: + + typedef struct ucontext_t { ... } ucontext_t; + +(See https://sourceware.org/bugzilla/show_bug.cgi?id=21457 + for detail and rationale for the glibc change) + +However, QEMU used "struct ucontext" in declarations. This is a +private name and compatibility cannot be guaranteed. Switch to +only using the standardized type name. + +Signed-off-by: Khem Raj +Message-id: 20170628204452.41230-1-raj.khem@gmail.com +Cc: Kamil Rytarowski +Cc: Riku Voipio +Cc: Laurent Vivier +Cc: Paolo Bonzini +Reviewed-by: Eric Blake +[PMM: Rewrote commit message, based mostly on the one from + Nathaniel McCallum] +Signed-off-by: Peter Maydell +(cherry picked from commit 04b33e21866412689f18b7ad6daf0a54d8f959a7) +[BR: BOO#1055587] +Signed-off-by: Bruce Rogers +--- + linux-user/host/aarch64/hostdep.h | 2 +- + linux-user/host/arm/hostdep.h | 2 +- + linux-user/host/i386/hostdep.h | 2 +- + linux-user/host/ppc64/hostdep.h | 2 +- + linux-user/host/s390x/hostdep.h | 2 +- + linux-user/host/x86_64/hostdep.h | 2 +- + linux-user/signal.c | 10 +++++----- + tests/tcg/test-i386.c | 4 ++-- + user-exec.c | 18 +++++++++--------- + 9 files changed, 22 insertions(+), 22 deletions(-) + +diff --git a/linux-user/host/aarch64/hostdep.h b/linux-user/host/aarch64/hostdep.h +index 64f75cef49..a8d41a21ad 100644 +--- a/linux-user/host/aarch64/hostdep.h ++++ b/linux-user/host/aarch64/hostdep.h +@@ -24,7 +24,7 @@ extern char safe_syscall_end[]; + /* Adjust the signal context to rewind out of safe-syscall if we're in it */ + static inline void rewind_if_in_safe_syscall(void *puc) + { +- struct ucontext *uc = puc; ++ ucontext_t *uc = puc; + __u64 *pcreg = &uc->uc_mcontext.pc; + + if (*pcreg > (uintptr_t)safe_syscall_start +diff --git a/linux-user/host/arm/hostdep.h b/linux-user/host/arm/hostdep.h +index 5c1ae60120..9276fe6ceb 100644 +--- a/linux-user/host/arm/hostdep.h ++++ b/linux-user/host/arm/hostdep.h +@@ -24,7 +24,7 @@ extern char safe_syscall_end[]; + /* Adjust the signal context to rewind out of safe-syscall if we're in it */ + static inline void rewind_if_in_safe_syscall(void *puc) + { +- struct ucontext *uc = puc; ++ ucontext_t *uc = puc; + unsigned long *pcreg = &uc->uc_mcontext.arm_pc; + + if (*pcreg > (uintptr_t)safe_syscall_start +diff --git a/linux-user/host/i386/hostdep.h b/linux-user/host/i386/hostdep.h +index d834bd80ea..073be74d87 100644 +--- a/linux-user/host/i386/hostdep.h ++++ b/linux-user/host/i386/hostdep.h +@@ -24,7 +24,7 @@ extern char safe_syscall_end[]; + /* Adjust the signal context to rewind out of safe-syscall if we're in it */ + static inline void rewind_if_in_safe_syscall(void *puc) + { +- struct ucontext *uc = puc; ++ ucontext_t *uc = puc; + greg_t *pcreg = &uc->uc_mcontext.gregs[REG_EIP]; + + if (*pcreg > (uintptr_t)safe_syscall_start +diff --git a/linux-user/host/ppc64/hostdep.h b/linux-user/host/ppc64/hostdep.h +index 0b0f5f7821..98979ad917 100644 +--- a/linux-user/host/ppc64/hostdep.h ++++ b/linux-user/host/ppc64/hostdep.h +@@ -24,7 +24,7 @@ extern char safe_syscall_end[]; + /* Adjust the signal context to rewind out of safe-syscall if we're in it */ + static inline void rewind_if_in_safe_syscall(void *puc) + { +- struct ucontext *uc = puc; ++ ucontext_t *uc = puc; + unsigned long *pcreg = &uc->uc_mcontext.gp_regs[PT_NIP]; + + if (*pcreg > (uintptr_t)safe_syscall_start +diff --git a/linux-user/host/s390x/hostdep.h b/linux-user/host/s390x/hostdep.h +index 6f9da9c608..4f0171f36f 100644 +--- a/linux-user/host/s390x/hostdep.h ++++ b/linux-user/host/s390x/hostdep.h +@@ -24,7 +24,7 @@ extern char safe_syscall_end[]; + /* Adjust the signal context to rewind out of safe-syscall if we're in it */ + static inline void rewind_if_in_safe_syscall(void *puc) + { +- struct ucontext *uc = puc; ++ ucontext_t *uc = puc; + unsigned long *pcreg = &uc->uc_mcontext.psw.addr; + + if (*pcreg > (uintptr_t)safe_syscall_start +diff --git a/linux-user/host/x86_64/hostdep.h b/linux-user/host/x86_64/hostdep.h +index 3b4259633e..a4fefb5114 100644 +--- a/linux-user/host/x86_64/hostdep.h ++++ b/linux-user/host/x86_64/hostdep.h +@@ -24,7 +24,7 @@ extern char safe_syscall_end[]; + /* Adjust the signal context to rewind out of safe-syscall if we're in it */ + static inline void rewind_if_in_safe_syscall(void *puc) + { +- struct ucontext *uc = puc; ++ ucontext_t *uc = puc; + greg_t *pcreg = &uc->uc_mcontext.gregs[REG_RIP]; + + if (*pcreg > (uintptr_t)safe_syscall_start +diff --git a/linux-user/signal.c b/linux-user/signal.c +index a11728f6e0..ca37b538cf 100644 +--- a/linux-user/signal.c ++++ b/linux-user/signal.c +@@ -3352,7 +3352,7 @@ static void setup_rt_frame(int sig, struct target_sigaction *ka, + * + * a0 = signal number + * a1 = pointer to siginfo_t +- * a2 = pointer to struct ucontext ++ * a2 = pointer to ucontext_t + * + * $25 and PC point to the signal handler, $29 points to the + * struct sigframe. +@@ -3739,7 +3739,7 @@ struct target_signal_frame { + + struct rt_signal_frame { + siginfo_t info; +- struct ucontext uc; ++ ucontext_t uc; + uint32_t tramp[2]; + }; + +@@ -3955,7 +3955,7 @@ struct rt_signal_frame { + siginfo_t *pinfo; + void *puc; + siginfo_t info; +- struct ucontext uc; ++ ucontext_t uc; + uint16_t retcode[4]; /* Trampoline code. */ + }; + +@@ -4490,7 +4490,7 @@ static void setup_rt_frame(int sig, struct target_sigaction *ka, + tswap_siginfo(&frame->info, info); + } + +- /*err |= __clear_user(&frame->uc, offsetof(struct ucontext, uc_mcontext));*/ ++ /*err |= __clear_user(&frame->uc, offsetof(ucontext_t, uc_mcontext));*/ + __put_user(0, &frame->uc.tuc_flags); + __put_user(0, &frame->uc.tuc_link); + __put_user(target_sigaltstack_used.ss_sp, +@@ -4981,7 +4981,7 @@ enum { + + struct target_ucontext { + target_ulong tuc_flags; +- target_ulong tuc_link; /* struct ucontext __user * */ ++ target_ulong tuc_link; /* ucontext_t __user * */ + struct target_sigaltstack tuc_stack; + #if !defined(TARGET_PPC64) + int32_t tuc_pad[7]; +diff --git a/tests/tcg/test-i386.c b/tests/tcg/test-i386.c +index 0f7b943b0c..9599204895 100644 +--- a/tests/tcg/test-i386.c ++++ b/tests/tcg/test-i386.c +@@ -1720,7 +1720,7 @@ int tab[2]; + + void sig_handler(int sig, siginfo_t *info, void *puc) + { +- struct ucontext *uc = puc; ++ ucontext_t *uc = puc; + + printf("si_signo=%d si_errno=%d si_code=%d", + info->si_signo, info->si_errno, info->si_code); +@@ -1912,7 +1912,7 @@ void test_exceptions(void) + /* specific precise single step test */ + void sig_trap_handler(int sig, siginfo_t *info, void *puc) + { +- struct ucontext *uc = puc; ++ ucontext_t *uc = puc; + printf("EIP=" FMTLX "\n", (long)uc->uc_mcontext.gregs[REG_EIP]); + } + +diff --git a/user-exec.c b/user-exec.c +index c262653604..6225c4e1a8 100644 +--- a/user-exec.c ++++ b/user-exec.c +@@ -171,7 +171,7 @@ int cpu_signal_handler(int host_signum, void *pinfo, + #elif defined(__OpenBSD__) + struct sigcontext *uc = puc; + #else +- struct ucontext *uc = puc; ++ ucontext_t *uc = puc; + #endif + unsigned long pc; + int trapno; +@@ -226,7 +226,7 @@ int cpu_signal_handler(int host_signum, void *pinfo, + #elif defined(__OpenBSD__) + struct sigcontext *uc = puc; + #else +- struct ucontext *uc = puc; ++ ucontext_t *uc = puc; + #endif + + pc = PC_sig(uc); +@@ -293,7 +293,7 @@ int cpu_signal_handler(int host_signum, void *pinfo, + #if defined(__FreeBSD__) || defined(__FreeBSD_kernel__) + ucontext_t *uc = puc; + #else +- struct ucontext *uc = puc; ++ ucontext_t *uc = puc; + #endif + unsigned long pc; + int is_write; +@@ -320,7 +320,7 @@ int cpu_signal_handler(int host_signum, void *pinfo, + void *puc) + { + siginfo_t *info = pinfo; +- struct ucontext *uc = puc; ++ ucontext_t *uc = puc; + uint32_t *pc = uc->uc_mcontext.sc_pc; + uint32_t insn = *pc; + int is_write = 0; +@@ -418,7 +418,7 @@ int cpu_signal_handler(int host_signum, void *pinfo, + #if defined(__NetBSD__) + ucontext_t *uc = puc; + #else +- struct ucontext *uc = puc; ++ ucontext_t *uc = puc; + #endif + unsigned long pc; + int is_write; +@@ -445,7 +445,7 @@ int cpu_signal_handler(int host_signum, void *pinfo, + int cpu_signal_handler(int host_signum, void *pinfo, void *puc) + { + siginfo_t *info = pinfo; +- struct ucontext *uc = puc; ++ ucontext_t *uc = puc; + uintptr_t pc = uc->uc_mcontext.pc; + uint32_t insn = *(uint32_t *)pc; + bool is_write; +@@ -478,7 +478,7 @@ int cpu_signal_handler(int host_signum, void *pinfo, void *puc) + int cpu_signal_handler(int host_signum, void *pinfo, void *puc) + { + siginfo_t *info = pinfo; +- struct ucontext *uc = puc; ++ ucontext_t *uc = puc; + unsigned long ip; + int is_write = 0; + +@@ -509,7 +509,7 @@ int cpu_signal_handler(int host_signum, void *pinfo, + void *puc) + { + siginfo_t *info = pinfo; +- struct ucontext *uc = puc; ++ ucontext_t *uc = puc; + unsigned long pc; + uint16_t *pinsn; + int is_write = 0; +@@ -562,7 +562,7 @@ int cpu_signal_handler(int host_signum, void *pinfo, + void *puc) + { + siginfo_t *info = pinfo; +- struct ucontext *uc = puc; ++ ucontext_t *uc = puc; + greg_t pc = uc->uc_mcontext.pc; + int is_write; + diff --git a/qemu-linux-user.changes b/qemu-linux-user.changes index 1c75068..f941f79 100644 --- a/qemu-linux-user.changes +++ b/qemu-linux-user.changes @@ -1,3 +1,11 @@ +------------------------------------------------------------------- +Thu Aug 24 18:52:43 UTC 2017 - brogers@suse.com + +- Fix package build failure as of glibc v2.26 update in Factory + (boo#1055587) + 0075-Replace-struct-ucontext-with-uconte.patch +- Patch queue updated from git://github.com/openSUSE/qemu.git opensuse-2.9 + ------------------------------------------------------------------- Tue Aug 15 19:29:59 UTC 2017 - brogers@suse.com diff --git a/qemu-linux-user.spec b/qemu-linux-user.spec index 13da755..e3ff37d 100644 --- a/qemu-linux-user.spec +++ b/qemu-linux-user.spec @@ -100,6 +100,7 @@ Patch0071: 0071-exec-use-qemu_ram_ptr_length-to-acc.patch Patch0072: 0072-slirp-check-len-against-dhcp-option.patch Patch0073: 0073-xen-mapcache-store-dma-information-.patch Patch0074: 0074-exec-Add-lock-parameter-to-qemu_ram.patch +Patch0075: 0075-Replace-struct-ucontext-with-uconte.patch # Please do not add QEMU patches manually here. # Run update_git.sh to regenerate this queue. Source400: update_git.sh @@ -227,6 +228,7 @@ run cross-architecture builds. %patch0072 -p1 %patch0073 -p1 %patch0074 -p1 +%patch0075 -p1 %build ./configure \ diff --git a/qemu-testsuite.changes b/qemu-testsuite.changes index 97c4d7c..fa48f10 100644 --- a/qemu-testsuite.changes +++ b/qemu-testsuite.changes @@ -1,3 +1,16 @@ +------------------------------------------------------------------- +Thu Aug 24 18:52:40 UTC 2017 - brogers@suse.com + +- Fix package build failure as of glibc v2.26 update in Factory + (boo#1055587) + 0075-Replace-struct-ucontext-with-uconte.patch +- Patch queue updated from git://github.com/openSUSE/qemu.git opensuse-2.9 + +------------------------------------------------------------------- +Mon Aug 21 08:10:38 UTC 2017 - schwab@suse.de + +- Remove redundant prerequire for pwdutils + ------------------------------------------------------------------- Fri Aug 18 15:35:54 UTC 2017 - brogers@suse.com diff --git a/qemu-testsuite.spec b/qemu-testsuite.spec index 484f2cc..a8880b1 100644 --- a/qemu-testsuite.spec +++ b/qemu-testsuite.spec @@ -204,6 +204,7 @@ Patch0071: 0071-exec-use-qemu_ram_ptr_length-to-acc.patch Patch0072: 0072-slirp-check-len-against-dhcp-option.patch Patch0073: 0073-xen-mapcache-store-dma-information-.patch Patch0074: 0074-exec-Add-lock-parameter-to-qemu_ram.patch +Patch0075: 0075-Replace-struct-ucontext-with-uconte.patch # Please do not add QEMU patches manually here. # Run update_git.sh to regenerate this queue. @@ -413,7 +414,6 @@ BuildRequires: qemu-block-rbd = %version BuildRequires: qemu-block-ssh = %version %endif %endif -Requires(pre): pwdutils Requires(pre): shadow Requires(post): coreutils %if %{kvm_available} @@ -934,6 +934,7 @@ This package provides a service file for starting and stopping KSM. %patch0072 -p1 %patch0073 -p1 %patch0074 -p1 +%patch0075 -p1 pushd roms/ipxe %patch1100 -p1 diff --git a/qemu.changes b/qemu.changes index 97c4d7c..fa48f10 100644 --- a/qemu.changes +++ b/qemu.changes @@ -1,3 +1,16 @@ +------------------------------------------------------------------- +Thu Aug 24 18:52:40 UTC 2017 - brogers@suse.com + +- Fix package build failure as of glibc v2.26 update in Factory + (boo#1055587) + 0075-Replace-struct-ucontext-with-uconte.patch +- Patch queue updated from git://github.com/openSUSE/qemu.git opensuse-2.9 + +------------------------------------------------------------------- +Mon Aug 21 08:10:38 UTC 2017 - schwab@suse.de + +- Remove redundant prerequire for pwdutils + ------------------------------------------------------------------- Fri Aug 18 15:35:54 UTC 2017 - brogers@suse.com diff --git a/qemu.spec b/qemu.spec index 49ba88d..5fbc0dc 100644 --- a/qemu.spec +++ b/qemu.spec @@ -204,6 +204,7 @@ Patch0071: 0071-exec-use-qemu_ram_ptr_length-to-acc.patch Patch0072: 0072-slirp-check-len-against-dhcp-option.patch Patch0073: 0073-xen-mapcache-store-dma-information-.patch Patch0074: 0074-exec-Add-lock-parameter-to-qemu_ram.patch +Patch0075: 0075-Replace-struct-ucontext-with-uconte.patch # Please do not add QEMU patches manually here. # Run update_git.sh to regenerate this queue. @@ -413,7 +414,6 @@ BuildRequires: qemu-block-rbd = %version BuildRequires: qemu-block-ssh = %version %endif %endif -Requires(pre): pwdutils Requires(pre): shadow Requires(post): coreutils %if %{kvm_available} @@ -934,6 +934,7 @@ This package provides a service file for starting and stopping KSM. %patch0072 -p1 %patch0073 -p1 %patch0074 -p1 +%patch0075 -p1 pushd roms/ipxe %patch1100 -p1 diff --git a/qemu.spec.in b/qemu.spec.in index 33cedb7..d19db9d 100644 --- a/qemu.spec.in +++ b/qemu.spec.in @@ -340,7 +340,6 @@ BuildRequires: qemu-block-rbd = %version BuildRequires: qemu-block-ssh = %version %endif %endif -Requires(pre): pwdutils Requires(pre): shadow Requires(post): coreutils %if %{kvm_available}