On 10.11.23 19:05, Julien Grall wrote:
Hi Juergen,On 10/11/2023 16:07, Juergen Gross wrote:Today domain_init() is called either just before calling dom0_init() in case no live update is being performed, or it is called after reading the global state from read_state_global(), as the event channel fd is needed. Split up domain_init() into a preparation part which can be called unconditionally, and in a part setting up the event channel handle.Looking at the code, domain_init() may not be called if -D is passed to Xen. With your change, part of it would not be called unconditionally.So does -D actually make sense? Did it actually work before your change? Should it be removed?
Good point. I think it should be removed. I don't think it can work at all.
Note that there is no chance that chk_domain_generation() can be called now before xc_handle has been setup, so there is no need for the related special case anymore. Signed-off-by: Juergen Gross <jgr...@suse.com> --- tools/xenstored/core.c | 2 ++ tools/xenstored/domain.c | 12 ++++++------ tools/xenstored/domain.h | 1 + 3 files changed, 9 insertions(+), 6 deletions(-) diff --git a/tools/xenstored/core.c b/tools/xenstored/core.c index 8e271e31f9..b9ec50b34c 100644 --- a/tools/xenstored/core.c +++ b/tools/xenstored/core.c @@ -2960,6 +2960,8 @@ int main(int argc, char *argv[]) init_pipe(reopen_log_pipe); + domain_static_init();NIT: I find 'static' a bit confusing. How about using 'early' instead to match 'early_init()'?
Yes, good idea. I wasn't very happy with the name either. Juergen
OpenPGP_0xB0DE9DD628BF132F.asc
Description: OpenPGP public key
OpenPGP_signature.asc
Description: OpenPGP digital signature
