From nobody Tue Feb 10 20:47:56 2026 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1686052717; cv=none; d=zohomail.com; s=zohoarc; b=kAuhKakhZTkI8ZFWu8/QKwcu6AkuQKhQErkQabFyJnIoKPyEZofUTSLpV30DNSp5Qfzk5L55/mFRjCHsHWXeH+KcaEvhulB0RuX8BwtOsk6K9BWv1Gw+vbqZPlLnefvb8+48xPpjZWqRhWUkKvI31zmI470CYRtOnlL5RRE2Pjo= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1686052717; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=olXXcNEMpsNdrsqQkr9/lnRuGqSmIi02ExgM3Rm7Dfo=; b=nlkZgTg7jrQvjQGLT4z4dnxVYfftCgFIiznMtqhT1Ur9K2MYhoSOdGlhpevFDtDVm5xTjR24Fnbe1IobQpqur4GuchpQ0sRG7qTnA3lsC50AHLHEGKZp0X7/1RdBMOvSZCEP1fhBipP5xIr3qMZ4u1Jdn0rqOgg3Gioc4gaiIIQ= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass header.from= (p=none dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1686052717443116.58862313225961; Tue, 6 Jun 2023 04:58:37 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1q6VJz-0000Jd-0S; Tue, 06 Jun 2023 07:57:55 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1q6VJx-0000J6-GR for qemu-devel@nongnu.org; Tue, 06 Jun 2023 07:57:53 -0400 Received: from us-smtp-delivery-124.mimecast.com ([170.10.133.124]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1q6VJu-0005s8-Is for qemu-devel@nongnu.org; Tue, 06 Jun 2023 07:57:53 -0400 Received: from mimecast-mx02.redhat.com (mx3-rdu2.redhat.com [66.187.233.73]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-14-37c56l9XNjSazgRvFNu9pQ-1; Tue, 06 Jun 2023 07:57:48 -0400 Received: from smtp.corp.redhat.com (int-mx05.intmail.prod.int.rdu2.redhat.com [10.11.54.5]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id 59485384CC47 for ; Tue, 6 Jun 2023 11:57:48 +0000 (UTC) Received: from localhost (unknown [10.39.208.7]) by smtp.corp.redhat.com (Postfix) with ESMTP id 1A0127AE4; Tue, 6 Jun 2023 11:57:29 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1686052670; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=olXXcNEMpsNdrsqQkr9/lnRuGqSmIi02ExgM3Rm7Dfo=; b=FOxXRvBCCY5W8hF1vOCneJzXvFCzdDR1v3vDAlWF/Sy8UklUTjNdS8GDEHImJRRHCaI5+z UCV/YSYvmsKSXUpagpUVD/VNtF/tkFy5+Hi4DveUaNzdElkvjOe8FmA4CFpz/YkQfmGzYf gk9ribJhWkApIO4zyvcNhFPeV6yl65c= X-MC-Unique: 37c56l9XNjSazgRvFNu9pQ-1 From: marcandre.lureau@redhat.com To: qemu-devel@nongnu.org Cc: Gerd Hoffmann , =?UTF-8?q?Marc-Andr=C3=A9=20Lureau?= , Thomas Huth , Laurent Vivier , Paolo Bonzini Subject: [PATCH 07/21] tests: make dbus-display-test work on win32 Date: Tue, 6 Jun 2023 15:56:44 +0400 Message-Id: <20230606115658.677673-8-marcandre.lureau@redhat.com> In-Reply-To: <20230606115658.677673-1-marcandre.lureau@redhat.com> References: <20230606115658.677673-1-marcandre.lureau@redhat.com> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-Scanned-By: MIMEDefang 3.1 on 10.11.54.5 Received-SPF: pass (zohomail.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; Received-SPF: pass client-ip=170.10.133.124; envelope-from=marcandre.lureau@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.001, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001, T_SCC_BODY_TEXT_LINE=-0.01 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 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-bounces+importer=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @redhat.com) X-ZM-MESSAGEID: 1686052717648100005 From: Marc-Andr=C3=A9 Lureau Signed-off-by: Marc-Andr=C3=A9 Lureau Acked-by: Thomas Huth --- tests/qtest/dbus-display-test.c | 43 ++++++++++++++++++++++++++++++--- tests/qtest/meson.build | 2 +- 2 files changed, 41 insertions(+), 4 deletions(-) diff --git a/tests/qtest/dbus-display-test.c b/tests/qtest/dbus-display-tes= t.c index fef025ac6f..21edaa1e32 100644 --- a/tests/qtest/dbus-display-test.c +++ b/tests/qtest/dbus-display-test.c @@ -1,4 +1,5 @@ #include "qemu/osdep.h" +#include "qemu/sockets.h" #include "qemu/dbus.h" #include "qemu/sockets.h" #include @@ -14,7 +15,11 @@ test_dbus_p2p_from_fd(int fd) g_autoptr(GSocketConnection) socketc =3D NULL; GDBusConnection *conn; =20 +#ifdef WIN32 + socket =3D g_socket_new_from_fd(_get_osfhandle(fd), &err); +#else socket =3D g_socket_new_from_fd(fd, &err); +#endif g_assert_no_error(err); =20 socketc =3D g_socket_connection_factory_create_connection(socket); @@ -126,7 +131,10 @@ test_dbus_console_registered(GObject *source_object, =20 qemu_dbus_display1_console_call_register_listener_finish( QEMU_DBUS_DISPLAY1_CONSOLE(source_object), - NULL, res, &err); +#ifndef WIN32 + NULL, +#endif + res, &err); g_assert_no_error(err); =20 test->listener_conn =3D g_thread_join(test->thread); @@ -145,17 +153,25 @@ test_dbus_display_console(void) g_autoptr(GError) err =3D NULL; g_autoptr(GDBusConnection) conn =3D NULL; g_autoptr(QemuDBusDisplay1ConsoleProxy) console =3D NULL; - g_autoptr(GUnixFDList) fd_list =3D NULL; g_autoptr(GMainLoop) loop =3D NULL; QTestState *qts =3D NULL; - int pair[2], idx; + int pair[2]; TestDBusConsoleRegister test; +#ifdef WIN32 + WSAPROTOCOL_INFOW info; + g_autoptr(GVariant) listener =3D NULL; +#else + g_autoptr(GUnixFDList) fd_list =3D NULL; + int idx; +#endif =20 test_setup(&qts, &conn); =20 g_assert_cmpint(qemu_socketpair(AF_UNIX, SOCK_STREAM, 0, pair), =3D=3D= , 0); +#ifndef WIN32 fd_list =3D g_unix_fd_list_new(); idx =3D g_unix_fd_list_append(fd_list, pair[1], NULL); +#endif =20 console =3D QEMU_DBUS_DISPLAY1_CONSOLE_PROXY( qemu_dbus_display1_console_proxy_new_sync( @@ -171,12 +187,33 @@ test_dbus_display_console(void) test.thread =3D g_thread_new(NULL, test_dbus_p2p_server_setup_thread, GINT_TO_POINTER(pair[0])); =20 +#ifdef WIN32 + if (WSADuplicateSocketW(_get_osfhandle(pair[1]), + GetProcessId((HANDLE) qtest_pid(qts)), + &info) =3D=3D SOCKET_ERROR) + { + g_autofree char *emsg =3D g_win32_error_message(WSAGetLastError()); + g_error("WSADuplicateSocket failed: %s", emsg); + } + close(pair[1]); + listener =3D g_variant_new_fixed_array(G_VARIANT_TYPE_BYTE, + &info, + sizeof(info), + 1); +#endif + qemu_dbus_display1_console_call_register_listener( QEMU_DBUS_DISPLAY1_CONSOLE(console), +#ifdef WIN32 + listener, +#else g_variant_new_handle(idx), +#endif G_DBUS_CALL_FLAGS_NONE, -1, +#ifndef WIN32 fd_list, +#endif NULL, test_dbus_console_registered, &test); diff --git a/tests/qtest/meson.build b/tests/qtest/meson.build index 087f2dc9d7..bbbcd47e6c 100644 --- a/tests/qtest/meson.build +++ b/tests/qtest/meson.build @@ -103,7 +103,7 @@ qtests_i386 =3D \ 'numa-test' ] =20 -if dbus_display and targetos !=3D 'windows' +if dbus_display qtests_i386 +=3D ['dbus-display-test'] endif =20 --=20 2.40.1