From: Peter Maydell <peter.maydell@linaro.org>
To: qemu-devel@nongnu.org
Cc: Nikunj A Dadhania <nikunj@linux.vnet.ibm.com>,
Laurent Vivier <laurent@vivier.eu>
Subject: [Qemu-devel] [PATCH risu 5/9] m68k: Drop unused ucontext_t* argument to reginfo_is_eq()
Date: Fri, 24 Feb 2017 17:35:24 +0000 [thread overview]
Message-ID: <1487957728-8354-6-git-send-email-peter.maydell@linaro.org> (raw)
In-Reply-To: <1487957728-8354-1-git-send-email-peter.maydell@linaro.org>
Drop the ucontext*t argument to reginfo_is_eq(); we don't
use it.
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
---
risu_m68k.c | 4 ++--
risu_reginfo_m68k.c | 2 +-
risu_reginfo_m68k.h | 2 +-
3 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/risu_m68k.c b/risu_m68k.c
index 87776ab..e345b25 100644
--- a/risu_m68k.c
+++ b/risu_m68k.c
@@ -91,7 +91,7 @@ int recv_and_compare_register_info(int sock, void *uc)
if (recv_data_pkt(sock, &apprentice_ri, sizeof(apprentice_ri))) {
packet_mismatch = 1;
resp = 2;
- } else if (!reginfo_is_eq(&master_ri, &apprentice_ri, uc)) {
+ } else if (!reginfo_is_eq(&master_ri, &apprentice_ri)) {
resp = 2;
}
else if (op == OP_TESTEND) {
@@ -137,7 +137,7 @@ int report_match_status(void)
fprintf(stderr, "master reginfo:\n");
reginfo_dump(&master_ri, stderr);
}
- if (!reginfo_is_eq(&master_ri, &apprentice_ri, NULL)) {
+ if (!reginfo_is_eq(&master_ri, &apprentice_ri)) {
fprintf(stderr, "mismatch on regs!\n");
resp = 1;
}
diff --git a/risu_reginfo_m68k.c b/risu_reginfo_m68k.c
index 3988d71..45950b1 100644
--- a/risu_reginfo_m68k.c
+++ b/risu_reginfo_m68k.c
@@ -38,7 +38,7 @@ void reginfo_init(struct reginfo *ri, ucontext_t *uc)
}
/* reginfo_is_eq: compare the reginfo structs, returns nonzero if equal */
-int reginfo_is_eq(struct reginfo *m, struct reginfo *a, ucontext_t *uc)
+int reginfo_is_eq(struct reginfo *m, struct reginfo *a)
{
int i;
diff --git a/risu_reginfo_m68k.h b/risu_reginfo_m68k.h
index 3922bf6..021939d 100644
--- a/risu_reginfo_m68k.h
+++ b/risu_reginfo_m68k.h
@@ -21,7 +21,7 @@ struct reginfo
void reginfo_init(struct reginfo *ri, ucontext_t *uc);
/* return 1 if structs are equal, 0 otherwise. */
-int reginfo_is_eq(struct reginfo *r1, struct reginfo *r2, ucontext_t *uc);
+int reginfo_is_eq(struct reginfo *r1, struct reginfo *r2);
/* print reginfo state to a stream, returns 1 on success, 0 on failure */
int reginfo_dump(struct reginfo *ri, FILE *f);
--
2.7.4
next prev parent reply other threads:[~2017-02-24 17:35 UTC|newest]
Thread overview: 13+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-02-24 17:35 [Qemu-devel] [PATCH risu 0/9] risu: refactor and reduce CPU-specific code Peter Maydell
2017-02-24 17:35 ` [Qemu-devel] [PATCH risu 1/9] Drop the weird modification of a ucontext in the ppc reginfo_is_eq() Peter Maydell
2017-02-24 17:35 ` [Qemu-devel] [PATCH risu 2/9] Abstract out getting and setting parameter register Peter Maydell
2017-02-24 17:35 ` [Qemu-devel] [PATCH risu 3/9] Make get_risuop() a formal part of the CPU interface Peter Maydell
2017-02-24 17:35 ` [Qemu-devel] [PATCH risu 4/9] ppc64le, m68k: Make reginfo_dump() API match arm, aarch64 Peter Maydell
2017-02-24 17:35 ` Peter Maydell [this message]
2017-02-24 17:35 ` [Qemu-devel] [PATCH risu 6/9] Make reginfo_{init, is_eq, dump, dump_mismatch} official per-CPU API Peter Maydell
2017-02-24 17:35 ` [Qemu-devel] [PATCH risu 7/9] Move send_register_info() to reginfo.c Peter Maydell
2017-02-24 17:35 ` [Qemu-devel] [PATCH risu 8/9] Move recv_and_compare_register_info() and report_match_status() " Peter Maydell
2017-02-24 17:35 ` [Qemu-devel] [PATCH risu 9/9] Tidy up #include lines Peter Maydell
2017-02-24 18:15 ` [Qemu-devel] [PATCH risu 0/9] risu: refactor and reduce CPU-specific code Laurent Vivier
2017-02-24 18:17 ` Peter Maydell
2017-02-28 17:47 ` Peter Maydell
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1487957728-8354-6-git-send-email-peter.maydell@linaro.org \
--to=peter.maydell@linaro.org \
--cc=laurent@vivier.eu \
--cc=nikunj@linux.vnet.ibm.com \
--cc=qemu-devel@nongnu.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).