| Message ID | 20190805031240.6024-1-alxndr@bu.edu (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | qtest: Rename qtest.c:qtest_init() | expand |
On 8/4/19 11:13 PM, Oleinik, Alexander wrote: > Both the qtest client, libqtest.c, and server, qtest.c, used the same > name for initialization functions which can cause confusion. > > Signed-off-by: Alexander Oleinik <alxndr@bu.edu> > --- > Thank you, Thomas Huth for the suggestion. Sometimes we use: Suggested-by: Thomas Huth <thuth@redhat.com> to give people credit in a way that our tooling has the ability to track. We don't really rigorously check or enforce such things, though. > > include/sysemu/qtest.h | 2 +- > qtest.c | 3 +-- > vl.c | 2 +- > 3 files changed, 3 insertions(+), 4 deletions(-) > > diff --git a/include/sysemu/qtest.h b/include/sysemu/qtest.h > index cd114b8d80..5ed09c80b1 100644 > --- a/include/sysemu/qtest.h > +++ b/include/sysemu/qtest.h > @@ -24,6 +24,6 @@ static inline bool qtest_enabled(void) > > bool qtest_driver(void); > > -void qtest_init(const char *qtest_chrdev, const char *qtest_log, Error **errp); > +void qtest_server_init(const char *qtest_chrdev, const char *qtest_log, Error **errp); > > #endif > diff --git a/qtest.c b/qtest.c > index 15e27e911f..c9681dbdf3 100644 > --- a/qtest.c > +++ b/qtest.c > @@ -748,8 +748,7 @@ static void qtest_event(void *opaque, int event) > break; > } > } > - > -void qtest_init(const char *qtest_chrdev, const char *qtest_log, Error **errp) > +void qtest_server_init(const char *qtest_chrdev, const char *qtest_log, Error **errp) > { > Chardev *chr; > > diff --git a/vl.c b/vl.c > index b426b32134..130a389712 100644 > --- a/vl.c > +++ b/vl.c > @@ -4197,7 +4197,7 @@ int main(int argc, char **argv, char **envp) > migration_object_init(); > > if (qtest_chrdev) { > - qtest_init(qtest_chrdev, qtest_log, &error_fatal); > + qtest_server_init(qtest_chrdev, qtest_log, &error_fatal); > } > > machine_opts = qemu_get_machine_opts(); > Makes good sense to me, that IS confusing. Reviewed-by: John Snow <jsnow@redhat.com>
On Mon, Aug 05, 2019 at 03:13:01AM +0000, Oleinik, Alexander wrote: > Both the qtest client, libqtest.c, and server, qtest.c, used the same > name for initialization functions which can cause confusion. > > Signed-off-by: Alexander Oleinik <alxndr@bu.edu> > --- > Thank you, Thomas Huth for the suggestion. > > include/sysemu/qtest.h | 2 +- > qtest.c | 3 +-- > vl.c | 2 +- > 3 files changed, 3 insertions(+), 4 deletions(-) Reviewed-by: Stefan Hajnoczi <stefanha@redhat.com>
On 8/5/19 5:13 AM, Oleinik, Alexander wrote: > Both the qtest client, libqtest.c, and server, qtest.c, used the same > name for initialization functions which can cause confusion. > > Signed-off-by: Alexander Oleinik <alxndr@bu.edu> > --- > Thank you, Thomas Huth for the suggestion. Thanks you for the patch, it's now queued in my qtest tree: https://gitlab.com/huth/qemu/commits/qtest-next Thomas
diff --git a/include/sysemu/qtest.h b/include/sysemu/qtest.h index cd114b8d80..5ed09c80b1 100644 --- a/include/sysemu/qtest.h +++ b/include/sysemu/qtest.h @@ -24,6 +24,6 @@ static inline bool qtest_enabled(void) bool qtest_driver(void); -void qtest_init(const char *qtest_chrdev, const char *qtest_log, Error **errp); +void qtest_server_init(const char *qtest_chrdev, const char *qtest_log, Error **errp); #endif diff --git a/qtest.c b/qtest.c index 15e27e911f..c9681dbdf3 100644 --- a/qtest.c +++ b/qtest.c @@ -748,8 +748,7 @@ static void qtest_event(void *opaque, int event) break; } } - -void qtest_init(const char *qtest_chrdev, const char *qtest_log, Error **errp) +void qtest_server_init(const char *qtest_chrdev, const char *qtest_log, Error **errp) { Chardev *chr; diff --git a/vl.c b/vl.c index b426b32134..130a389712 100644 --- a/vl.c +++ b/vl.c @@ -4197,7 +4197,7 @@ int main(int argc, char **argv, char **envp) migration_object_init(); if (qtest_chrdev) { - qtest_init(qtest_chrdev, qtest_log, &error_fatal); + qtest_server_init(qtest_chrdev, qtest_log, &error_fatal); } machine_opts = qemu_get_machine_opts();
Both the qtest client, libqtest.c, and server, qtest.c, used the same name for initialization functions which can cause confusion. Signed-off-by: Alexander Oleinik <alxndr@bu.edu> --- Thank you, Thomas Huth for the suggestion. include/sysemu/qtest.h | 2 +- qtest.c | 3 +-- vl.c | 2 +- 3 files changed, 3 insertions(+), 4 deletions(-)