From nobody Sun Feb 8 17:21:37 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 1540996384030658.9245619340071; Wed, 31 Oct 2018 07:33:04 -0700 (PDT) Received: from localhost ([::1]:59936 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gHrYM-0004ef-R1 for importer@patchew.org; Wed, 31 Oct 2018 10:33:02 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:33588) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gHrMr-00015d-R6 for qemu-devel@nongnu.org; Wed, 31 Oct 2018 10:21:10 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1gHrMn-0007KV-FW for qemu-devel@nongnu.org; Wed, 31 Oct 2018 10:21:09 -0400 Received: from mail-oi1-x243.google.com ([2607:f8b0:4864:20::243]:34529) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1gHrMm-0007Et-6Y for qemu-devel@nongnu.org; Wed, 31 Oct 2018 10:21:04 -0400 Received: by mail-oi1-x243.google.com with SMTP id f21-v6so10586605oig.1 for ; Wed, 31 Oct 2018 07:20:55 -0700 (PDT) Received: from localhost (76-251-165-188.lightspeed.austtx.sbcglobal.net. [76.251.165.188]) by smtp.gmail.com with ESMTPSA id g9sm2829478otj.13.2018.10.31.07.20.52 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Wed, 31 Oct 2018 07:20:52 -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; bh=b60sY/Qw6hLNM3jT0LJpKmQaEbzVAgZEFb44f/LeZZA=; b=LCqg9TtpYEWEwSGoQ5XqwKE2YUIIttTnJxD/IURnpCEj/CjrUIRrHxdJPoLIBD3F/c CU00M2MTLobyuG8lDco0uDgnMlXKOcIevVhQp9NjykwPn33qq2z8k/JFkoTbKqefiRxX IZMZy8l+Q1OWsH+2w1yOpxIz9/pQhAAAchj/5nAkIjvk4+d2jzID/Dta7HYcI/IZGhLu 3bJe7yirEqyhRQZ7YWcVNtiwAuswA1azlrrf7ERUm3nqopHyqRKGanI43zAJV/RGTju2 gXttNiPkzm6pj8hI4mKyXbayCf3Il/2RbU/rRNYrqcoBYF4zHGnZaqYxGVvyTnmVUSvn U7bQ== 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; bh=b60sY/Qw6hLNM3jT0LJpKmQaEbzVAgZEFb44f/LeZZA=; b=qg3uOtTlGWN/g+aKkya4ddrlYT0iwlUm/SV8o/I7KeKFSyEvbeahQ4sE4jprOwNin2 ZS0V7+9c5YGq6NZF1YkFFonxs0IFzwNMXey1Bdimae1VcLz214faJhpcRwUnxH9cLO8m 3M/PVE32hvsQXn+S6ivl7jRzlX/p35PNLAdSBicIuTcsI4RCi1nl8PFCWQnJvaSkTeYo lxeKkthHczEXAG47sBlN1KAiDcACXacaE5k7l+VX/Qb7gSnniV2XzfNpAZWJDCwirPhP dm7l8BTsfmVzyGmVnYf+Qfg4FRF7Pmv6qAYR/PhCQmvhfWmD6XqaF11Fh0Xjc94hsPqP JIWw== X-Gm-Message-State: AGRZ1gIL/Itn0VrkrxmsgBacyyYXSYiijLa70l9YqaJAEWT+8jApBx4t tDdJatKP/GwGt/Ewsa3jGwBuuD15 X-Google-Smtp-Source: AJdET5fbFDzKz+sjgCgr6sloUHmbi6ezTUWad+c/ykaFRUYEqnKzV3aMMuAcEECQfGsv4ABHDQ5/Bw== X-Received: by 2002:aca:d0d5:: with SMTP id j82-v6mr1981360oiy.170.1540995653776; Wed, 31 Oct 2018 07:20:53 -0700 (PDT) From: Michael Roth To: qemu-devel@nongnu.org Date: Wed, 31 Oct 2018 09:19:02 -0500 Message-Id: <20181031141925.30026-2-mdroth@linux.vnet.ibm.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20181031141925.30026-1-mdroth@linux.vnet.ibm.com> References: <20181031141925.30026-1-mdroth@linux.vnet.ibm.com> X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2607:f8b0:4864:20::243 Subject: [Qemu-devel] [PULL v3 01/24] qga: Support Unicode paths in guest-file-open on win32 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: Jonathon Reinhart , peter.maydell@linaro.org Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" From: Jonathon Reinhart Currently, the win32 port of QEMU Guest Agent does not properly handle Unic= ode paths. The JSON decoder produces a valid UTF-8 path string, but this is pas= sed directly to CreateFileA, which is expecting an ANSI string and not UTF-8. T= his leads to mangled filenames. This patch follows the example of qmp_guest_set_user_password() and uses g_utf8_to_utf16() to convert the string to UTF-16 and calls CreateFileW() explicitly. Signed-off-by: Jonathon Reinhart Signed-off-by: Michael Roth --- qga/commands-win32.c | 24 +++++++++++++++++++----- 1 file changed, 19 insertions(+), 5 deletions(-) diff --git a/qga/commands-win32.c b/qga/commands-win32.c index 98d9735389..416343b97b 100644 --- a/qga/commands-win32.c +++ b/qga/commands-win32.c @@ -160,13 +160,15 @@ static void handle_set_nonblocking(HANDLE fh) int64_t qmp_guest_file_open(const char *path, bool has_mode, const char *mode, Error **errp) { - int64_t fd; + int64_t fd =3D -1; HANDLE fh; HANDLE templ_file =3D NULL; DWORD share_mode =3D FILE_SHARE_READ; DWORD flags_and_attr =3D FILE_ATTRIBUTE_NORMAL; LPSECURITY_ATTRIBUTES sa_attr =3D NULL; OpenFlags *guest_flags; + GError *gerr =3D NULL; + wchar_t *w_path =3D NULL; =20 if (!has_mode) { mode =3D "r"; @@ -175,16 +177,21 @@ int64_t qmp_guest_file_open(const char *path, bool ha= s_mode, guest_flags =3D find_open_flag(mode); if (guest_flags =3D=3D NULL) { error_setg(errp, "invalid file open mode"); - return -1; + goto done; + } + + w_path =3D g_utf8_to_utf16(path, -1, NULL, NULL, &gerr); + if (!w_path) { + goto done; } =20 - fh =3D CreateFile(path, guest_flags->desired_access, share_mode, sa_at= tr, + fh =3D CreateFileW(w_path, guest_flags->desired_access, share_mode, sa= _attr, guest_flags->creation_disposition, flags_and_attr, templ_file); if (fh =3D=3D INVALID_HANDLE_VALUE) { error_setg_win32(errp, GetLastError(), "failed to open file '%s'", path); - return -1; + goto done; } =20 /* set fd non-blocking to avoid common use cases (like reading from a @@ -196,10 +203,17 @@ int64_t qmp_guest_file_open(const char *path, bool ha= s_mode, if (fd < 0) { CloseHandle(fh); error_setg(errp, "failed to add handle to qmp handle table"); - return -1; + goto done; } =20 slog("guest-file-open, handle: % " PRId64, fd); + +done: + if (gerr) { + error_setg(errp, QERR_QGA_COMMAND_FAILED, gerr->message); + g_error_free(gerr); + } + g_free(w_path); return fd; } =20 --=20 2.17.1