diff options
| author | Peter Maydell <peter.maydell@linaro.org> | 2016-07-19 10:54:49 +0100 |
|---|---|---|
| committer | Peter Maydell <peter.maydell@linaro.org> | 2016-07-19 10:54:49 +0100 |
| commit | 0c1b58f25025cc09463aae235162b19ff45c37b7 (patch) | |
| tree | 93f05bbeadc130a91399cc98ac3c914df87958e3 /disas/sparc.c | |
| parent | 08b558f07bf67abf759e67266a83a8effdc34139 (diff) | |
| parent | 77e2b17272963c09e309315903f3781dbdd85341 (diff) | |
| download | focaccia-qemu-0c1b58f25025cc09463aae235162b19ff45c37b7.tar.gz focaccia-qemu-0c1b58f25025cc09463aae235162b19ff45c37b7.zip | |
Merge remote-tracking branch 'remotes/stefanha/tags/tracing-pull-request' into staging
# gpg: Signature made Mon 18 Jul 2016 22:59:55 BST # gpg: using RSA key 0x9CA4ABB381AB73C8 # gpg: Good signature from "Stefan Hajnoczi <stefanha@redhat.com>" # gpg: aka "Stefan Hajnoczi <stefanha@gmail.com>" # Primary key fingerprint: 8695 A8BF D3F9 7CDA AC35 775A 9CA4 ABB3 81AB 73C8 * remotes/stefanha/tags/tracing-pull-request: trace: Add QAPI/QMP interfaces to query and control per-vCPU tracing state trace: Allow event name pattern in "info trace-events" trace: Conditionally trace events based on their per-vCPU state trace: Add per-vCPU tracing states for events with the 'vcpu' property trace: Cosmetic changes on fast-path tracing disas: Remove unused macro '_' trace: Identify events with the 'vcpu' property trace: [bsd-user] Commandline arguments to control tracing trace: [linux-user] Commandline arguments to control tracing Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Diffstat (limited to 'disas/sparc.c')
| -rw-r--r-- | disas/sparc.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/disas/sparc.c b/disas/sparc.c index 64bba8df27..f120f4e86d 100644 --- a/disas/sparc.c +++ b/disas/sparc.c @@ -2494,7 +2494,7 @@ compare_opcodes (const void * a, const void * b) fprintf (stderr, /* xgettext:c-format */ - _("Internal error: bad sparc-opcode.h: \"%s\", %#.8lx, %#.8lx\n"), + "Internal error: bad sparc-opcode.h: \"%s\", %#.8lx, %#.8lx\n", op0->name, match0, lose0); op0->lose &= ~op0->match; lose0 = op0->lose; @@ -2505,7 +2505,7 @@ compare_opcodes (const void * a, const void * b) fprintf (stderr, /* xgettext:c-format */ - _("Internal error: bad sparc-opcode.h: \"%s\", %#.8lx, %#.8lx\n"), + "Internal error: bad sparc-opcode.h: \"%s\", %#.8lx, %#.8lx\n", op1->name, match1, lose1); op1->lose &= ~op1->match; lose1 = op1->lose; @@ -2555,7 +2555,7 @@ compare_opcodes (const void * a, const void * b) else fprintf (stderr, /* xgettext:c-format */ - _("Internal error: bad sparc-opcode.h: \"%s\" == \"%s\"\n"), + "Internal error: bad sparc-opcode.h: \"%s\" == \"%s\"\n", op0->name, op1->name); } |