Use siginfo_t instead of struct siginfo.

PATCH In review Andreas Jaeger 4 participants 6 messages Jul 30, 2012 – Jul 31, 2012

Share & tools

Andreas Jaeger

author

2012-07-30 07:21 UTC #0 lore raw

PATCH 1/1 Use siginfo_t instead of struct siginfo.

glibc 2.16 does not export the undocumented struct siginfo anymore. qemu uses already in most cases siginfo_t, this patch fixes the last three occurences.

Signed-off-by Andreas Jaeger <ajsuse.de>

---
 linux-user/signal.c |    6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

linux-user/signal.c +3 -3

index 97f30d9..a859a45 100644
@@ -3255,7 +3255,7 @@ struct target_signal_frame {
 };
 
 struct rt_signal_frame {
-    struct siginfo info;
+    siginfo_t info;
     struct ucontext uc;
     uint32_t tramp[2];
 };

@@ -3474,9 +3474,9 @@ struct target_signal_frame {
 };
 
 struct rt_signal_frame {
-        struct siginfo *pinfo;
+        siginfo_t *pinfo;
         void *puc;
-        struct siginfo info;
+        siginfo_t info;
         struct ucontext uc;
         uint8_t retcode[8];       /* Trampoline code. */
 };

Signature · 8 lines

1.7.10.4


-- 
 Andreas Jaeger aj@{suse.com,opensuse.org} Twitter/Identica: jaegerandi
  SUSE LINUX Products GmbH, Maxfeldstr. 5, 90409 Nürnberg, Germany
   GF: Jeff Hawn,Jennifer Guild,Felix Imendörffer,HRB16746 (AG Nürnberg)
    GPG fingerprint = 93A3 365E CE47 B889 DF7F  FED1 389A 563C C272 A126

Alexander Graf

2012-07-30 21:30 UTC #1 lore raw

Quoted 6 lines · Andreas Jaeger

glibc 2.16 does not export the undocumented struct siginfo anymore. qemu uses already in most cases siginfo_t, this patch fixes the last three occurences.
Signed-off-by Andreas Jaeger <ajsuse.de>

That email address doesn't look valid :).

So I take it that the change is backwards compatible? Riku, Mike, Andreas, could we queue this for the respective stable branches when it gets it please?

Alex

Quoted 39 lines

---
linux-user/signal.c | 6 +++---

1 file changed, 3 insertions(+), 3 deletions(-)

linux-user/signal.c +3 -3

index 97f30d9..a859a45 100644
@@ -3255,7 +3255,7 @@ struct target_signal_frame {
 };
 
 struct rt_signal_frame {
-    struct siginfo info;
+    siginfo_t info;
    struct ucontext uc;
    uint32_t tramp[2];
 };

@@ -3474,9 +3474,9 @@ struct target_signal_frame {
 };
 
 struct rt_signal_frame {
-        struct siginfo *pinfo;
+        siginfo_t *pinfo;
        void *puc;
-        struct siginfo info;
+        siginfo_t info;
        struct ucontext uc;
        uint8_t retcode[8];       /* Trampoline code. */
 };

Signature · 8 lines

1.7.10.4


-- 
Andreas Jaeger aj@{suse.com,opensuse.org} Twitter/Identica: jaegerandi
 SUSE LINUX Products GmbH, Maxfeldstr. 5, 90409 Nürnberg, Germany
  GF: Jeff Hawn,Jennifer Guild,Felix Imendörffer,HRB16746 (AG Nürnberg)
   GPG fingerprint = 93A3 365E CE47 B889 DF7F  FED1 389A 563C C272 A126

Andreas Färber

2012-07-30 21:33 UTC #2 lore raw

Am 30.07.2012 23:30, schrieb Alexander Graf:

Quoted 8 lines · Andreas Jaeger

Quoted 6 lines
glibc 2.16 does not export the undocumented struct siginfo anymore. qemu uses already in most cases siginfo_t, this patch fixes the last three occurences.

Quoted 5 lines

Quoted 1 line
Signed-off-by Andreas Jaeger <ajsuse.de>
That email address doesn't look valid :).
So I take it that the change is backwards compatible? Riku, Mike, Andreas, could we queue this for the respective stable branches when it gets it please?

Wasn't there already another patch doing the same thing a few weeks ago?

Andreas

Quoted 44 lines

Alex

Quoted 39 lines

---
linux-user/signal.c | 6 +++---

1 file changed, 3 insertions(+), 3 deletions(-)

linux-user/signal.c +3 -3

index 97f30d9..a859a45 100644
@@ -3255,7 +3255,7 @@ struct target_signal_frame {
 };
 
 struct rt_signal_frame {
-    struct siginfo info;
+    siginfo_t info;
    struct ucontext uc;
    uint32_t tramp[2];
 };

@@ -3474,9 +3474,9 @@ struct target_signal_frame {
 };
 
 struct rt_signal_frame {
-        struct siginfo *pinfo;
+        siginfo_t *pinfo;
        void *puc;
-        struct siginfo info;
+        siginfo_t info;
        struct ucontext uc;
        uint8_t retcode[8];       /* Trampoline code. */
 };

Signature · 8 lines

1.7.10.4


-- 
Andreas Jaeger aj@{suse.com,opensuse.org} Twitter/Identica: jaegerandi
 SUSE LINUX Products GmbH, Maxfeldstr. 5, 90409 Nürnberg, Germany
  GF: Jeff Hawn,Jennifer Guild,Felix Imendörffer,HRB16746 (AG Nürnberg)
   GPG fingerprint = 93A3 365E CE47 B889 DF7F  FED1 389A 563C C272 A126

Signature · 2 lines

SUSE LINUX Products GmbH, Maxfeldstr. 5, 90409 Nürnberg, Germany
GF: Jeff Hawn, Jennifer Guild, Felix Imendörffer; HRB 16746 AG Nürnberg

Peter Maydell

2012-07-30 21:38 UTC #3 lore raw

Quoted 7 lines · Andreas Färber

Am 30.07.2012 23:30, schrieb Alexander Graf:
Quoted 4 lines · Andreas Jaeger
Quoted 3 lines
glibc 2.16 does not export the undocumented struct siginfo anymore. qemu uses already in most cases siginfo_t, this patch fixes the last three occurences.
Wasn't there already another patch doing the same thing a few weeks ago?

Yes: http://patchwork.ozlabs.org/patch/169170/

(It's also more complete than this patch, which misses one occurrence in user-exec.c and one comment in linux-user/signal.c.)

-- PMM

Alexander Graf

2012-07-30 21:41 UTC #4 lore raw

Quoted 7 lines · Peter Maydell

Quoted 5 lines · Andreas Färber
Am 30.07.2012 23:30, schrieb Alexander Graf:
Quoted 4 lines · Andreas Jaeger
Quoted 3 lines
glibc 2.16 does not export the undocumented struct siginfo anymore. qemu uses already in most cases siginfo_t, this patch fixes the last three occurences.

Quoted 6 lines

Quoted 1 line
Wasn't there already another patch doing the same thing a few weeks ago?
Yes: http://patchwork.ozlabs.org/patch/169170/
(It's also more complete than this patch, which misses one occurrence in user-exec.c and one comment in linux-user/signal.c.)

Ah, cool. Same thing I said before applies to this patch then. I'm fairly sure people want to be able to compile older QEMU on newer glibc.

Alex

Andreas Jaeger

author

2012-07-31 07:08 UTC #5 lore raw

In reply to Peter Maydell

Quoted 9 lines · On Monday, July 30, 2012 22:38:32 Peter Maydell wrote:

Quoted 8 lines · Andreas Färber
Am 30.07.2012 23:30, schrieb Alexander Graf:
Quoted 6 lines · Andreas Jaeger
Quoted 5 lines
glibc 2.16 does not export the undocumented struct siginfo anymore.
qemu uses already in most cases siginfo_t, this patch fixes the last
three occurences.

Quoted 6 lines

Quoted 2 lines
Wasn't there already another patch doing the same thing a few weeks ago?
Yes: http://patchwork.ozlabs.org/patch/169170/
(It's also more complete than this patch, which misses one occurrence in user-exec.c and one comment in linux-user/signal.c.)

Yes, let's apply that patch instead of mine,

Andreas

Signature · 4 lines

 Andreas Jaeger aj@{suse.com,opensuse.org} Twitter/Identica: jaegerandi
  SUSE LINUX Products GmbH, Maxfeldstr. 5, 90409 Nürnberg, Germany
   GF: Jeff Hawn,Jennifer Guild,Felix Imendörffer,HRB16746 (AG Nürnberg)
    GPG fingerprint = 93A3 365E CE47 B889 DF7F  FED1 389A 563C C272 A126