diff options
| author | Peter Maydell <peter.maydell@linaro.org> | 2014-04-01 20:45:42 +0100 |
|---|---|---|
| committer | Peter Maydell <peter.maydell@linaro.org> | 2014-04-01 20:45:43 +0100 |
| commit | 82c6f513735297ad76acaaf2e87f0c5a0b3647a7 (patch) | |
| tree | 471e94a1ec8836ca6b970d158f8604e358c9e62a | |
| parent | 53e11bd384a799c03884bd7d8b5be53f025f8e2d (diff) | |
| parent | 9bcec938aab22a1b7ced916a6895e5029d4ed04f (diff) | |
| download | qemu-82c6f513735297ad76acaaf2e87f0c5a0b3647a7.zip | |
Merge remote-tracking branch 'remotes/stefanha/tags/tracing-pull-request' into staging
Tracing pull request
# gpg: Signature made Tue 01 Apr 2014 19:08:48 BST using RSA key ID 81AB73C8
# gpg: Good signature from "Stefan Hajnoczi <stefanha@redhat.com>"
# gpg: aka "Stefan Hajnoczi <stefanha@gmail.com>"
* remotes/stefanha/tags/tracing-pull-request:
trace: add workaround for SystemTap PR13296
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
| -rw-r--r-- | hw/intc/apic_common.c | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/hw/intc/apic_common.c b/hw/intc/apic_common.c index c623fcc6d8..7ecce2dcce 100644 --- a/hw/intc/apic_common.c +++ b/hw/intc/apic_common.c @@ -117,7 +117,12 @@ void apic_report_irq_delivered(int delivered) void apic_reset_irq_delivered(void) { - trace_apic_reset_irq_delivered(apic_irq_delivered); + /* Copy this into a local variable to encourage gcc to emit a plain + * register for a sys/sdt.h marker. For details on this workaround, see: + * https://sourceware.org/bugzilla/show_bug.cgi?id=13296 + */ + volatile int a_i_d = apic_irq_delivered; + trace_apic_reset_irq_delivered(a_i_d); apic_irq_delivered = 0; } |