From nobody Tue Dec 16 06:11:06 2025 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.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; Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zoho.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1552926449233886.2232988807924; Mon, 18 Mar 2019 09:27:29 -0700 (PDT) Received: from localhost ([127.0.0.1]:44216 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1h5v6d-0002Kw-7F for importer@patchew.org; Mon, 18 Mar 2019 12:27:19 -0400 Received: from eggs.gnu.org ([209.51.188.92]:43949) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1h5v4O-00011x-0J for qemu-devel@nongnu.org; Mon, 18 Mar 2019 12:25:00 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1h5v4M-0002nm-B2 for qemu-devel@nongnu.org; Mon, 18 Mar 2019 12:24:59 -0400 Received: from mail-ot1-x32d.google.com ([2607:f8b0:4864:20::32d]:34801) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1h5v4K-0002hG-T7; Mon, 18 Mar 2019 12:24:57 -0400 Received: by mail-ot1-x32d.google.com with SMTP id r19so14987458otn.1; Mon, 18 Mar 2019 09:24:45 -0700 (PDT) Received: from localhost (76-251-165-188.lightspeed.austtx.sbcglobal.net. [76.251.165.188]) by smtp.gmail.com with ESMTPSA id l63sm4285066oia.47.2019.03.18.09.24.42 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Mon, 18 Mar 2019 09:24:42 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=NKLGoySNmAyPmaOt5Xv7iUV/w5WslgbC7ZUlbmSKGoE=; b=o9VzBSqVKUskU6f4NmZDjP59EJ8XppknMpNY/U4Z4n0JraNPSro/MDObluda2ChqSK wJ+EECiiDWH8ny/tXSoQRuBlA104iKNYveFLfnFTFa2kCbfAsNEyjK7LjSMj22Lcx5Cb sW6yG4ffVSJ7rMEtTeX4BFGaxzykfSNc0FXCD90WfZV8N0OjiHzYY4vFMhaeX7WR4I1M i18b0BeuDRSxmwM+it7Wl8bzLnpHaJqgGTPr5fLTLNJkGLpd8Pmcdv9Cdr2/GUIfZZUk Y57WRK6ega9NEW8sOMzvfaS9NZOKzSVt5suktUoPIFPaIyJmVSFRIz5TuM7YkcDzRUkj 8tQA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :in-reply-to:references:mime-version:content-transfer-encoding; bh=NKLGoySNmAyPmaOt5Xv7iUV/w5WslgbC7ZUlbmSKGoE=; b=ZU1HLsinOCkgbuFQj8DYoWTpU+UhEXPsNqENoJxRfi9ckBgMc+LCKQ73D02/RI+k+v 2mXjK5cdl0qQhrEAJBMWVhEp0WW//QpTvoP+cDQgFpYJizMFof0q54I8+NK+BiWJJW34 cpKswKeVEcgwJhmgmxMTZjpSI2e5lN2ujeTpHOC6kXbjJ/pnTr2LRTdAVz/us2tBcV+H mFlQp0ve+NwTAc9SpWeKnIjNKSAJD6VWXReVAUYe9AoFi73CVyPAWt41NXXmvM21pebe OwLZtgyBFcHTwykGEQcCX53B/cBAuN8grFJtP5x4O4181M2DNyxkN8XnSVXWU7owcZRp RATQ== X-Gm-Message-State: APjAAAWpaCzM6Po+43LtgHnkG30ptjV+qzeT0/i1+fXQEhKycGg/Gak+ mKSPQERekAvs8k8frwCS1RHgnGSd X-Google-Smtp-Source: APXvYqz/zorGmql/2E88gEdEbOtj3KuqwuqqwEnVCsu0xy/3gENf4NG21aztiRsgbWBcmQDV7167rA== X-Received: by 2002:a9d:5e8:: with SMTP id 95mr7234998otd.196.1552926284573; Mon, 18 Mar 2019 09:24:44 -0700 (PDT) From: Michael Roth To: qemu-devel@nongnu.org Date: Mon, 18 Mar 2019 11:24:06 -0500 Message-Id: <20190318162410.10183-4-mdroth@linux.vnet.ibm.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20190318162410.10183-1-mdroth@linux.vnet.ibm.com> References: <20190318162410.10183-1-mdroth@linux.vnet.ibm.com> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2607:f8b0:4864:20::32d Subject: [Qemu-devel] [PULL for-4.0 3/7] qga-win: include glib when building VSS DLL X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: peter.maydell@linaro.org, qemu-stable@nongnu.org Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) Commit 3ebee3b191e defined assert() as g_assert(), but when we build the VSS DLL component of QGA (to handle fsfreeze) we do not include glib, which results in breakage when building with VSS support enabled. Fix this by including glib (along with the -lintl and -lws2_32 dependencies it brings). Since the VSS DLL is built statically, this introduces an additional dependency on static glib and supporting libs for the mingw environment (possibly why we didn't include glib originally), but VSS support already has very specific prerequisites so it shouldn't affect too many build environments. Since the VSS DLL code does use qemu/osdep.h, this should also help avoid future breakages and possibly allow for some clean ups in current VSS code. Suggested-by: Daniel P. Berrang=C3=A9 Cc: Daniel P. Berrang=C3=A9 Cc: qemu-stable@nongnu.org Signed-off-by: Michael Roth --- qga/vss-win32/Makefile.objs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/qga/vss-win32/Makefile.objs b/qga/vss-win32/Makefile.objs index 23d08da225..dad9d1b0ba 100644 --- a/qga/vss-win32/Makefile.objs +++ b/qga/vss-win32/Makefile.objs @@ -5,7 +5,7 @@ qga-vss-dll-obj-y +=3D requester.o provider.o install.o obj-qga-vss-dll-obj-y =3D $(addprefix $(obj)/, $(qga-vss-dll-obj-y)) $(obj-qga-vss-dll-obj-y): QEMU_CXXFLAGS =3D $(filter-out -Wstrict-prototyp= es -Wmissing-prototypes -Wnested-externs -Wold-style-declaration -Wold-styl= e-definition -Wredundant-decls -fstack-protector-all -fstack-protector-stro= ng, $(QEMU_CFLAGS)) -Wno-unknown-pragmas -Wno-delete-non-virtual-dtor =20 -$(obj)/qga-vss.dll: LDFLAGS =3D -shared -Wl,--add-stdcall-alias,--enable-s= tdcall-fixup -lole32 -loleaut32 -lshlwapi -luuid -static +$(obj)/qga-vss.dll: LDFLAGS =3D -shared -Wl,--add-stdcall-alias,--enable-s= tdcall-fixup -lglib-2.0 -lole32 -loleaut32 -lshlwapi -luuid -lintl -lws2_32= -static $(obj)/qga-vss.dll: $(obj-qga-vss-dll-obj-y) $(SRC_PATH)/$(obj)/qga-vss.def $(call quiet-command,$(CXX) -o $@ $(qga-vss-dll-obj-y) $(SRC_PATH)/qga/vs= s-win32/qga-vss.def $(CXXFLAGS) $(LDFLAGS),"LINK","$(TARGET_DIR)$@") =20 --=20 2.17.1