From nobody Mon Feb 9 17:24:25 2026 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) client-ip=208.118.235.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 208.118.235.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org Return-Path: Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) by mx.zohomail.com with SMTPS id 1499956618046543.048484405767; Thu, 13 Jul 2017 07:36:58 -0700 (PDT) Received: from localhost ([::1]:60415 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1dVfEc-0002ZC-Np for importer@patchew.org; Thu, 13 Jul 2017 10:36:54 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:51092) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1dVf3E-0000l0-Q9 for qemu-devel@nongnu.org; Thu, 13 Jul 2017 10:25:10 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1dVf3B-00026x-53 for qemu-devel@nongnu.org; Thu, 13 Jul 2017 10:25:08 -0400 Received: from mail-wr0-x244.google.com ([2a00:1450:400c:c0c::244]:35830) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1dVf3A-00025m-RJ for qemu-devel@nongnu.org; Thu, 13 Jul 2017 10:25:05 -0400 Received: by mail-wr0-x244.google.com with SMTP id y28so4890920wrd.2 for ; Thu, 13 Jul 2017 07:25:04 -0700 (PDT) Received: from 640k.lan (94-39-191-51.adsl-ull.clienti.tiscali.it. [94.39.191.51]) by smtp.gmail.com with ESMTPSA id k75sm6042448wmh.10.2017.07.13.07.25.01 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 13 Jul 2017 07:25:02 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=BY45jlRFMaWCkykWhkby0mn/Jt2a+Q0CX4HfrHcGxKg=; b=aXsY/a+BqL76F030rE0xYDrlp3xmjTCpXrcJ3damvqlUoNwP7CvJs/SxuGzr12FY3B FSVIFAN3bx5S/9UGBRX50tF1o7LTkiFrFrbzwt/LqMQzLhOuz0VI6chxVPfujN17n2IM ak+7pPeH/sNBCxGdlzfuIiryD4RBQlZKxbNcBr5PNAhDKZOd99iDj2Xzu7cT4yMFuMb5 JrT6HQQkN9YAdiNZaJJyx7Ot418gJ4bc7dbz2Zrs7TzWcqOzAwus1Dvs58zJ+t3zqbsB 4A5ahovk0esDsXNX0V4KINtLCtKw3Rw6Z9mqjVZfYmB8tu9WK+lasnGQAFJwYywZLasY H6/Q== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :in-reply-to:references:mime-version:content-transfer-encoding; bh=BY45jlRFMaWCkykWhkby0mn/Jt2a+Q0CX4HfrHcGxKg=; b=nb2js0cPCzF+n14aNAsjbyNJLfg2EEXjt7fuJDk9KIx8L1JExkYufiAs+W4CixP+Rn uaT17Ufoqex9Ehktk25kteXDDY7CBBLBue0NIG+IxTdsEsCH79PM/4XyQJgcj2GsvV6Q qmgtFaabC/C6d22/TTH3YMmrq2H+tRU8cLu3P7HgQEyHYy7CIwrBO/xQCPCaFxOS/UqG s/HYhp70+a6c9KRoF1VoTnWL6x6v+EcotW6nfs6kJtNbcExAytTZgTkHZmsXpNln+Tf7 Sru2OmA8lbx8Gt4P3XlOqJb7QNLQjfYBP86NNLtmmdBUmHBovS82CjHcryRNZnZnZxUY m/Jg== X-Gm-Message-State: AIVw1111bEY5hOA98ct8EoaYLh31sO2XZ8/JIODxHy5EjGSLhLghpLfO BZLogBYMkYV8KDjvvEg= X-Received: by 10.223.151.67 with SMTP id r61mr1790343wrb.189.1499955903492; Thu, 13 Jul 2017 07:25:03 -0700 (PDT) From: Paolo Bonzini To: qemu-devel@nongnu.org Date: Thu, 13 Jul 2017 16:24:08 +0200 Message-Id: <1499955874-10954-16-git-send-email-pbonzini@redhat.com> X-Mailer: git-send-email 1.8.3.1 In-Reply-To: <1499955874-10954-1-git-send-email-pbonzini@redhat.com> References: <1499955874-10954-1-git-send-email-pbonzini@redhat.com> 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:400c:c0c::244 Subject: [Qemu-devel] [PULL 15/41] test-char: split char_file_test 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: , Cc: Anton Nefedov Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) X-ZohoMail: RDKM_2 RSF_0 Z_629925259 SPT_0 From: Anton Nefedov makes it possible to test the existing chardev-file Signed-off-by: Anton Nefedov Reviewed-by: Marc-Andr=C3=A9 Lureau Message-Id: <1499342940-56739-9-git-send-email-anton.nefedov@virtuozzo.com> Signed-off-by: Paolo Bonzini --- tests/test-char.c | 137 +++++++++++++++++++++++++++++++++-----------------= ---- 1 file changed, 84 insertions(+), 53 deletions(-) diff --git a/tests/test-char.c b/tests/test-char.c index e0bde5e..c654eea 100644 --- a/tests/test-char.c +++ b/tests/test-char.c @@ -503,82 +503,110 @@ static void char_serial_test(void) } #endif =20 -static void char_file_test(void) +#ifndef _WIN32 +static void char_file_fifo_test(void) { + Chardev *chr; + CharBackend be; char *tmp_path =3D g_dir_make_tmp("qemu-test-char.XXXXXX", NULL); + char *fifo =3D g_build_filename(tmp_path, "fifo", NULL); char *out =3D g_build_filename(tmp_path, "out", NULL); - char *contents =3D NULL; - ChardevFile file =3D { .out =3D out }; + ChardevFile file =3D { .in =3D fifo, + .has_in =3D true, + .out =3D out }; ChardevBackend backend =3D { .type =3D CHARDEV_BACKEND_KIND_FILE, .u.file.data =3D &file }; + FeHandler fe =3D { 0, }; + int fd, ret; + + if (mkfifo(fifo, 0600) < 0) { + abort(); + } + + fd =3D open(fifo, O_RDWR); + ret =3D write(fd, "fifo-in", 8); + g_assert_cmpint(ret, =3D=3D, 8); + + chr =3D qemu_chardev_new("label-file", TYPE_CHARDEV_FILE, &backend, + &error_abort); + + qemu_chr_fe_init(&be, chr, &error_abort); + qemu_chr_fe_set_handlers(&be, + fe_can_read, + fe_read, + fe_event, + NULL, + &fe, NULL, true); + + g_assert_cmpint(fe.last_event, !=3D, CHR_EVENT_BREAK); + qmp_chardev_send_break("label-foo", NULL); + g_assert_cmpint(fe.last_event, !=3D, CHR_EVENT_BREAK); + qmp_chardev_send_break("label-file", NULL); + g_assert_cmpint(fe.last_event, =3D=3D, CHR_EVENT_BREAK); + + main_loop(); + + close(fd); + + g_assert_cmpint(fe.read_count, =3D=3D, 8); + g_assert_cmpstr(fe.read_buf, =3D=3D, "fifo-in"); + + qemu_chr_fe_deinit(&be, true); + + g_unlink(fifo); + g_free(fifo); + g_unlink(out); + g_free(out); + g_rmdir(tmp_path); + g_free(tmp_path); +} +#endif + +static void char_file_test_internal(Chardev *ext_chr, const char *filepath) +{ + char *tmp_path =3D g_dir_make_tmp("qemu-test-char.XXXXXX", NULL); + char *out; Chardev *chr; + char *contents =3D NULL; + ChardevFile file =3D {}; + ChardevBackend backend =3D { .type =3D CHARDEV_BACKEND_KIND_FILE, + .u.file.data =3D &file }; gsize length; int ret; =20 - chr =3D qemu_chardev_new(NULL, TYPE_CHARDEV_FILE, &backend, - &error_abort); + if (ext_chr) { + chr =3D ext_chr; + out =3D g_strdup(filepath); + file.out =3D out; + } else { + out =3D g_build_filename(tmp_path, "out", NULL); + file.out =3D out; + chr =3D qemu_chardev_new(NULL, TYPE_CHARDEV_FILE, &backend, + &error_abort); + } ret =3D qemu_chr_write_all(chr, (uint8_t *)"hello!", 6); g_assert_cmpint(ret, =3D=3D, 6); - object_unref(OBJECT(chr)); =20 ret =3D g_file_get_contents(out, &contents, &length, NULL); g_assert(ret =3D=3D TRUE); g_assert_cmpint(length, =3D=3D, 6); g_assert(strncmp(contents, "hello!", 6) =3D=3D 0); - g_free(contents); - -#ifndef _WIN32 - { - CharBackend be; - FeHandler fe =3D { 0, }; - char *fifo =3D g_build_filename(tmp_path, "fifo", NULL); - int fd; - - if (mkfifo(fifo, 0600) < 0) { - abort(); - } - - fd =3D open(fifo, O_RDWR); - ret =3D write(fd, "fifo-in", 8); - g_assert_cmpint(ret, =3D=3D, 8); - - file.in =3D fifo; - file.has_in =3D true; - chr =3D qemu_chardev_new("label-file", TYPE_CHARDEV_FILE, &backend, - &error_abort); =20 - qemu_chr_fe_init(&be, chr, &error_abort); - qemu_chr_fe_set_handlers(&be, - fe_can_read, - fe_read, - fe_event, - NULL, - &fe, NULL, true); - - g_assert_cmpint(fe.last_event, !=3D, CHR_EVENT_BREAK); - qmp_chardev_send_break("label-foo", NULL); - g_assert_cmpint(fe.last_event, !=3D, CHR_EVENT_BREAK); - qmp_chardev_send_break("label-file", NULL); - g_assert_cmpint(fe.last_event, =3D=3D, CHR_EVENT_BREAK); - - main_loop(); - - close(fd); - - g_assert_cmpint(fe.read_count, =3D=3D, 8); - g_assert_cmpstr(fe.read_buf, =3D=3D, "fifo-in"); - qemu_chr_fe_deinit(&be, true); - g_unlink(fifo); - g_free(fifo); + if (!ext_chr) { + object_unref(OBJECT(chr)); + g_unlink(out); } -#endif - - g_unlink(out); + g_free(contents); g_rmdir(tmp_path); g_free(tmp_path); g_free(out); } =20 +static void char_file_test(void) +{ + char_file_test_internal(NULL, NULL); +} + static void char_null_test(void) { Error *err =3D NULL; @@ -656,6 +684,9 @@ int main(int argc, char **argv) g_test_add_func("/char/pipe", char_pipe_test); #endif g_test_add_func("/char/file", char_file_test); +#ifndef _WIN32 + g_test_add_func("/char/file-fifo", char_file_fifo_test); +#endif g_test_add_func("/char/socket", char_socket_test); g_test_add_func("/char/udp", char_udp_test); #ifdef HAVE_CHARDEV_SERIAL --=20 1.8.3.1