From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:35226) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ZzPOR-0006h3-UP for qemu-devel@nongnu.org; Thu, 19 Nov 2015 08:36:56 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1ZzPOM-0005Vx-0y for qemu-devel@nongnu.org; Thu, 19 Nov 2015 08:36:55 -0500 Received: from mx1.redhat.com ([209.132.183.28]:35793) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ZzPOL-0005Vt-Pl for qemu-devel@nongnu.org; Thu, 19 Nov 2015 08:36:49 -0500 Date: Thu, 19 Nov 2015 15:36:46 +0200 From: "Michael S. Tsirkin" Message-ID: <1447939696-28930-16-git-send-email-mst@redhat.com> References: <1447939696-28930-1-git-send-email-mst@redhat.com> MIME-Version: 1.0 Content-Type: text/plain; charset=iso-8859-1 Content-Disposition: inline In-Reply-To: <1447939696-28930-1-git-send-email-mst@redhat.com> Content-Transfer-Encoding: quoted-printable Subject: [Qemu-devel] [PULL 15/15] exec: silence hugetlbfs warning under qtest List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: Peter Maydell , Paolo Bonzini , =?us-ascii?B?PT9VVEYtOD9xP01hcmMtQW5kcj1DMz1BOT0yMEx1cmVhdT89?= From: Marc-Andr=E9 Lureau 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. Signed-off-by: Marc-Andr=E9 Lureau Reviewed-by: Michael S. Tsirkin Signed-off-by: Michael S. Tsirkin --- exec.c | 5 ++++- vl.c | 28 ++++++++++++++-------------- 2 files changed, 18 insertions(+), 15 deletions(-) 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, Erro= r **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 MST