From patchwork Fri Nov 3 19:59:56 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Alex_Benn=C3=A9e?= X-Patchwork-Id: 13445080 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id B3F52C4332F for ; Fri, 3 Nov 2023 20:09:34 +0000 (UTC) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1qz0R3-0004Br-91; Fri, 03 Nov 2023 16:06:29 -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 1qz0R1-000454-Jh for qemu-devel@nongnu.org; Fri, 03 Nov 2023 16:06:27 -0400 Received: from mail-wm1-x335.google.com ([2a00:1450:4864:20::335]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1qz0Ql-0006yR-IT for qemu-devel@nongnu.org; Fri, 03 Nov 2023 16:06:27 -0400 Received: by mail-wm1-x335.google.com with SMTP id 5b1f17b1804b1-4094301d505so18922925e9.2 for ; Fri, 03 Nov 2023 13:06:11 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1699041970; x=1699646770; 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=BM/WoalBWQwPuHSNHPl39Pw79pHu/OHGkHed2Wz/1M0=; b=EssZ6ximDOKaQznSwK77KU4i1/W2FxhR7atYhepvmg6+mf/SPMb2pQ6L5ijTC70dyO 0cRMmaMEaSCwG9U2tZTUkX47dbJUNSQ9qb8JiR7rgb65IUwMZzpP5P+kpWf8meT941qm J+vIwa7Gxpgwhg7ueFYqOpswfGSLSacM9bQkaFtSZwUscX/qgXaIpkgLV8+9fGM6NPq+ HHTokn9nH1J/zkDwceUk+A+0zBmpztcjB7KxQaZ+P1ZOU97AoIQKjbh+XQWLNtdnUf5I Myuwi85nh5rb/X09qxEeavPN1yYRP4EpR3emLa2KseKEMqhRtVz2C3HRPdYOX+ZPyEYR fmng== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1699041970; x=1699646770; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=BM/WoalBWQwPuHSNHPl39Pw79pHu/OHGkHed2Wz/1M0=; b=OukvcbSYXaztc6CJnhlnaDpXSpxed+KAIbioZObaPaVJrPixTGjCKnmlllZTH5ns1O GaK6gyIodXVfNv9vz7/vijqTtlqgUgUWugTT7Yz+Pt4vDff7V/1SsODQH5ZDNqCLKLaB /ynJlkjvirKupugRGlnDWoNUy23EdH5krPLVsKR2P3JqfliooULiPyyStwqOOdVab0Di XU1NeutlXYtji75sLUFd03un0GN2PaJi8zPl254SGXKJrJu6M19ko5BiMGJhTMqc7oh5 ZSSr8rpfXeUWYUbeRmCOt9aTGelhYH2aIRbyo8dR/CQBWElB/SbRJi4VFZquLQUmZ31t S58A== X-Gm-Message-State: AOJu0YycXVNpBIc7ElnspfzuOXxFcx8pakInrs/FbT7a0B/H6CPHDFmT loEs4L8exuRFS5eBwVV4iFl1yg== X-Google-Smtp-Source: AGHT+IEliE94OTH7Hncq1cvTOUk5H9lDwSF4rkmthVXPnQPEm7fpphVN3i9I/dzUeHyWDmu5jyJSQg== X-Received: by 2002:a05:600c:4f92:b0:401:a0b1:aef6 with SMTP id n18-20020a05600c4f9200b00401a0b1aef6mr19860363wmq.2.1699041970242; Fri, 03 Nov 2023 13:06:10 -0700 (PDT) Received: from draig.lan ([85.9.250.243]) by smtp.gmail.com with ESMTPSA id l7-20020a05600c1d0700b00405bbfd5d16sm3567011wms.7.2023.11.03.13.06.06 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 03 Nov 2023 13:06:08 -0700 (PDT) Received: from draig.lan (localhost [IPv6:::1]) by draig.lan (Postfix) with ESMTP id D4D4D65759; Fri, 3 Nov 2023 19:59:59 +0000 (GMT) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: qemu-devel@nongnu.org Cc: Peter Maydell , "Edgar E. Iglesias" , Song Gao , qemu-arm@nongnu.org, =?utf-8?q?Marc-Andr?= =?utf-8?q?=C3=A9_Lureau?= , Wainer dos Santos Moschetta , Weiwei Li , Marcel Apfelbaum , Ilya Leoshkevich , Daniel Henrique Barboza , Yanan Wang , =?utf-8?q?Alex_Benn=C3=A9e?= , =?utf-8?q?C=C3=A9dri?= =?utf-8?q?c_Le_Goater?= , Paolo Bonzini , David Hildenbrand , Brian Cain , qemu-ppc@nongnu.org, Palmer Dabbelt , qemu-riscv@nongnu.org, Eduardo Habkost , =?utf-8?q?Phi?= =?utf-8?q?lippe_Mathieu-Daud=C3=A9?= , Alistair Francis , Liu Zhiwei , Cleber Rosa , qemu-s390x@nongnu.org, Laurent Vivier , Yoshinori Sato , Nicholas Piggin , Thomas Huth , John Snow , Alexandre Iooss , =?utf-8?q?Daniel_P=2E_Berrang=C3=A9?= , Mahmoud Mandour , Daniel Henrique Barboza , Bin Meng , Beraldo Leal , Richard Henderson , Michael Rolnik , Greg Manning Subject: [PATCH 29/29] plugins: allow plugins to be enabled on windows Date: Fri, 3 Nov 2023 19:59:56 +0000 Message-Id: <20231103195956.1998255-30-alex.bennee@linaro.org> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20231103195956.1998255-1-alex.bennee@linaro.org> References: <20231103195956.1998255-1-alex.bennee@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::335; envelope-from=alex.bennee@linaro.org; helo=mail-wm1-x335.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, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001, T_SCC_BODY_TEXT_LINE=-0.01 autolearn=unavailable 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+qemu-devel=archiver.kernel.org@nongnu.org Sender: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org From: Greg Manning allow plugins to be enabled in the configure script on windows. Also, add the qemu_plugin_api.lib to the installer. Signed-off-by: Greg Manning Reviewed-by: Alex Bennée Message-Id: <20231102172053.17692-5-gmanning@rapitasystems.com> Signed-off-by: Alex Bennée --- configure | 6 ------ meson.build | 5 +++++ 2 files changed, 5 insertions(+), 6 deletions(-) diff --git a/configure b/configure index 04f2cdd166..1129e6dd94 100755 --- a/configure +++ b/configure @@ -1010,12 +1010,6 @@ if test "$targetos" = "bogus"; then fi # test for any invalid configuration combinations -if test "$targetos" = "windows"; then - if test "$plugins" = "yes"; then - error_exit "TCG plugins not currently supported on Windows platforms" - fi - plugins="no" -fi if test "$tcg" = "disabled" ; then if test "$plugins" = "yes"; then error_exit "Can't enable plugins on non-TCG builds" diff --git a/meson.build b/meson.build index dcef8b1e79..b855224acc 100644 --- a/meson.build +++ b/meson.build @@ -3904,6 +3904,11 @@ endforeach if get_option('plugins') install_headers('include/qemu/qemu-plugin.h') + if targetos == 'windows' + # On windows, we want to deliver the qemu_plugin_api.lib file in the qemu installer, + # so that plugin authors can compile against it. + install_data(win32_qemu_plugin_api_lib, install_dir: 'lib') + endif endif subdir('qga')