From patchwork Mon Nov 6 18:51:06 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: 741438 Delivered-To: patch@linaro.org Received: by 2002:adf:fd90:0:b0:32d:baff:b0ca with SMTP id d16csp1257689wrr; Mon, 6 Nov 2023 10:59:21 -0800 (PST) X-Google-Smtp-Source: AGHT+IGmlAU9A0jheeUwwce+wBxTn4w6Jkp80TRv850DTaXu7vFKgWXjNjEbx3293NfB25kyxrxy X-Received: by 2002:a05:6102:474b:b0:45f:4e55:9c55 with SMTP id ej11-20020a056102474b00b0045f4e559c55mr1989363vsb.17.1699297161019; Mon, 06 Nov 2023 10:59:21 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1699297161; cv=none; d=google.com; s=arc-20160816; b=eVXnPrGA+pWOjeyf6MVjTBzox40R+FD5R+ky74cpto/hYSG+0JL8TrHuuimAkBHHCy 2LSTfkf4r4wzEw7M/heqEoc0t0JHljBWFj/h+6ajNOCmbCyIGo8fPx87R/D+BvhNQn6/ 5YIiLXq2pgqY2Jl00hyrsG9pqklxl/Z0LqNolugqYXyYD5ueXovtIqcCQ56guZYumtm/ HDOAMOKKIl/QpjVxJk1icb9eT2vR8j8I7om4ZsqH02OZg6TGT7B3biIgABYDA8ZTiLpc eC6OMsLBzY6l04GRRgNBNCLu30NMdvYF2hGIIW6RCJMiGkOcYv4o9HzlaeWVZoorN8bJ wbGg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:content-transfer-encoding :mime-version:references:in-reply-to:message-id:date:subject:cc:to :from:dkim-signature; bh=eQYn9T9uZSh6JgFI7JEYQpVIP7VUC/yhVeEeSSJ6yyU=; fh=evCjE205UAgwRAbsv9T0pnLB71HQo8Z0+pxdURI4LPA=; b=gU7IT37Kek4u1SvUUPfwz2KK0JwF4IFd/bix0nhYNiZ8RGqobuSFev88UIobkrsqrj Py3oG3R0ryk+Y16Ci3cfy9ORZZlH1CdNbWUTTdGAjD5boa7F5y4Jgtan0SXl0sxAAi2w iEBfudhMdR5vGchff0CxAid0ph9ZHtqhYjiVexp0doEBYCiISwBDDrFQHSwePVZ7iZzJ /xgVqZWdfl7Et920GHlTEcDWSsQ6xtsaNimjDhD1HrNOWWRhXrxNDN8zvrmLQIG3EUHP jgpqHVXDKyLFAxd3FfHls0ctLxP8f/x1PWps19+AzHYoLYHWbREkRe+GbqyW53WH1fx4 VElQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=Ffz08mJm; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from lists.gnu.org (lists.gnu.org. [209.51.188.17]) by mx.google.com with ESMTPS id z5-20020a05622a028500b0041979aaf3ecsi5936078qtw.663.2023.11.06.10.59.20 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Mon, 06 Nov 2023 10:59:20 -0800 (PST) Received-SPF: pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; Authentication-Results: mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=Ffz08mJm; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1r04o9-0002xC-I4; Mon, 06 Nov 2023 13:58:45 -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 1r04o7-0002wH-Sb for qemu-devel@nongnu.org; Mon, 06 Nov 2023 13:58:43 -0500 Received: from mail-wm1-x333.google.com ([2a00:1450:4864:20::333]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1r04ny-0002QF-Bk for qemu-devel@nongnu.org; Mon, 06 Nov 2023 13:58:43 -0500 Received: by mail-wm1-x333.google.com with SMTP id 5b1f17b1804b1-4083f613272so42115905e9.1 for ; Mon, 06 Nov 2023 10:58:32 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1699297112; x=1699901912; 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=eQYn9T9uZSh6JgFI7JEYQpVIP7VUC/yhVeEeSSJ6yyU=; b=Ffz08mJmPHnSu1CketK/PB+eYFpgdH/qpoMMKAfhpoZkmD9z7sEXDzLgx8Pa7HP6Nn u+7cmxOwpTdhScL6Yj4uZrsvBCl8HkNTKYtVmeHyHKdLcu3UObrSiGSeiJOs8GdeXI7f Q79Ox1qT55VchkthkGehmExo8SCqHan5iFqbK7O17npmoFOp6qUK6poV5tSJUtvF3Ta0 tbcCQVumTFWas3/6oPSnaETOk2xA05848NWbEdu/VPpAcimtVnOrruZzoF3FMfX3btU5 Vza+DQiB2h9Owa6oN6834CrFsQO3otfOpNNTyB7slJeglgWU5V/Bpw3hKhwhkd7/MXnM zCmQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1699297112; x=1699901912; 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=eQYn9T9uZSh6JgFI7JEYQpVIP7VUC/yhVeEeSSJ6yyU=; b=SUJB1PPhjZgNOsj5ZYzMFFIshvtVJBg2aeYkINvT/A8waq6YI5b7zv33OL5yvcjOWs veBiIJUswwRZxCyOJm998Le+j3ytpWjtS0tABrxiSet7dwxbtDpfeqFFK/fuO/pxrN6i oVGNoOSBW3w+9WhtWLrO5d1pZLZl1jrKjW78eS+tf4rwE8WyuKQSQvKomYkekNZNV9W/ VUC6r+sXp1qjFL8yr0+fQ7KCANDncDRuCcM6SeMvLeaHV85P6Ae0sANFWNnn7vUX/FcX 4F/4+rKTb2aMYO+1UyX3v6KtGdNRA84mjsGNyGdMB8Hn1onZdc2M8PUUE1k24KrJAYHt 3Obw== X-Gm-Message-State: AOJu0YyK3CgEcdC2BFzqjKqwiP+FZhaPPlONyZ2yFPR6Ze/TsUQOJ1tv xmuQOOiDImIBBe7RcW7egCKmVg== X-Received: by 2002:a1c:4b09:0:b0:408:4eb2:3b1b with SMTP id y9-20020a1c4b09000000b004084eb23b1bmr506592wma.21.1699297111806; Mon, 06 Nov 2023 10:58:31 -0800 (PST) Received: from draig.lan ([85.9.250.243]) by smtp.gmail.com with ESMTPSA id y23-20020a05600c341700b00406408dc788sm12869598wmp.44.2023.11.06.10.58.28 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 06 Nov 2023 10:58:30 -0800 (PST) Received: from draig.lan (localhost [IPv6:::1]) by draig.lan (Postfix) with ESMTP id E75A265760; Mon, 6 Nov 2023 18:51:13 +0000 (GMT) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: qemu-devel@nongnu.org Cc: qemu-arm@nongnu.org, =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= , Peter Maydell , =?utf-8?q?Marc-Andr=C3=A9_Lureau?= , Laurent Vivier , =?utf-8?q?Alex_Benn=C3=A9e?= , Mahmoud Mandour , Cleber Rosa , Wainer dos Santos Moschetta , Paolo Bonzini , Thomas Huth , Beraldo Leal , Alexandre Iooss , John Snow , =?utf-8?q?Daniel_P=2E_Berrang=C3=A9?= , Chris Wulff , Marek Vasut , Richard Henderson , Greg Manning Subject: [PATCH 16/22] plugins: allow plugins to be enabled on windows Date: Mon, 6 Nov 2023 18:51:06 +0000 Message-Id: <20231106185112.2755262-17-alex.bennee@linaro.org> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20231106185112.2755262-1-alex.bennee@linaro.org> References: <20231106185112.2755262-1-alex.bennee@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::333; envelope-from=alex.bennee@linaro.org; helo=mail-wm1-x333.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+patch=linaro.org@nongnu.org Sender: qemu-devel-bounces+patch=linaro.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> [AJB: add check for dlltool to configure] Signed-off-by: Alex Bennée Message-Id: <20231103195956.1998255-30-alex.bennee@linaro.org> Reviewed-by: Philippe Mathieu-Daudé --- configure | 4 ++-- meson.build | 5 +++++ 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/configure b/configure index e50ec99fe2..abcb199aa8 100755 --- a/configure +++ b/configure @@ -1011,9 +1011,9 @@ if test "$targetos" = "bogus"; then fi # test for any invalid configuration combinations -if test "$targetos" = "windows"; then +if test "$targetos" = "windows" && ! has "$dlltool"; then if test "$plugins" = "yes"; then - error_exit "TCG plugins not currently supported on Windows platforms" + error_exit "TCG plugins requires dlltool to build on Windows platforms" fi plugins="no" fi 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')