From patchwork Wed Jan 23 12:07:57 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: "Zhijian Li (Fujitsu)\" via" X-Patchwork-Id: 10777151 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id C8988746 for ; Wed, 23 Jan 2019 12:14:10 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id B0E6C2BF2B for ; Wed, 23 Jan 2019 12:14:10 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id A51E12BF1A; Wed, 23 Jan 2019 12:14:10 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-2.7 required=2.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,MAILING_LIST_MULTI autolearn=ham version=3.3.1 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id 8096F2BEFD for ; Wed, 23 Jan 2019 12:14:09 +0000 (UTC) Received: from localhost ([127.0.0.1]:33342 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gmHPz-0003on-VX for patchwork-qemu-devel@patchwork.kernel.org; Wed, 23 Jan 2019 07:14:08 -0500 Received: from eggs.gnu.org ([209.51.188.92]:38553) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gmHOR-0002UZ-PP for qemu-devel@nongnu.org; Wed, 23 Jan 2019 07:12:32 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1gmHKg-0007BB-2Y for qemu-devel@nongnu.org; Wed, 23 Jan 2019 07:08:39 -0500 Received: from smtp56.i.mail.ru ([217.69.128.36]:38036) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1gmHKf-00074c-Pr for qemu-devel@nongnu.org; Wed, 23 Jan 2019 07:08:37 -0500 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=mail.ru; s=mail2; h=References:In-Reply-To:Message-Id:Date:Subject:Cc:To:From; bh=5cwIC3QlsSt8YunUehNrJRU7VDOOU9dlcpHAvJgNTs0=; b=u5vt26EJW3014PIBigNi9Lj3CEvwqSEHSHy7g1OV0aohPj4xfhzYTNDwW3T1GNBhqHHKOYu8cFzYdFWvB4Hl8pir+xpOiHL7osZin4bR+pvxySUUb+baWelKGhX1Y42yIahJ4/ZzjJ8xQHZ6pJmZjkpy96GDmHxycf73LN2Fe9U=; Received: by smtp56.i.mail.ru with esmtpa (envelope-from ) id 1gmHKL-0003WT-2s; Wed, 23 Jan 2019 15:08:17 +0300 To: qemu-devel@nongnu.org Date: Wed, 23 Jan 2019 15:07:57 +0300 Message-Id: <20190123120759.7162-2-jusual@mail.ru> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20190123120759.7162-1-jusual@mail.ru> References: <20190123120759.7162-1-jusual@mail.ru> Authentication-Results: smtp56.i.mail.ru; auth=pass smtp.auth=jusual@mail.ru smtp.mailfrom=jusual@mail.ru X-77F55803: 257C4F86AB09C89C5A78504BD2AC2941988784FC6C4AE31FD1AC456597854A5D4FD8180628FFAC00C5A562B592A88AAE632A6FEBC0D23EEC X-7FA49CB5: 0D63561A33F958A5B0FDB41E7D3F0CF3A6CDEC89DAF0D716CE7BAE2148EA70B38941B15DA834481FA18204E546F3947CEDCF5861DED71B2F389733CBF5DBD5E9C8A9BA7A39EFB7666BA297DBC24807EA117882F44604297287769387670735209ECD01F8117BC8BEA471835C12D1D977C4224003CC8364767815B9869FA544D8D32BA5DBAC0009BE9E8FC8737B5C2249B1BF8B3EEAB4192B3AA81AA40904B5D9CF19DD082D7633A0E7DDDDC251EA7DABD81D268191BDAD3D78DA827A17800CE74A4E7D6706BFD61ECD04E86FAF290E2D40A5AABA2AD3711975ECD9A6C639B01B78DA827A17800CE7B1AEE7E0193F113CD623B8EECA14F8ED75ECD9A6C639B01B4E70A05D1297E1BBC6867C52282FAC8518D57E64F6AADFC527F269C8F02392CD5571747095F342E88FB05168BE4CE3AF X-Mailru-Sender: 3BB5BBD9428867232EC7569405B9EAD3B25844DD6B548CE54FD8180628FFAC0015634F2D3208598D7C4160E8B47E48163DDE9B364B0DF2898CB68AF7A628805D594FB4C9F0DBF412AE208404248635DF X-Mras: OK X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 217.69.128.36 Subject: [Qemu-devel] [PATCH v5 1/3] tests/libqtest: Introduce qtest_init_with_serial() X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-Patchwork-Original-From: Julia Suvorova via Qemu-devel From: "Zhijian Li (Fujitsu)\" via" Reply-To: Julia Suvorova Cc: Peter Maydell , Thomas Huth , Julia Suvorova , =?utf-8?q?Steffen_G=C3=B6rtz?= , Jim Mussared , Joel Stanley , Stefan Hajnoczi , Paolo Bonzini , =?utf-8?q?Alex_Benn=C3=A9e?= Errors-To: qemu-devel-bounces+patchwork-qemu-devel=patchwork.kernel.org@nongnu.org Sender: "Qemu-devel" X-Virus-Scanned: ClamAV using ClamSMTP Run qtest with a socket that connects QEMU chardev and test code. Signed-off-by: Julia Suvorova Reviewed-by: Stefan Hajnoczi Reviewed-by: Thomas Huth Reviewed-by: Alex Bennée --- tests/libqtest.c | 25 +++++++++++++++++++++++++ tests/libqtest.h | 11 +++++++++++ 2 files changed, 36 insertions(+) diff --git a/tests/libqtest.c b/tests/libqtest.c index 55750dd68d..6fb30855fa 100644 --- a/tests/libqtest.c +++ b/tests/libqtest.c @@ -315,6 +315,31 @@ QTestState *qtest_initf(const char *fmt, ...) return s; } +QTestState *qtest_init_with_serial(const char *extra_args, int *sock_fd) +{ + int sock_fd_init; + char *sock_path, sock_dir[] = "/tmp/qtest-serial-XXXXXX"; + QTestState *qts; + + g_assert_true(mkdtemp(sock_dir) != NULL); + sock_path = g_strdup_printf("%s/sock", sock_dir); + + sock_fd_init = init_socket(sock_path); + + qts = qtest_initf("-chardev socket,id=s0,path=%s -serial chardev:s0 %s", + sock_path, extra_args); + + *sock_fd = socket_accept(sock_fd_init); + + unlink(sock_path); + g_free(sock_path); + rmdir(sock_dir); + + g_assert_true(*sock_fd >= 0); + + return qts; +} + void qtest_quit(QTestState *s) { g_hook_destroy_link(&abrt_hooks, g_hook_find_data(&abrt_hooks, TRUE, s)); diff --git a/tests/libqtest.h b/tests/libqtest.h index 7ea94139b0..5937f91912 100644 --- a/tests/libqtest.h +++ b/tests/libqtest.h @@ -62,6 +62,17 @@ QTestState *qtest_init(const char *extra_args); */ QTestState *qtest_init_without_qmp_handshake(const char *extra_args); +/** + * qtest_init_with_serial: + * @extra_args: other arguments to pass to QEMU. CAUTION: these + * arguments are subject to word splitting and shell evaluation. + * @sock_fd: pointer to store the socket file descriptor for + * connection with serial. + * + * Returns: #QTestState instance. + */ +QTestState *qtest_init_with_serial(const char *extra_args, int *sock_fd); + /** * qtest_quit: * @s: #QTestState instance to operate on.