tools/xenstore/xenstored_control.c | 2 +- tools/xenstore/xenstored_domain.c | 4 ++-- tools/xenstore/xenstored_domain.h | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-)
From: Julien Grall <jgrall@amazon.com>
The parameter of check_domains() is not used within the function. In fact,
this was a left over of the original implementation as the version merged
doesn't need to know whether we are restoring.
So remove it.
Signed-off-by: Julien Grall <jgrall@amazon.com>
---
tools/xenstore/xenstored_control.c | 2 +-
tools/xenstore/xenstored_domain.c | 4 ++--
tools/xenstore/xenstored_domain.h | 2 +-
3 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/tools/xenstore/xenstored_control.c b/tools/xenstore/xenstored_control.c
index 8e470f2b2056..07458d7b48d0 100644
--- a/tools/xenstore/xenstored_control.c
+++ b/tools/xenstore/xenstored_control.c
@@ -589,7 +589,7 @@ void lu_read_state(void)
* have died while we were live-updating. So check all the domains are
* still alive.
*/
- check_domains(true);
+ check_domains();
}
static const char *lu_activate_binary(const void *ctx)
diff --git a/tools/xenstore/xenstored_domain.c b/tools/xenstore/xenstored_domain.c
index 3d4d0649a243..0e4bae9a9dd6 100644
--- a/tools/xenstore/xenstored_domain.c
+++ b/tools/xenstore/xenstored_domain.c
@@ -220,7 +220,7 @@ static bool get_domain_info(unsigned int domid, xc_dominfo_t *dominfo)
dominfo->domid == domid;
}
-void check_domains(bool restore)
+void check_domains(void)
{
xc_dominfo_t dominfo;
struct domain *domain;
@@ -277,7 +277,7 @@ void handle_event(void)
barf_perror("Failed to read from event fd");
if (port == virq_port)
- check_domains(false);
+ check_domains();
if (xenevtchn_unmask(xce_handle, port) == -1)
barf_perror("Failed to write to event fd");
diff --git a/tools/xenstore/xenstored_domain.h b/tools/xenstore/xenstored_domain.h
index dc9759171317..cc5147d7e747 100644
--- a/tools/xenstore/xenstored_domain.h
+++ b/tools/xenstore/xenstored_domain.h
@@ -21,7 +21,7 @@
void handle_event(void);
-void check_domains(bool restore);
+void check_domains(void);
/* domid, mfn, eventchn, path */
int do_introduce(struct connection *conn, struct buffered_data *in);
--
2.17.1
Hi, Please ignore this patch. I forgot to CC the maintainers. I will resend it. Sorry for the noise. Cheers, On 18/05/2021 16:21, Julien Grall wrote: > From: Julien Grall <jgrall@amazon.com> > > The parameter of check_domains() is not used within the function. In fact, > this was a left over of the original implementation as the version merged > doesn't need to know whether we are restoring. > > So remove it. > > Signed-off-by: Julien Grall <jgrall@amazon.com> > --- > tools/xenstore/xenstored_control.c | 2 +- > tools/xenstore/xenstored_domain.c | 4 ++-- > tools/xenstore/xenstored_domain.h | 2 +- > 3 files changed, 4 insertions(+), 4 deletions(-) > > diff --git a/tools/xenstore/xenstored_control.c b/tools/xenstore/xenstored_control.c > index 8e470f2b2056..07458d7b48d0 100644 > --- a/tools/xenstore/xenstored_control.c > +++ b/tools/xenstore/xenstored_control.c > @@ -589,7 +589,7 @@ void lu_read_state(void) > * have died while we were live-updating. So check all the domains are > * still alive. > */ > - check_domains(true); > + check_domains(); > } > > static const char *lu_activate_binary(const void *ctx) > diff --git a/tools/xenstore/xenstored_domain.c b/tools/xenstore/xenstored_domain.c > index 3d4d0649a243..0e4bae9a9dd6 100644 > --- a/tools/xenstore/xenstored_domain.c > +++ b/tools/xenstore/xenstored_domain.c > @@ -220,7 +220,7 @@ static bool get_domain_info(unsigned int domid, xc_dominfo_t *dominfo) > dominfo->domid == domid; > } > > -void check_domains(bool restore) > +void check_domains(void) > { > xc_dominfo_t dominfo; > struct domain *domain; > @@ -277,7 +277,7 @@ void handle_event(void) > barf_perror("Failed to read from event fd"); > > if (port == virq_port) > - check_domains(false); > + check_domains(); > > if (xenevtchn_unmask(xce_handle, port) == -1) > barf_perror("Failed to write to event fd"); > diff --git a/tools/xenstore/xenstored_domain.h b/tools/xenstore/xenstored_domain.h > index dc9759171317..cc5147d7e747 100644 > --- a/tools/xenstore/xenstored_domain.h > +++ b/tools/xenstore/xenstored_domain.h > @@ -21,7 +21,7 @@ > > void handle_event(void); > > -void check_domains(bool restore); > +void check_domains(void); > > /* domid, mfn, eventchn, path */ > int do_introduce(struct connection *conn, struct buffered_data *in); > -- Julien Grall
© 2016 - 2024 Red Hat, Inc.