From patchwork Fri Nov 3 19:59:54 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: 740729 Delivered-To: patch@linaro.org Received: by 2002:adf:fd90:0:b0:32d:baff:b0ca with SMTP id d16csp11831wrr; Fri, 3 Nov 2023 13:09:36 -0700 (PDT) X-Google-Smtp-Source: AGHT+IEJEd8ncLRYoQi+r/0cdY/1DNS+gqZG5r8PYLsACO6D2DetOFMiYjbyV+/XAfa0ur99c792 X-Received: by 2002:ad4:5767:0:b0:671:188b:7367 with SMTP id r7-20020ad45767000000b00671188b7367mr19653179qvx.65.1699042176587; Fri, 03 Nov 2023 13:09:36 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1699042176; cv=none; d=google.com; s=arc-20160816; b=0IFW4FIyT8fr8m8NoDsCJNnqPtq7daK6ZtCGcSVsnuzJvBH/ZN5wl3YhyjTfKjqPme /FM614Z1f63IE8wdVoVge2RssA0J/K5gWVQXskp4Pqn+ai4sPHV8UnqUgDBaEuDvPMDt nyV0UJgrXfb4DZqJpZ3YExHZ8H9yLtI9LTvpuzELxUrJMCoMhkcMUkMdUy3PqXGxwMU0 05XRMeAQ+n0eK/qSNOK18/zjaPuFcl0pCAVCnobwATsrgnsRJVUIuWNN3hNImyp0KZCW 9ybyfVoWherkuCMm7wiNVMOI39Cz+KdjKTfI2EAMNeZUDRK8p8kD//3TjbSDCJz1Gk+z GEmQ== 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=irSpAQbacIjAn4tboyPxxEXP8GwQwy4xoP2FBlrokWA=; fh=gFOgPAQjalZwnoCIeS1biZSYMEsJIg8psB+5knxslb0=; b=T1GQF1kC77/OdDJdSjAOmnw32vBZh3TKhvlf2QMg4Y0evTfRuTOJd0lKxtD4osLjoL 9EuTRGx8olmlGK0haNue/TuUCM/vAvs7CcUFjTKVmK2nay8VxM/iNanEvg1pRTSEdmoV sND2KP9/Rkn8RegO5V4qirmrDCoSJZOhbFF1lrYl250cjOuj906s6IhlrNK0BkX8ykJl x0T4gtTCgYIcZrWxmgfw3oLF8HX4fqg5Dswadl1/9JFJGssx6m2HE5de46TbHxJVnHT0 G7/c5XsO6lNDuEeEkGQmefAvsWw15A4pXNQxAbet1x+MjB7Z6R1SW9V+M7YSfNEEFJy5 LZIg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=Y2lEUSmE; 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 l8-20020ad44248000000b0066d03c88ec3si2014754qvq.236.2023.11.03.13.09.36 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Fri, 03 Nov 2023 13:09:36 -0700 (PDT) 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=Y2lEUSmE; 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 1qz0RB-0004n3-5I; Fri, 03 Nov 2023 16:06:37 -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 1qz0R4-0004I2-MG for qemu-devel@nongnu.org; Fri, 03 Nov 2023 16:06:30 -0400 Received: from mail-wr1-x42e.google.com ([2a00:1450:4864:20::42e]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1qz0Qn-0006z7-2e for qemu-devel@nongnu.org; Fri, 03 Nov 2023 16:06:30 -0400 Received: by mail-wr1-x42e.google.com with SMTP id ffacd0b85a97d-32d9d8284abso1432474f8f.3 for ; Fri, 03 Nov 2023 13:06:12 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1699041971; x=1699646771; 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=irSpAQbacIjAn4tboyPxxEXP8GwQwy4xoP2FBlrokWA=; b=Y2lEUSmEM4Beux5P7itLTR+M5AAO9uzu5q8v81lTdPgIbxSdGgtxXThUdiwKXDDA8K 5Ca0K0VShdVPbZREfonRQxx4CQFQfKspMRf5VzByniKJYBvaoY/int8iJIw/pu1dv+N8 CMETUyzuWjRYQDXkA9U3rKNFyC5NEFrp3dNGEI78VGhUpXZUJ/iNUwzsjO5bi8kpH1Ix B9akoWN5kzSd3FLvOp2nRMqWOaLDg+i3WtILRQH37+RnwJew32oBJP0N4Kni5KVfask5 b18DgfA0pjBjpmKdXYsG47mpaItgktG0cPvGsJUc5Pr3reuijF/jHz/oGBULhj6/UrHw PPpQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1699041971; x=1699646771; 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=irSpAQbacIjAn4tboyPxxEXP8GwQwy4xoP2FBlrokWA=; b=lp7GKk8hucfUk1UbiYdPYsEdeDM4lkmp82q/uiNfRrUI4eNh5aXiAIpj9wtvW+VaEX khgf8UsCo6BbTsDmz2Z37QAF68fD3a4caqblqXv2JtOV1TyGfHWTkt/YsP9+2Kbocvv1 Nb6mYXjfZ4oFzetpcxSnImYeqA14q+w0D/8fdn0YGxH8KeHrskUZqV4XT3b4EfFJSCL2 JBtNAKKFJ/jI4/q00Ldb+ChG+bbwVZ0SoCJI4PvsRGJWag9lnl8e1DEt9he3YnBJ2xQ4 RkBRYP1UsfENJqndyX8itlx7eeFPXq152fsPgEGSoWnPYGJFvlIay/UdmY+1taZHIVd9 T8Gw== X-Gm-Message-State: AOJu0Yza/9dZKG3PH8nC2FB7jzBsM8SujwvimGXi7Q+PefELG6K1ygiA wrRF5QgPKmsCR8z0Tmi+/k92JQ== X-Received: by 2002:adf:e590:0:b0:31f:d2dc:df26 with SMTP id l16-20020adfe590000000b0031fd2dcdf26mr15669864wrm.28.1699041971325; Fri, 03 Nov 2023 13:06:11 -0700 (PDT) Received: from draig.lan ([85.9.250.243]) by smtp.gmail.com with ESMTPSA id k12-20020adff28c000000b0032f99801273sm2613842wro.66.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 A709E65757; 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 27/29] plugins: make test/example plugins work on windows Date: Fri, 3 Nov 2023 19:59:54 +0000 Message-Id: <20231103195956.1998255-28-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::42e; envelope-from=alex.bennee@linaro.org; helo=mail-wr1-x42e.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 Generate a qemu_plugin_api.lib delay import lib on windows, for windows qemu plugins to link against. Implement an example dll load fail hook to link up the API functions correctly when a plugin is loaded on windows. Update the build scripts for the test and example plugins to use these things. Signed-off-by: Greg Manning Acked-by: Alex Bennée Message-Id: <20231102172053.17692-3-gmanning@rapitasystems.com> Signed-off-by: Alex Bennée --- configure | 3 +++ contrib/plugins/win32_linker.c | 34 ++++++++++++++++++++++++++++++++++ contrib/plugins/Makefile | 20 ++++++++++++++++---- plugins/meson.build | 17 +++++++++++++++++ tests/plugin/meson.build | 14 +++++++++++--- 5 files changed, 81 insertions(+), 7 deletions(-) create mode 100644 contrib/plugins/win32_linker.c diff --git a/configure b/configure index f1456f6123..04f2cdd166 100755 --- a/configure +++ b/configure @@ -1662,6 +1662,9 @@ echo "CFLAGS=${CFLAGS-$default_cflags} $EXTRA_CFLAGS" >> contrib/plugins/$config if test "$targetos" = darwin; then echo "CONFIG_DARWIN=y" >> contrib/plugins/$config_host_mak fi +if test "$targetos" = windows; then + echo "CONFIG_WIN32=y" >> contrib/plugins/$config_host_mak +fi # tests/tcg configuration (config_host_mak=tests/tcg/config-host.mak diff --git a/contrib/plugins/win32_linker.c b/contrib/plugins/win32_linker.c new file mode 100644 index 0000000000..50797d616e --- /dev/null +++ b/contrib/plugins/win32_linker.c @@ -0,0 +1,34 @@ +/* + * Copyright (C) 2023, Greg Manning + * + * This hook, __pfnDliFailureHook2, is documented in the microsoft documentation here: + * https://learn.microsoft.com/en-us/cpp/build/reference/error-handling-and-notification + * It gets called when a delay-loaded DLL encounters various errors. + * We handle the specific case of a DLL looking for a "qemu.exe", + * and give it the running executable (regardless of what it is named). + * + * This work is licensed under the terms of the GNU LGPL, version 2 or later. + * See the COPYING.LIB file in the top-level directory. + */ + +#include +#include + +FARPROC WINAPI dll_failure_hook(unsigned dliNotify, PDelayLoadInfo pdli); + + +PfnDliHook __pfnDliFailureHook2 = dll_failure_hook; + +FARPROC WINAPI dll_failure_hook(unsigned dliNotify, PDelayLoadInfo pdli) { + if (dliNotify == dliFailLoadLib) { + /* If the failing request was for qemu.exe, ... */ + if (strcmp(pdli->szDll, "qemu.exe") == 0) { + /* Then pass back a pointer to the top level module. */ + HMODULE top = GetModuleHandle(NULL); + return (FARPROC) top; + } + } + /* Otherwise we can't do anything special. */ + return 0; +} + diff --git a/contrib/plugins/Makefile b/contrib/plugins/Makefile index 8ba78c7a32..751fa38619 100644 --- a/contrib/plugins/Makefile +++ b/contrib/plugins/Makefile @@ -22,7 +22,14 @@ NAMES += hwprofile NAMES += cache NAMES += drcov -SONAMES := $(addsuffix .so,$(addprefix lib,$(NAMES))) +ifeq ($(CONFIG_WIN32),y) +SO_SUFFIX := .dll +LDLIBS += $(shell $(PKG_CONFIG) --libs glib-2.0) +else +SO_SUFFIX := .so +endif + +SONAMES := $(addsuffix $(SO_SUFFIX),$(addprefix lib,$(NAMES))) # The main QEMU uses Glib extensively so it's perfectly fine to use it # in plugins (which many example do). @@ -35,15 +42,20 @@ all: $(SONAMES) %.o: %.c $(CC) $(CFLAGS) $(PLUGIN_CFLAGS) -c -o $@ $< -lib%.so: %.o -ifeq ($(CONFIG_DARWIN),y) +ifeq ($(CONFIG_WIN32),y) +lib%$(SO_SUFFIX): %.o win32_linker.o ../../plugins/qemu_plugin_api.lib + $(CC) -shared -o $@ $^ $(LDLIBS) +else ifeq ($(CONFIG_DARWIN),y) +lib%$(SO_SUFFIX): %.o $(CC) -bundle -Wl,-undefined,dynamic_lookup -o $@ $^ $(LDLIBS) else +lib%$(SO_SUFFIX): %.o $(CC) -shared -o $@ $^ $(LDLIBS) endif + clean: - rm -f *.o *.so *.d + rm -f *.o *$(SO_SUFFIX) *.d rm -Rf .libs .PHONY: all clean diff --git a/plugins/meson.build b/plugins/meson.build index 71ed996ed3..8ed9fa270c 100644 --- a/plugins/meson.build +++ b/plugins/meson.build @@ -14,6 +14,23 @@ if not enable_modules endif if get_option('plugins') + if targetos == 'windows' + # Generate a .lib file for plugins to link against. + # First, create a .def file listing all the symbols a plugin should expect to have + # available in qemu + win32_plugin_def = configure_file( + input: files('qemu-plugins.symbols'), + output: 'qemu_plugin_api.def', + capture: true, + command: ['sed', '-e', '0,/^/s//EXPORTS/; s/[{};]//g', '@INPUT@']) + # then use dlltool to assemble a delaylib. + win32_qemu_plugin_api_lib = configure_file( + input: win32_plugin_def, + output: 'qemu_plugin_api.lib', + command: ['dlltool', '--input-def', '@INPUT@', + '--output-delaylib', '@OUTPUT@', '--dllname', 'qemu.exe'] + ) + endif specific_ss.add(files( 'loader.c', 'core.c', diff --git a/tests/plugin/meson.build b/tests/plugin/meson.build index 322cafcdf6..528bb9d86c 100644 --- a/tests/plugin/meson.build +++ b/tests/plugin/meson.build @@ -1,9 +1,17 @@ t = [] if get_option('plugins') foreach i : ['bb', 'empty', 'insn', 'mem', 'syscall'] - t += shared_module(i, files(i + '.c'), - include_directories: '../../include/qemu', - dependencies: glib) + if targetos == 'windows' + t += shared_module(i, files(i + '.c') + '../../contrib/plugins/win32_linker.c', + include_directories: '../../include/qemu', + objects: [win32_qemu_plugin_api_lib], + dependencies: glib) + + else + t += shared_module(i, files(i + '.c'), + include_directories: '../../include/qemu', + dependencies: glib) + endif endforeach endif if t.length() > 0