From nobody Mon Feb 9 03:13:03 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=gmail.com ARC-Seal: i=1; a=rsa-sha256; t=1766048150; cv=none; d=zohomail.com; s=zohoarc; b=Fh6yIh0/EjOa1DjmQ0AzRGmcNdkPyTa0uebX9C120Oz/AiDENd4x6qnJddXGKX1DRc9325gJT29voBRB9RwnLoTelas+peF0mw8bA1zhJ06FBnGuaj5RY6QCxsOfD0VOE46JhNOj8OvRc/9MsWOZMdq9M/rX73J10qPeIBEbwWk= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1766048150; h=Content-Transfer-Encoding:Cc:Cc:Date:Date:From:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:Subject:To:To:Message-Id:Reply-To; bh=IbCZM5/yo0/xTboRWK9DLsnxsWBmAYOPq/HX6Y7FFcM=; b=WuRWTstTjuWwEzPuLMlnZpYK4A40iB/OtKvbRPLTAZkkm20M/LRzWfkRjbeE5Rtn2uLGLbydWC0uA7ppshmqwqCCC8W4tWuZQvuNWqp1hJnLE6VfUg6Cxomm1KV5rkX11wu3cxLgjlkzifdSSgg+EUrsTgS2LfWvWOwBHnLUOXY= 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 1766048150848969.5111203382414; Thu, 18 Dec 2025 00:55:50 -0800 (PST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1vW9nF-0003q5-B6; Thu, 18 Dec 2025 03:55:29 -0500 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 1vW9n9-0003no-TT for qemu-devel@nongnu.org; Thu, 18 Dec 2025 03:55:23 -0500 Received: from mail-pf1-x433.google.com ([2607:f8b0:4864:20::433]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1vW9n8-0004vX-4q for qemu-devel@nongnu.org; Thu, 18 Dec 2025 03:55:23 -0500 Received: by mail-pf1-x433.google.com with SMTP id d2e1a72fcca58-7b9c17dd591so362613b3a.3 for ; Thu, 18 Dec 2025 00:55:21 -0800 (PST) Received: from localhost.localdomain ([116.86.160.247]) by smtp.googlemail.com with ESMTPSA id d2e1a72fcca58-7fe12128ea4sm1926218b3a.27.2025.12.18.00.55.17 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 18 Dec 2025 00:55:20 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1766048120; x=1766652920; darn=nongnu.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=IbCZM5/yo0/xTboRWK9DLsnxsWBmAYOPq/HX6Y7FFcM=; b=ELdYtPII6TngSJcVuu44eZfT7LS7GononvMqtku/kJK9JW7hqpghM4eWW3JLR2Kzud DrWViMjAzieXftTNDr3e9QgZVnruD1MOoVPw31allONWDt2mIRUfTkyfQgxFAsYL0PYh 4fLJ5IyP2me0Qho8m1fKoiQ322rsn3y3FnSz2sZ8uyrPxHJN+1ZjL4nMMQdiZoFPdR0/ xV56Reft79nn0BExNyF/YI3mx0guD+p4ojMt3sRjDqkX7MrueUsR1Tgb+sFYMCbEI96u BJkkPu38Nl215Nc5XztLPQ1KXeMG+f5N/cgzkCBe4Ze4h+Q22c27BY0wWDPwTwEYPKNM alJA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1766048120; x=1766652920; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-gg:x-gm-message-state:from :to:cc:subject:date:message-id:reply-to; bh=IbCZM5/yo0/xTboRWK9DLsnxsWBmAYOPq/HX6Y7FFcM=; b=OD+9EeVJapM6VUkbEpDUPpBvcYRLNRaP1VB/fGmPDIoE0lt4tq2IkCqJX3EslSUaee HePYG0OgYG5GJlzS5LvtWekDvP+22CnRTxkvIoBFPLBQHInAR7gtIiwNuZdcSKO0ArZv fSCguq8N/lGjUj6Ia/cm4JNEpayBwr7wY/edNfkIsXVsKSzZ8oq4Y8S/shNhF90fMq6A PHQe4ZopEQxMUh58hfGUJ+wcz8RLK1o8g+YrACPPZhWnIX2qBOJ2TyF4zgdZRYURd3he J5mCuK1tWqVdXTdVgURQH4hI+RnCNgXQzp1nb3aVXyMPLlr+qhgJ6xU0sastYYWGH31a cidQ== X-Forwarded-Encrypted: i=1; AJvYcCX8tXgKR0gJtLYTgW9nVTvO2OPORtyOpLNygKFvPQCwFQ6+W0ApRrbTbaDkN82cDSj6c3cTEIJs1+qd@nongnu.org X-Gm-Message-State: AOJu0YxekBPW2xqHj9VjumSqP6OhPXHoucacat+HMQVKplGAPq+M5aRv GYCGQpO3D9dFVxBaFjhd7SNEOeMKA5wD/W5Ai4T67TcdMQ3M9aWfoX/P+UDCKQ== X-Gm-Gg: AY/fxX7yUULw2N/wWwTKhJY+GgAMupnpatW8SdO1bz5QHnBNrVkV+HRwIqPvBaw/lS2 Zjuqm0SXpdO+g0rNzgdSpen9h2RBPNDee5w0EH2uuCZe0GD0yKW7l/KPcIXi+u+bfXuEXty/OBl hr69hENUl0F7Y/nwu/HUSveFDAuxVmw8sglTNWM/4pTGyo9sd7oFQbFqiymhjsAxysBRV7YgiR5 kV4xs2VQvYCJpJrgvfoDMrcZihFvL2LCjDcMeehHDspIIR8nD6G+MG0K6Gc1wONPJDU6AOlF+yj ClpGR+OqB2WezioOSkSB5hfqbeVGvtdq9oX9niD567EId4xvpsZt1CVnNOfvC7kAbEU2EQ6JTM3 ZZsVzGSkYiuk+DEVNKA6lK5QEFtb576HAtXi94r7CY0KFaHtNxmIoEsPORl8DUOyuWUpPzl/IrU r5EFVdAnEc4w9NDeQAyCvT8ZzIIGVs4BNOYg== X-Google-Smtp-Source: AGHT+IEhj72ITgxNK5M7rvRlDqQUxPqtFgxXUB4uDdwfkrHzmWmm778xrmh2iRJ2vPmbx3Eb90TX1Q== X-Received: by 2002:a05:6a00:1bcd:b0:7e8:4587:e8ca with SMTP id d2e1a72fcca58-7f669d83f78mr18430291b3a.61.1766048120516; Thu, 18 Dec 2025 00:55:20 -0800 (PST) From: phind.uet@gmail.com To: Paolo Bonzini , =?UTF-8?q?Marc-Andr=C3=A9=20Lureau?= , =?UTF-8?q?Daniel=20P=2E=20Berrang=C3=A9?= , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Kostiantyn Kostiuk , Michael Roth Cc: Nguyen Dinh Phi , Pierrick Bouvier , qemu-devel@nongnu.org Subject: [PATCH v2 1/2] qga/vss-win32: Fix ConvertStringToBSTR redefinition with newer MinGW Date: Thu, 18 Dec 2025 16:54:45 +0800 Message-ID: <20251218085446.462827-2-phind.uet@gmail.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20251218085446.462827-1-phind.uet@gmail.com> References: <20251218085446.462827-1-phind.uet@gmail.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable 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 (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=2607:f8b0:4864:20::433; envelope-from=phind.uet@gmail.com; helo=mail-pf1-x433.google.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, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, FREEMAIL_FROM=0.001, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 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 @gmail.com) X-ZM-MESSAGEID: 1766048151847154100 Content-Type: text/plain; charset="utf-8" From: Nguyen Dinh Phi Newer versions of MinGW-w64 provide ConvertStringToBSTR() in the _com_util namespace via . This causes a redefinition error when building qemu-ga on Windows with these toolchains. Add a meson check to detect whether ConvertStringToBSTR is already available, and conditionally compile our fallback implementation only when the system does not provide one. Signed-off-by: Nguyen Dinh Phi Suggested-by: Pierrick Bouvier Reviewed-by: Kostiantyn Kostiuk Reviewed-by: Pierrick Bouvier --- meson.build | 12 ++++++++++++ qga/vss-win32/install.cpp | 2 ++ 2 files changed, 14 insertions(+) diff --git a/meson.build b/meson.build index c5710a6a47..5a0f407d6f 100644 --- a/meson.build +++ b/meson.build @@ -3299,6 +3299,18 @@ endif # Detect host pointer size for the target configuration loop. host_long_bits =3D cc.sizeof('void *') * 8 =20 +# Detect if ConvertStringToBSTR has been defined in _com_util namespace +if host_os =3D=3D 'windows' + has_convert_string_to_bstr =3D cxx.links(''' + #include + int main() { + BSTR b =3D _com_util::ConvertStringToBSTR("test"); + return b ? 0 : 1; + } + ''') + config_host_data.set('CONFIG_CONVERT_STRING_TO_BSTR', has_convert_string= _to_bstr) +endif + ######################## # Target configuration # ######################## diff --git a/qga/vss-win32/install.cpp b/qga/vss-win32/install.cpp index 7b25d9098b..5b7a8e9bc5 100644 --- a/qga/vss-win32/install.cpp +++ b/qga/vss-win32/install.cpp @@ -549,6 +549,7 @@ STDAPI DllUnregisterServer(void) =20 =20 /* Support function to convert ASCII string into BSTR (used in _bstr_t) */ +#ifndef CONFIG_CONVERT_STRING_TO_BSTR namespace _com_util { BSTR WINAPI ConvertStringToBSTR(const char *ascii) { @@ -566,6 +567,7 @@ namespace _com_util return bstr; } } +#endif =20 /* Stop QGA VSS provider service using Winsvc API */ STDAPI StopService(void) --=20 2.43.0