From nobody Mon Feb 9 10:58:07 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=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1596742319; cv=none; d=zohomail.com; s=zohoarc; b=CpZAVWKVFWS8ZzeDeA6grSeMUdm85Iic78ulVVYgLyizHAxSpxmo8xhgjgYQIjhQvCzpsNbKRcedugsXi2Gtgtm5D0x35n+r3JJYrQ4ZP6eklsYpbTrZBgmDJCq5cex9rHYBttEcOwF16r4cLS3mQx9+1ZKFCNheTPeKy8KsqCg= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1596742319; h=Content-Type:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:Message-ID:References:Sender:Subject:To; bh=kYrpOvd1utmNpI/vIn83yutW8O2ih0OuNAwrqnYBgbg=; b=fEktJDBpXgOgnzPQXEoE5jJionR55K38EXZ7P5i6vN65Bc6jUVPSfj0Z2442R1DA6Xc4cnhNB7R4gzmAB1JFUP0FZocQXjvWvEH61uNN4hJokxv0mrInNjyQH21wAUES5qFNBWrnM4Bb2JaEalm4w0B6WGdZLgseQTHucmQps2E= 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) header.from= Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1596742319631162.33129329306541; Thu, 6 Aug 2020 12:31:59 -0700 (PDT) Received: from localhost ([::1]:45312 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1k3lcM-0000mu-B1 for importer@patchew.org; Thu, 06 Aug 2020 15:31:58 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:42874) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1k3lOR-0004iI-2n for qemu-devel@nongnu.org; Thu, 06 Aug 2020 15:17:35 -0400 Received: from us-smtp-delivery-1.mimecast.com ([205.139.110.120]:35153 helo=us-smtp-1.mimecast.com) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_CBC_SHA1:256) (Exim 4.90_1) (envelope-from ) id 1k3lOP-0006TR-72 for qemu-devel@nongnu.org; Thu, 06 Aug 2020 15:17:34 -0400 Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-234-Pq_EXsVUPZKi88viyTnCVg-1; Thu, 06 Aug 2020 15:17:29 -0400 Received: from smtp.corp.redhat.com (int-mx06.intmail.prod.int.phx2.redhat.com [10.5.11.16]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id AF2631DE1 for ; Thu, 6 Aug 2020 19:17:28 +0000 (UTC) Received: from 640k.localdomain.com (unknown [10.36.110.10]) by smtp.corp.redhat.com (Postfix) with ESMTP id 0436D5F9DC for ; Thu, 6 Aug 2020 19:17:27 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1596741452; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:content-type:content-type:in-reply-to:in-reply-to: references:references; bh=kYrpOvd1utmNpI/vIn83yutW8O2ih0OuNAwrqnYBgbg=; b=GmVZa9rknNGyxFgTiEsXRPqj4CHD8kEjhnjNlt1Ee+TiwYdGU1maOcAgupeH+hDS2ofLK6 stfxX0tiBmr+nsMexRRtnhhdSwxW13X9W4X1iak6xCmMttX/yLb7eY2GIEpWhnUmw/r6WT W3WAVLpWr4UXWepATD0hcj0z9M5rFto= X-MC-Unique: Pq_EXsVUPZKi88viyTnCVg-1 From: Paolo Bonzini To: qemu-devel@nongnu.org Subject: [PATCH 036/143] meson: convert dummy Windows qga/qemu-ga target Date: Thu, 6 Aug 2020 21:14:32 +0200 Message-Id: <1596741379-12902-37-git-send-email-pbonzini@redhat.com> In-Reply-To: <1596741379-12902-1-git-send-email-pbonzini@redhat.com> References: <1596741379-12902-1-git-send-email-pbonzini@redhat.com> X-Scanned-By: MIMEDefang 2.79 on 10.5.11.16 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=pbonzini@redhat.com X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com 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=205.139.110.120; envelope-from=pbonzini@redhat.com; helo=us-smtp-1.mimecast.com X-detected-operating-system: by eggs.gnu.org: First seen = 2020/08/06 00:24:10 X-ACL-Warn: Detected OS = Linux 2.2.x-3.x [generic] [fuzzy] X-Spam_score_int: -30 X-Spam_score: -3.1 X-Spam_bar: --- X-Spam_report: (-3.1 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-1, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, RCVD_IN_MSPIKE_H3=-0.01, RCVD_IN_MSPIKE_WL=-0.01, SPF_HELO_NONE=0.001, SPF_PASS=-0.001, URIBL_BLOCKED=0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 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" X-ZohoMail-DKIM: pass (identity @redhat.com) Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Signed-off-by: Paolo Bonzini --- Makefile | 5 ----- qga/meson.build | 4 ++++ qga/vss-win32/meson.build | 2 ++ 3 files changed, 6 insertions(+), 5 deletions(-) diff --git a/Makefile b/Makefile index 7c4a34a..5df772b 100644 --- a/Makefile +++ b/Makefile @@ -434,11 +434,6 @@ qemu-img-cmds.h: $(SRC_PATH)/qemu-img-cmds.hx $(SRC_PA= TH)/scripts/hxtool qemu-keymap$(EXESUF): LIBS +=3D $(XKBCOMMON_LIBS) qemu-keymap$(EXESUF): QEMU_CFLAGS +=3D $(XKBCOMMON_CFLAGS) =20 -ifneq ($(EXESUF),) -.PHONY: qga/qemu-ga -qga/qemu-ga: qga/qemu-ga$(EXESUF) $(QGA_VSS_PROVIDER) $(QEMU_GA_MSI) -endif - module_block.h: $(SRC_PATH)/scripts/modules/module_block.py config-host.mak $(call quiet-command,$(PYTHON) $< $@ \ $(addprefix $(SRC_PATH)/,$(patsubst %.mo,%.c,$(block-obj-m))), \ diff --git a/qga/meson.build b/qga/meson.build index 9246575..dcd4772 100644 --- a/qga/meson.build +++ b/qga/meson.build @@ -43,6 +43,7 @@ qga_ss =3D qga_ss.apply(config_host, strict: false) qga =3D executable('qemu-ga', qga_ss.sources(), link_args: config_host['LIBS_QGA'].split(), dependencies: [qemuutil, libudev]) +all_qga =3D [qga] =20 if host_machine.system() =3D=3D 'windows' if 'CONFIG_QGA_VSS' in config_host @@ -71,6 +72,9 @@ if host_machine.system() =3D=3D 'windows' config_host['QEMU_GA_MSI_WITH_VSS'].split(), config_host['QEMU_GA_MSI_MINGW_DLL_PATH'].sp= lit(), ]) + all_qga +=3D [qga-msi] alias_target('msi', qga_msi) endif + + alias_target('qga/qemu-ga', all_qga) endif diff --git a/qga/vss-win32/meson.build b/qga/vss-win32/meson.build index 1f39e05..780c461 100644 --- a/qga/vss-win32/meson.build +++ b/qga/vss-win32/meson.build @@ -14,6 +14,8 @@ if add_languages('cpp', required: false) cc.find_library('shlwapi'), cc.find_library('uuid'), cc.find_library('intl')]) + + all_qga +=3D qga_vss endif =20 # rules to build qga-vss.tlb --=20 1.8.3.1