From: Richard Henderson <richard.henderson@linaro.org>
To: qemu-devel@nongnu.org
Cc: peter.maydell@linaro.org, alex.bennee@linaro.org
Subject: [RISU v2 12/17] Simplify syncing with master
Date: Mon, 18 May 2020 19:53:50 -0700 [thread overview]
Message-ID: <20200519025355.4420-13-richard.henderson@linaro.org> (raw)
In-Reply-To: <20200519025355.4420-1-richard.henderson@linaro.org>
Do not pass status like RES_BAD_IO from apprentice to master.
This means that when master reports i/o error that we know it
came from master; the apprentice will report its own i/o error.
Signed-off-by: Richard Henderson <richard.henderson@linaro.org>
---
reginfo.c | 11 +++++------
1 file changed, 5 insertions(+), 6 deletions(-)
diff --git a/reginfo.c b/reginfo.c
index c37c5df..31bc699 100644
--- a/reginfo.c
+++ b/reginfo.c
@@ -90,10 +90,9 @@ RisuResult recv_and_compare_register_info(void *uc)
}
if (header.risu_op != op) {
- /* We are out of sync */
- res = RES_BAD_IO;
- respond(res);
- return res;
+ /* We are out of sync. Tell master to exit. */
+ respond(RES_END);
+ return RES_BAD_IO;
}
/* send OK for the header */
@@ -115,7 +114,7 @@ RisuResult recv_and_compare_register_info(void *uc)
} else if (op == OP_TESTEND) {
res = RES_END;
}
- respond(res);
+ respond(res == RES_OK ? RES_OK : RES_END);
break;
case OP_SETMEMBLOCK:
memblock = (void *)(uintptr_t)get_reginfo_paramreg(&apprentice_ri);
@@ -133,7 +132,7 @@ RisuResult recv_and_compare_register_info(void *uc)
/* memory mismatch */
res = RES_MISMATCH;
}
- respond(res);
+ respond(res == RES_OK ? RES_OK : RES_END);
break;
default:
abort();
--
2.20.1
next prev parent reply other threads:[~2020-05-19 2:58 UTC|newest]
Thread overview: 36+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-05-19 2:53 [RISU v2 00/17] risu cleanups and improvements Richard Henderson
2020-05-19 2:53 ` [RISU v2 01/17] Use bool for tracing variables Richard Henderson
2020-05-19 15:52 ` Alex Bennée
2020-05-19 2:53 ` [RISU v2 02/17] Unify master_fd and apprentice_fd to comm_fd Richard Henderson
2020-05-19 15:52 ` Alex Bennée
2020-05-19 2:53 ` [RISU v2 03/17] Hoist trace file opening Richard Henderson
2020-05-19 16:50 ` Alex Bennée
2020-05-19 2:53 ` [RISU v2 04/17] Adjust tracefile open for write Richard Henderson
2020-05-19 18:24 ` Alex Bennée
2020-05-19 2:53 ` [RISU v2 05/17] Use EXIT_FAILURE, EXIT_SUCCESS Richard Henderson
2020-05-19 18:24 ` Alex Bennée
2020-05-19 2:53 ` [RISU v2 06/17] Make some risu.c symbols static Richard Henderson
2020-05-19 18:25 ` Alex Bennée
2020-05-19 2:53 ` [RISU v2 07/17] Add enum RisuOp Richard Henderson
2020-05-19 18:39 ` Alex Bennée
2020-05-19 2:53 ` [RISU v2 08/17] Add enum RisuResult Richard Henderson
2020-05-19 19:06 ` Alex Bennée
2020-05-19 2:53 ` [RISU v2 09/17] Unify i/o functions and use RisuResult Richard Henderson
2020-05-20 15:50 ` Alex Bennée
2020-05-19 2:53 ` [RISU v2 10/17] Pass non-OK result back through siglongjmp Richard Henderson
2020-05-20 15:52 ` Alex Bennée
2020-05-19 2:53 ` [RISU v2 11/17] Always write for --master Richard Henderson
2020-05-20 16:12 ` Alex Bennée
2020-05-19 2:53 ` Richard Henderson [this message]
2020-05-20 16:14 ` [RISU v2 12/17] Simplify syncing with master Alex Bennée
2020-05-19 2:53 ` [RISU v2 13/17] Split RES_MISMATCH for registers and memory Richard Henderson
2020-05-20 16:25 ` Alex Bennée
2020-05-19 2:53 ` [RISU v2 14/17] Add magic and size to the trace header Richard Henderson
2020-05-19 21:16 ` Richard Henderson
2020-05-20 16:59 ` Alex Bennée
2020-05-19 2:53 ` [RISU v2 15/17] Compute reginfo_size based on the reginfo Richard Henderson
2020-05-20 17:30 ` Alex Bennée
2020-05-19 2:53 ` [RISU v2 16/17] aarch64: Reorg sve reginfo to save space Richard Henderson
2020-05-20 18:43 ` Alex Bennée
2020-05-19 2:53 ` [RISU v2 17/17] Add --dump option to inspect trace files Richard Henderson
2020-05-20 17:49 ` Alex Bennée
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=20200519025355.4420-13-richard.henderson@linaro.org \
--to=richard.henderson@linaro.org \
--cc=alex.bennee@linaro.org \
--cc=peter.maydell@linaro.org \
--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).