From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:39917) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Zz9fk-0000kU-Gy for qemu-devel@nongnu.org; Wed, 18 Nov 2015 15:49:45 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1Zz9fh-0007pH-Ac for qemu-devel@nongnu.org; Wed, 18 Nov 2015 15:49:44 -0500 Received: from mx1.redhat.com ([209.132.183.28]:56547) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Zz9fh-0007p8-32 for qemu-devel@nongnu.org; Wed, 18 Nov 2015 15:49:41 -0500 Date: Wed, 18 Nov 2015 22:49:37 +0200 From: "Michael S. Tsirkin" Message-ID: <20151118224821-mutt-send-email-mst@redhat.com> References: <1447694618-17177-3-git-send-email-marcandre.lureau@redhat.com> <1447837378-25222-1-git-send-email-marcandre.lureau@redhat.com> MIME-Version: 1.0 Content-Type: text/plain; charset=iso-8859-1 Content-Disposition: inline In-Reply-To: <1447837378-25222-1-git-send-email-marcandre.lureau@redhat.com> Content-Transfer-Encoding: quoted-printable Subject: Re: [Qemu-devel] [PATCH] exec: silence hugetlbfs warning under qtest List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: marcandre.lureau@redhat.com Cc: Amit Shah , Peter Maydell , qemu-devel@nongnu.org, pbonzini@redhat.com On Wed, Nov 18, 2015 at 10:02:58AM +0100, marcandre.lureau@redhat.com wro= te: > From: Marc-Andr=E9 Lureau >=20 > vhost-user-test prints a warning. A test should not need to run on > hugetlbfs, let's silence the warning under qtest. The > condition can't check on qtest_enabled() since vhost-user-test actually > doesn't use qtest accel. However, qtest_driver() can be used, if > qtest_init() is called early enough. For that reason, move chardev and > qtest initialization early. >=20 > Signed-off-by: Marc-Andr=E9 Lureau Seems ok, and let us bring back the 2.4 test that was dropped in 2.5, but I'd like an ack on this from someone else. Anyone? > --- > exec.c | 5 ++++- > vl.c | 28 ++++++++++++++-------------- > 2 files changed, 18 insertions(+), 15 deletions(-) >=20 > diff --git a/exec.c b/exec.c > index b09f18b..acbd4a2 100644 > --- a/exec.c > +++ b/exec.c > @@ -51,6 +51,7 @@ > #include "qemu/main-loop.h" > #include "translate-all.h" > #include "sysemu/replay.h" > +#include "sysemu/qtest.h" > =20 > #include "exec/memory-internal.h" > #include "exec/ram_addr.h" > @@ -1196,8 +1197,10 @@ static long gethugepagesize(const char *path, Er= ror **errp) > return 0; > } > =20 > - if (fs.f_type !=3D HUGETLBFS_MAGIC) > + if (!qtest_driver() && > + fs.f_type !=3D HUGETLBFS_MAGIC) { > fprintf(stderr, "Warning: path not on HugeTLBFS: %s\n", path); > + } > =20 > return fs.f_bsize; > } > diff --git a/vl.c b/vl.c > index 7d993a5..f9c661a 100644 > --- a/vl.c > +++ b/vl.c > @@ -4288,14 +4288,23 @@ int main(int argc, char **argv, char **envp) > page_size_init(); > socket_init(); > =20 > - if (qemu_opts_foreach(qemu_find_opts("object"), > - object_create, > - object_create_initial, NULL)) { > + if (qemu_opts_foreach(qemu_find_opts("chardev"), > + chardev_init_func, NULL, NULL)) { > exit(1); > } > =20 > - if (qemu_opts_foreach(qemu_find_opts("chardev"), > - chardev_init_func, NULL, NULL)) { > + if (qtest_chrdev) { > + Error *local_err =3D NULL; > + qtest_init(qtest_chrdev, qtest_log, &local_err); > + if (local_err) { > + error_report_err(local_err); > + exit(1); > + } > + } > + > + if (qemu_opts_foreach(qemu_find_opts("object"), > + object_create, > + object_create_initial, NULL)) { > exit(1); > } > =20 > @@ -4325,15 +4334,6 @@ int main(int argc, char **argv, char **envp) > =20 > configure_accelerator(current_machine); > =20 > - if (qtest_chrdev) { > - Error *local_err =3D NULL; > - qtest_init(qtest_chrdev, qtest_log, &local_err); > - if (local_err) { > - error_report_err(local_err); > - exit(1); > - } > - } > - > machine_opts =3D qemu_get_machine_opts(); > kernel_filename =3D qemu_opt_get(machine_opts, "kernel"); > initrd_filename =3D qemu_opt_get(machine_opts, "initrd"); > --=20 > 2.5.0