From nobody Sat Sep 28 22:41:17 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zoho.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=linaro.org Return-Path: Received: from lists.gnu.org (209.51.188.17 [209.51.188.17]) by mx.zohomail.com with SMTPS id 1548701097298127.48578434235219; Mon, 28 Jan 2019 10:44:57 -0800 (PST) Received: from localhost ([127.0.0.1]:36867 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1goBtr-0005QA-BT for importer@patchew.org; Mon, 28 Jan 2019 13:44:51 -0500 Received: from eggs.gnu.org ([209.51.188.92]:41093) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1goBNU-00031J-Dh for qemu-devel@nongnu.org; Mon, 28 Jan 2019 13:11:25 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1goBNQ-0000Pt-5m for qemu-devel@nongnu.org; Mon, 28 Jan 2019 13:11:23 -0500 Received: from mail-wr1-x42b.google.com ([2a00:1450:4864:20::42b]:39023) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1goBNJ-00007A-9N for qemu-devel@nongnu.org; Mon, 28 Jan 2019 13:11:15 -0500 Received: by mail-wr1-x42b.google.com with SMTP id t27so19148662wra.6 for ; Mon, 28 Jan 2019 10:11:07 -0800 (PST) Received: from orth.archaic.org.uk (orth.archaic.org.uk. [81.2.115.148]) by smtp.gmail.com with ESMTPSA id b18sm97910681wrw.83.2019.01.28.10.11.05 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 28 Jan 2019 10:11:05 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:subject:date:message-id:in-reply-to:references:mime-version :content-transfer-encoding; bh=aQjll81H3OlPviwbtYP9VWPnH/Zh0TuRsXiE7aLYYwQ=; b=SIJHfOXbS7o8P0g2kwmzOUoNi2sBYaxZfxM00wkpz+Iq+NVAtma284GPi4UY5AyPlr AmFkJcDU5U6nMQSVl6JXLhvfBwIzk5ge8WE537hWUkILILe8V0S5N3igHMqjLp4dLV4c OctidEJJe/BsyvkeannqJumCIifTdygSx+glo= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=aQjll81H3OlPviwbtYP9VWPnH/Zh0TuRsXiE7aLYYwQ=; b=IqxXuUDXTu5Vtpcj94UmjHDAvnKU8+G2TMybgq3iUceI5Xj7CUorFWIPsLyRo2eMaI QoaKzkrGQbBC6zO1xCzQC0fcm7ChM//KGfbYDFs6r4b5e7YqVGDHjyMULXad9wPoweBi TXtWNqWTnQ8hlzYMB1++LrojQK5A/MHl4GeG00cdZs8Vt/vE8WJovyFImyi4DqupvFqB EpLp7VBP7FyaFGwpudkRipDYEzCTjMb8TgPNhbSt1XCB8bzSdQuDvyuLv1dAlcTzRDT5 DgQMa+6LlgKm7pWdSd8JzmSuKqaX0jTpAMA5EqTfm2lW3ENkw/RFgPPbF2MiiOsocOnk 0OQw== X-Gm-Message-State: AJcUukfZuZzak2E/4ZjUIc/rzchhO2reyWaz+0EaqnMlsUH5SFgncGGM s5S6sc6r9CRQ/PXrMN+jkAtPnhe65tvrBg== X-Google-Smtp-Source: ALg8bN68rKCB2ss0635V6tUYynvFR2Tvxl3joR2LDkWRxtXEJpZAug3Wn0MtT1ZSKoknRAxXwEfxMw== X-Received: by 2002:adf:90e5:: with SMTP id i92mr21805217wri.210.1548699066599; Mon, 28 Jan 2019 10:11:06 -0800 (PST) From: Peter Maydell To: qemu-devel@nongnu.org Date: Mon, 28 Jan 2019 18:10:34 +0000 Message-Id: <20190128181047.20781-14-peter.maydell@linaro.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20190128181047.20781-1-peter.maydell@linaro.org> References: <20190128181047.20781-1-peter.maydell@linaro.org> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2a00:1450:4864:20::42b Subject: [Qemu-devel] [PULL 13/26] 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: , Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) From: Julia Suvorova 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=C3=A9e Message-id: 20190123120759.7162-2-jusual@mail.ru Signed-off-by: Peter Maydell --- tests/libqtest.h | 11 +++++++++++ tests/libqtest.c | 25 +++++++++++++++++++++++++ 2 files changed, 36 insertions(+) diff --git a/tests/libqtest.h b/tests/libqtest.h index 7ea94139b0c..5937f919123 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); =20 +/** + * 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. diff --git a/tests/libqtest.c b/tests/libqtest.c index 55750dd68de..6fb30855faf 100644 --- a/tests/libqtest.c +++ b/tests/libqtest.c @@ -315,6 +315,31 @@ QTestState *qtest_initf(const char *fmt, ...) return s; } =20 +QTestState *qtest_init_with_serial(const char *extra_args, int *sock_fd) +{ + int sock_fd_init; + char *sock_path, sock_dir[] =3D "/tmp/qtest-serial-XXXXXX"; + QTestState *qts; + + g_assert_true(mkdtemp(sock_dir) !=3D NULL); + sock_path =3D g_strdup_printf("%s/sock", sock_dir); + + sock_fd_init =3D init_socket(sock_path); + + qts =3D qtest_initf("-chardev socket,id=3Ds0,path=3D%s -serial chardev= :s0 %s", + sock_path, extra_args); + + *sock_fd =3D socket_accept(sock_fd_init); + + unlink(sock_path); + g_free(sock_path); + rmdir(sock_dir); + + g_assert_true(*sock_fd >=3D 0); + + return qts; +} + void qtest_quit(QTestState *s) { g_hook_destroy_link(&abrt_hooks, g_hook_find_data(&abrt_hooks, TRUE, s= )); --=20 2.20.1