From patchwork Fri May 24 16:20:01 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Paolo Bonzini X-Patchwork-Id: 13673297 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 B9073C25B74 for ; Fri, 24 May 2024 16:21:33 +0000 (UTC) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1sAXeb-0005xd-IW; Fri, 24 May 2024 12:20:25 -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 1sAXea-0005x2-Dn for qemu-devel@nongnu.org; Fri, 24 May 2024 12:20:24 -0400 Received: from us-smtp-delivery-124.mimecast.com ([170.10.129.124]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1sAXeT-0006ve-2H for qemu-devel@nongnu.org; Fri, 24 May 2024 12:20:24 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1716567615; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=TLcj+G3nZNoagmtde0jJ4iaxwOIbWk0F9rsJ0Ab16Xo=; b=QTiGsNhf6Mvw1fsbU/uU/MYLGnrisKc3LZowkoENOi+Qhkc9eAO3IGozneVUW0nXLxjhhi ISpXx63kK6Ka50wHoKoSKIdlLQekgQw4zDShzb+o1AEDLwUh/p8NcEuGQyVWZb7MAW0Vk7 Sv5hp6VOyuyQeYkX69zv/eRANDzzhiI= Received: from mail-lj1-f200.google.com (mail-lj1-f200.google.com [209.85.208.200]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-435-NDXRQi9tP6CbhpCv7-8PSg-1; Fri, 24 May 2024 12:20:13 -0400 X-MC-Unique: NDXRQi9tP6CbhpCv7-8PSg-1 Received: by mail-lj1-f200.google.com with SMTP id 38308e7fff4ca-2e95a655afcso9532791fa.1 for ; Fri, 24 May 2024 09:20:12 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1716567611; x=1717172411; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=TLcj+G3nZNoagmtde0jJ4iaxwOIbWk0F9rsJ0Ab16Xo=; b=oiEz+isdvhjums6GyQMN4YgWHhc3hrUcjd82+TGX5hGJezvCONWlkPWMV6BoQMPXRs UnNAH4zpIsDRm/kOWDlU/QEtmaeQQ8BslTKEVxb0KYqVsHxnh7q5JnXKrjHTJmIdgAZQ mpi4hcIA1OcYpdepbnaJw8xTMwF71lzplelKY8O3f1tlOEikSV8GrnvclmPY3be2l4Zn sNfNugCnnt1sp720OaLHYXNR3jrDaRngxcD4cKxNGh6DDp5a/dstmEjjY/7oEVJb8DxE 62nh6te6ho1iPLb3IAACGusE6QJ5bt4JgHku+aJ26yElKkUotEO04WsDHBl8E/eMC+lE nEig== X-Gm-Message-State: AOJu0Ywcr1Z+f0NvY4M97dzr+bGQwW7HKQiidt5gFLETnPWso41p207D GGm4dU7Jf5bT+sKE994+uV5reCypCR2aVtaIc47fOfWJHfsqseUwjNJwxbCc95VUA+ylfHYq9un yeyH1kWbCL5hTPnPbeZktsnVJMVmrk4hkNES+RQc8fA9B64LPmAODnelE7hxb8vqjZXFZYtHHnC dW0bi/gBy0d//3qpfJloetJozyi65aXA9pTBY0 X-Received: by 2002:a2e:99c2:0:b0:2df:e0c4:8429 with SMTP id 38308e7fff4ca-2e95b0c22abmr17972361fa.18.1716567611303; Fri, 24 May 2024 09:20:11 -0700 (PDT) X-Google-Smtp-Source: AGHT+IEIp+sB78Wq0yxv4KckkYT9zFXSySJ/vu/klLKAh3rH0QUHLdg/OM0+CGPF9EKh8pdoAo3+jQ== X-Received: by 2002:a2e:99c2:0:b0:2df:e0c4:8429 with SMTP id 38308e7fff4ca-2e95b0c22abmr17972071fa.18.1716567610726; Fri, 24 May 2024 09:20:10 -0700 (PDT) Received: from avogadro.local ([151.95.155.52]) by smtp.gmail.com with ESMTPSA id 38308e7fff4ca-2e95bcd73acsm2539511fa.29.2024.05.24.09.20.09 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 24 May 2024 09:20:09 -0700 (PDT) From: Paolo Bonzini To: qemu-devel@nongnu.org Subject: [PATCH 1/5] meson: remove unnecessary reference to libm Date: Fri, 24 May 2024 18:20:01 +0200 Message-ID: <20240524162006.1271778-2-pbonzini@redhat.com> X-Mailer: git-send-email 2.45.1 In-Reply-To: <20240524162006.1271778-1-pbonzini@redhat.com> References: <20240524162006.1271778-1-pbonzini@redhat.com> MIME-Version: 1.0 Received-SPF: pass client-ip=170.10.129.124; envelope-from=pbonzini@redhat.com; helo=us-smtp-delivery-124.mimecast.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, DKIMWL_WL_HIGH=-0.001, 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_H4=0.001, RCVD_IN_MSPIKE_WL=0.001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham 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 libm is linked into all targets via libqemuutil, no need to specify it explicitly. Signed-off-by: Paolo Bonzini --- block/meson.build | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/block/meson.build b/block/meson.build index e1f03fd773e..8993055c75e 100644 --- a/block/meson.build +++ b/block/meson.build @@ -110,7 +110,7 @@ foreach m : [ [blkio, 'blkio', files('blkio.c')], [curl, 'curl', files('curl.c')], [glusterfs, 'gluster', files('gluster.c')], - [libiscsi, 'iscsi', [files('iscsi.c'), libm]], + [libiscsi, 'iscsi', files('iscsi.c')], [libnfs, 'nfs', files('nfs.c')], [libssh, 'ssh', files('ssh.c')], [rbd, 'rbd', files('rbd.c')], From patchwork Fri May 24 16:20:02 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Paolo Bonzini X-Patchwork-Id: 13673298 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 5DF9CC25B74 for ; Fri, 24 May 2024 16:21:59 +0000 (UTC) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1sAXea-0005wb-06; Fri, 24 May 2024 12:20:24 -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 1sAXeY-0005wI-NS for qemu-devel@nongnu.org; Fri, 24 May 2024 12:20:22 -0400 Received: from us-smtp-delivery-124.mimecast.com ([170.10.133.124]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1sAXeU-0006vm-5J for qemu-devel@nongnu.org; Fri, 24 May 2024 12:20:21 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1716567617; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=3sEk1rvH/evWwEYWhEaFKw6+w0WamReoUwldQRZvSf0=; b=Hn7KC7hximljcVlI73cwa6txrbSYBwLDfyEcU/U6Za5d4IazT1N5bXYkt0YbZ15/Ws62Oh rGMLrjer0AtftyRBCeRyVKuHRNR/wlvvq2r6/IjtsLHE1aCYw3/jZO9HTzW7rTwwVJY79M p8WPOmCX5N6jt5G7ff5bWI352fSZ/OI= Received: from mail-lj1-f200.google.com (mail-lj1-f200.google.com [209.85.208.200]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-208-c0z-iDnKOtqtjw41pIrGwg-1; Fri, 24 May 2024 12:20:15 -0400 X-MC-Unique: c0z-iDnKOtqtjw41pIrGwg-1 Received: by mail-lj1-f200.google.com with SMTP id 38308e7fff4ca-2e95ad43e9fso7624411fa.2 for ; Fri, 24 May 2024 09:20:15 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1716567613; x=1717172413; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=3sEk1rvH/evWwEYWhEaFKw6+w0WamReoUwldQRZvSf0=; b=ZzhlD/y1ESYx//S1aQiSUG6OFnJd9GQAddCmlBXPJRg9m0d56pZ5qYt5J/RD/+3SoG aK9Ae7PjXBwOQXz1wbiEc9hK6dBpGf/4wSptsf0QmAX2k0meZyc698Sf61TKCFDd5ZLt t65tAP1wNE+FiKgY3b/95oDhV8Tev5/jn7iqDCa0b2ffIlo/Cuk9T0rOsKB8UAdzeYHL FFFCV3vD7hyl9T15coStmlzgaz/pLhLneh1P6y8jTXQlW/omVgUSKmiKh5rh5WOghI1U dc9A2ALt623jZVRkxVRXYz2IYyyb8GrQvCe/PinSGCTSNtIY2/apkfGK/I8bTujaYh+U U/Ow== X-Gm-Message-State: AOJu0YzNvz/hbYeQpC/goWScCWs9Mr+DllM1tFgT3CwG2h3UUXMEbl6R qR+fqD0jryES+frUIp9DRKbsUIpLy66MH/2ItrWd6FiYu/gJbZzIHc1g838NMs/gopfXsLpF4AS 426GGmH5NjTAaiC6E0BD8+4wrDJCXwdljTg83C6Ts/2M0d5uSS3LDs0Bwya/JdV9PS+15xhwmOP m2bMTglHVBwKctsBMb3Jo/qSjHf8SA/wmYs1Yp X-Received: by 2002:a05:6512:10cc:b0:523:7f19:cb44 with SMTP id 2adb3069b0e04-52965198b94mr2382400e87.29.1716567613560; Fri, 24 May 2024 09:20:13 -0700 (PDT) X-Google-Smtp-Source: AGHT+IH7Wl5brTiOmcL4b/xr3ZIj6Q24X7XAWmo2DUrBCiyMxyHS7qJxQVpxFbha3pUpPeT3jj7Mww== X-Received: by 2002:a05:6512:10cc:b0:523:7f19:cb44 with SMTP id 2adb3069b0e04-52965198b94mr2382367e87.29.1716567612963; Fri, 24 May 2024 09:20:12 -0700 (PDT) Received: from avogadro.local ([151.95.155.52]) by smtp.gmail.com with ESMTPSA id 2adb3069b0e04-529716df1c1sm204323e87.304.2024.05.24.09.20.11 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 24 May 2024 09:20:11 -0700 (PDT) From: Paolo Bonzini To: qemu-devel@nongnu.org Subject: [PATCH 2/5] meson: remove unnecessary dependency Date: Fri, 24 May 2024 18:20:02 +0200 Message-ID: <20240524162006.1271778-3-pbonzini@redhat.com> X-Mailer: git-send-email 2.45.1 In-Reply-To: <20240524162006.1271778-1-pbonzini@redhat.com> References: <20240524162006.1271778-1-pbonzini@redhat.com> MIME-Version: 1.0 Received-SPF: pass client-ip=170.10.133.124; envelope-from=pbonzini@redhat.com; helo=us-smtp-delivery-124.mimecast.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, DKIMWL_WL_HIGH=-0.001, 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_H4=0.001, RCVD_IN_MSPIKE_WL=0.001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham 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 The dbus_display1_dep is not really used since all occurrences also request gio independently. Just list the generated sources and drop dbus_display1_dep. Signed-off-by: Paolo Bonzini --- audio/meson.build | 4 ++-- tests/qtest/meson.build | 2 +- ui/meson.build | 5 ++--- 3 files changed, 5 insertions(+), 6 deletions(-) diff --git a/audio/meson.build b/audio/meson.build index 608f35e6af7..59f0a431d51 100644 --- a/audio/meson.build +++ b/audio/meson.build @@ -30,8 +30,8 @@ endforeach if dbus_display module_ss = ss.source_set() - module_ss.add(when: [gio, dbus_display1_dep, pixman], - if_true: files('dbusaudio.c')) + module_ss.add(when: [gio, pixman], + if_true: [dbus_display1, files('dbusaudio.c')]) audio_modules += {'dbus': module_ss} endif diff --git a/tests/qtest/meson.build b/tests/qtest/meson.build index 86293051dce..b98fae6a6dd 100644 --- a/tests/qtest/meson.build +++ b/tests/qtest/meson.build @@ -354,7 +354,7 @@ if vnc.found() endif if dbus_display - qtests += {'dbus-display-test': [dbus_display1_dep, gio]} + qtests += {'dbus-display-test': [dbus_display1, gio]} endif qtest_executables = {} diff --git a/ui/meson.build b/ui/meson.build index 5d89986b0ee..cfbf29428df 100644 --- a/ui/meson.build +++ b/ui/meson.build @@ -91,8 +91,7 @@ if dbus_display '--interface-prefix', 'org.qemu.', '--c-namespace', 'QemuDBus', '--generate-c-code', '@BASENAME@']) - dbus_display1_dep = declare_dependency(sources: dbus_display1, dependencies: gio) - dbus_ss.add(when: [gio, dbus_display1_dep], + dbus_ss.add(when: gio, if_true: [files( 'dbus-chardev.c', 'dbus-clipboard.c', @@ -100,7 +99,7 @@ if dbus_display 'dbus-error.c', 'dbus-listener.c', 'dbus.c', - ), opengl, gbm, pixman]) + ), opengl, gbm, pixman, dbus_display1]) ui_modules += {'dbus' : dbus_ss} endif From patchwork Fri May 24 16:20:03 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Paolo Bonzini X-Patchwork-Id: 13673294 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 29147C25B74 for ; Fri, 24 May 2024 16:21:05 +0000 (UTC) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1sAXem-00060c-Bi; Fri, 24 May 2024 12:20:36 -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 1sAXel-00060D-0I for qemu-devel@nongnu.org; Fri, 24 May 2024 12:20:35 -0400 Received: from us-smtp-delivery-124.mimecast.com ([170.10.129.124]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1sAXeX-0006wH-AG for qemu-devel@nongnu.org; Fri, 24 May 2024 12:20:34 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1716567619; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=k9B/mifen37RkDdPX/cKKRcV68jn85LxP2cbyY6xOFI=; b=Uco4wlxSBy1mqB6LASPl2vEowJ1L3yPi4w+i89KvxzcqaqY0orukMVkvDaoDv0M3RRvmtg whImTo5n0PR3APvRqbo1qF6VVsOU0RAu5zeEQnczVWuRW01riKnA7Tq+jgRErr6Q7HLtb9 LpPDO/13zEMRnM1Zk8BbBmvZxOlnANo= Received: from mail-lf1-f71.google.com (mail-lf1-f71.google.com [209.85.167.71]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-317-uxyIrGcWNBW5k-EX7Nn_jw-1; Fri, 24 May 2024 12:20:17 -0400 X-MC-Unique: uxyIrGcWNBW5k-EX7Nn_jw-1 Received: by mail-lf1-f71.google.com with SMTP id 2adb3069b0e04-529a2d60e56so277885e87.3 for ; Fri, 24 May 2024 09:20:17 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1716567615; x=1717172415; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=k9B/mifen37RkDdPX/cKKRcV68jn85LxP2cbyY6xOFI=; b=e/emFEvP4vwkrUhY05SqwWRWGry7wvujkiviQFvxdIcdbKdQQQ1b8+X5A8ZTudahBh oyaJzwirvSkxwnqNzCdSrIp0NOWdotXxCqDS/H4jUf0jKXbJ7bnvoyVMRFyoYnSsirvF kXBwXOau2vTEgzOgaclVAh3Wfcp3ribKNsbJOW2zcJNGTtleyjeI5GOkFGJh2dJwOOcx 8bWQ/+ocd/k9AEVrv1xlNI+7K7iSQMIkw0mLapM4nH7ptaB0pF9SZAMKE3hiQMHHV80m dkgz9YlnYeOeE9uTQ7/6A3FPdkKEv3brR61NOWrgeWvL13ZPrGisM0Th8sdgh69ZS0Ax HPbA== X-Gm-Message-State: AOJu0YxbSDeAlMk9E1kMx27jiQbTA8wepSBHOUThTvvZwruGKEyN4fKw B/NpdcbryUy7zcgSUbQ0OrkQw32E8gEHWfYjiuXYSAAb01lQ2hSvx1Tv99m+Tn9pwgaF78gmhXm HKKlUScJ57UE/hLeiaLSeImXk57Z6izzSW0FK671i/CeM1EwB4o4mBzOk8HOEQf/HI4o3ldEirx nahLiQuImljlkg6ziKvebx0JjcgO6dEqm35pLI X-Received: by 2002:a05:6512:3d29:b0:523:70db:7a0f with SMTP id 2adb3069b0e04-529644ec14dmr2490303e87.8.1716567615510; Fri, 24 May 2024 09:20:15 -0700 (PDT) X-Google-Smtp-Source: AGHT+IFmIQu0q+/jhv/Dk10dmXyCJY752VY4bHYXd6vHa12WuY3kDr28hiiMUEa1R9CZlyylQ3z9ag== X-Received: by 2002:a05:6512:3d29:b0:523:70db:7a0f with SMTP id 2adb3069b0e04-529644ec14dmr2490287e87.8.1716567615147; Fri, 24 May 2024 09:20:15 -0700 (PDT) Received: from avogadro.local ([151.95.155.52]) by smtp.gmail.com with ESMTPSA id 2adb3069b0e04-5296e887c03sm204823e87.34.2024.05.24.09.20.13 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 24 May 2024 09:20:14 -0700 (PDT) From: Paolo Bonzini To: qemu-devel@nongnu.org Subject: [PATCH 3/5] tcg: include dependencies in static_library() Date: Fri, 24 May 2024 18:20:03 +0200 Message-ID: <20240524162006.1271778-4-pbonzini@redhat.com> X-Mailer: git-send-email 2.45.1 In-Reply-To: <20240524162006.1271778-1-pbonzini@redhat.com> References: <20240524162006.1271778-1-pbonzini@redhat.com> MIME-Version: 1.0 Received-SPF: pass client-ip=170.10.129.124; envelope-from=pbonzini@redhat.com; helo=us-smtp-delivery-124.mimecast.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, DKIMWL_WL_HIGH=-0.001, 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 autolearn=ham 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 This ensures that for example libffi can be reached even if it is not in /usr/include. Signed-off-by: Paolo Bonzini --- tcg/meson.build | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/tcg/meson.build b/tcg/meson.build index 8251589fd4e..ffbe754d8b3 100644 --- a/tcg/meson.build +++ b/tcg/meson.build @@ -32,19 +32,19 @@ tcg_ss = tcg_ss.apply({}) libtcg_user = static_library('tcg_user', tcg_ss.sources() + genh, name_suffix: 'fa', + dependencies: tcg_ss.dependencies(), c_args: '-DCONFIG_USER_ONLY', build_by_default: false) -tcg_user = declare_dependency(link_with: libtcg_user, - dependencies: tcg_ss.dependencies()) +tcg_user = declare_dependency(link_with: libtcg_user) user_ss.add(tcg_user) libtcg_system = static_library('tcg_system', tcg_ss.sources() + genh, name_suffix: 'fa', + dependencies: tcg_ss.dependencies(), c_args: '-DCONFIG_SOFTMMU', build_by_default: false) -tcg_system = declare_dependency(link_with: libtcg_system, - dependencies: tcg_ss.dependencies()) +tcg_system = declare_dependency(link_with: libtcg_system) system_ss.add(tcg_system) From patchwork Fri May 24 16:20:04 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Paolo Bonzini X-Patchwork-Id: 13673295 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 45D16C41513 for ; Fri, 24 May 2024 16:21:05 +0000 (UTC) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1sAXef-0005z2-Uu; Fri, 24 May 2024 12:20: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 1sAXee-0005yA-1H for qemu-devel@nongnu.org; Fri, 24 May 2024 12:20:28 -0400 Received: from us-smtp-delivery-124.mimecast.com ([170.10.133.124]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1sAXeW-0006wc-Oa for qemu-devel@nongnu.org; Fri, 24 May 2024 12:20:27 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1716567620; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=DrQKXlw5u4HCxCSjJA+nYUSNZLIT05jc7Oc0v9l+ebg=; b=WKRgoj3d2dvzuu80uUiSLV/jCkG+YuBKHtqtbtnsQ80KH50f4o+HEAmE3eF+dA7Hp81IUq zJW8bKMoZ0yQuFTv6ap/iFgY3mn/FgGVjoRiTxm/sYkofytESwkpcasUKfEFrT+opnyH2H 6/ITd7Bl5BdReZre/CJKwbU7oiz67f4= Received: from mail-ed1-f72.google.com (mail-ed1-f72.google.com [209.85.208.72]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-466-rvF5T6eWMM-bmBlk08XUqQ-1; Fri, 24 May 2024 12:20:18 -0400 X-MC-Unique: rvF5T6eWMM-bmBlk08XUqQ-1 Received: by mail-ed1-f72.google.com with SMTP id 4fb4d7f45d1cf-5785f772d8dso430017a12.1 for ; Fri, 24 May 2024 09:20:18 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1716567617; x=1717172417; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=DrQKXlw5u4HCxCSjJA+nYUSNZLIT05jc7Oc0v9l+ebg=; b=rZRa3Ol9ZZIpBRgfejOYEX2pIUPZmbTkAPRtyRW31m9f6SYtcDyHDseWqdFexpnCfh TZlV6PI1rQ89EHfpqUbiSBJSZ+XsUsVmILvJHORqQ2lNBgJFn7DHYoY919Kj44qiSQfm eH1U/0vFGIcJOOWuWq+lvtuxEdCOA+aCmwQa12CV5yqvY31I6/MqFhErz1BTu2J9uct3 745g+9LPdu66eZVCcIoPSaJ3ePeEQ53yKDlREFR7O1GoHs2e4vaZ96xp6T9g2WgfykoW Bikp4v0pHIgCCf2PG0gSDneWqSHaXjlEvclzT/4Yak8YAgz3xLHKEwL6FZrDOrWjBMsL kXdw== X-Gm-Message-State: AOJu0YyQl4ma7Ms98weviuJatzvDMIF+Yz+fbVB1EKjZWMudPfcT6EqT GC8nprBZzQCDQ0CriCiQJ23UtChCTHN5gX4ShinZETC2bjJzAA0sSRnuWk4yOr9kRl1cRHiLO+n 0QbXErLkdVag+ME3sRbx7DglMkb0zr8LLrDY8Yy4YJCklnSJ/Q6gRwiEKiPlcpLh6Npt2MSY6z7 LSxpyzR/jzUgxyOio5+7XPQU1YiEAwBJLXYOxg X-Received: by 2002:a50:a683:0:b0:578:55a3:8b52 with SMTP id 4fb4d7f45d1cf-57855a3a941mr1368867a12.8.1716567616704; Fri, 24 May 2024 09:20:16 -0700 (PDT) X-Google-Smtp-Source: AGHT+IGoQQpn9GSvcfwcZlcJXNj2JGUkkeXR8c39gBT9Eo9kg9kb+gMWq3GHw79h0beftnvLmWr1qw== X-Received: by 2002:a50:a683:0:b0:578:55a3:8b52 with SMTP id 4fb4d7f45d1cf-57855a3a941mr1368849a12.8.1716567616187; Fri, 24 May 2024 09:20:16 -0700 (PDT) Received: from avogadro.local ([151.95.155.52]) by smtp.gmail.com with ESMTPSA id 4fb4d7f45d1cf-57852495debsm1904740a12.69.2024.05.24.09.20.15 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 24 May 2024 09:20:15 -0700 (PDT) From: Paolo Bonzini To: qemu-devel@nongnu.org Subject: [PATCH 4/5] meson: do not query modules before they are processed Date: Fri, 24 May 2024 18:20:04 +0200 Message-ID: <20240524162006.1271778-5-pbonzini@redhat.com> X-Mailer: git-send-email 2.45.1 In-Reply-To: <20240524162006.1271778-1-pbonzini@redhat.com> References: <20240524162006.1271778-1-pbonzini@redhat.com> MIME-Version: 1.0 Received-SPF: pass client-ip=170.10.133.124; envelope-from=pbonzini@redhat.com; helo=us-smtp-delivery-124.mimecast.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, DKIMWL_WL_HIGH=-0.001, 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_H4=0.001, RCVD_IN_MSPIKE_WL=0.001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham 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 Signed-off-by: Paolo Bonzini --- block/meson.build | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/block/meson.build b/block/meson.build index 8993055c75e..158dc3b89db 100644 --- a/block/meson.build +++ b/block/meson.build @@ -119,7 +119,7 @@ foreach m : [ module_ss = ss.source_set() module_ss.add(when: m[0], if_true: m[2]) if enable_modules - modsrc += module_ss.all_sources() + modsrc += m[2] endif block_modules += {m[1] : module_ss} endif From patchwork Fri May 24 16:20:05 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Paolo Bonzini X-Patchwork-Id: 13673296 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 6894FC25B74 for ; Fri, 24 May 2024 16:21:29 +0000 (UTC) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1sAXeb-0005xn-NP; Fri, 24 May 2024 12:20:25 -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 1sAXea-0005wq-5Y for qemu-devel@nongnu.org; Fri, 24 May 2024 12:20:24 -0400 Received: from us-smtp-delivery-124.mimecast.com ([170.10.129.124]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1sAXeY-0006xs-82 for qemu-devel@nongnu.org; Fri, 24 May 2024 12:20:23 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1716567621; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=T19z2VhLiDxwW2xj7PM4ylgGCJRFuMIgK7muAk4JXtI=; b=Y9xkXRl4kVv9+0SdOgvVgMZp1LJmoXs5kF0vYtePoWJRWJhszYjAiVgiu7nXqwCWoTVpDm qUROygjakqBZSAHlq4TR3lEPNkS2r0VE1KbEfLoXK9MrefVAzb5Yv6fGrp+mdc59c6XJjy 1ggksA4QrBltjY84To9Ylv+4HGf0KFk= Received: from mail-ed1-f71.google.com (mail-ed1-f71.google.com [209.85.208.71]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-633-6fOOeuNVPi-FBENPdMDkJg-1; Fri, 24 May 2024 12:20:20 -0400 X-MC-Unique: 6fOOeuNVPi-FBENPdMDkJg-1 Received: by mail-ed1-f71.google.com with SMTP id 4fb4d7f45d1cf-5785ef2b57aso453378a12.0 for ; Fri, 24 May 2024 09:20:19 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1716567618; x=1717172418; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=T19z2VhLiDxwW2xj7PM4ylgGCJRFuMIgK7muAk4JXtI=; b=bt0edpmFLnrAGJsaW/y8cHWFaaVdn7vLJL6Q/2p3nk7oE2m6eU2VhHrJzoKUeU2QfZ qZzIYmOBdHH+EL0F1YsxYYZVQaAirBM5asu+/WXnNNbELz7DQ0wwEbFWI6tI0qo9sY+4 H8CkHJtuAqcpMKyzfHa+4o6aUIDl2G4CJXO40kPxgpgE0vygWmZbk+Uzq3KOxBNFu9a+ 5KqQd1mFPDd2ohEJHN9oeNxpD86eWNdwBCVajRbMmRLD94Xu+YJZlbEkrL2Jut19GLCj GD2pms5f0RgD0ZvqEaI1ZSm1XgUg1dgIikMz2kfDtngZVfyWWS5SLpopSLod7BAgsI+W OskA== X-Gm-Message-State: AOJu0YysKGr75PwwH8RE2zjPspH66/5TK8QtFvJKzmO0fmyfNqvWpLff twlaM55JO9Ls61G+wu9GQwF8t8/gjjmZHTAlJMSHJhtvLobZa8N6j90rvYn5ITOi449UOpWj8aW bF4KPJsCTJEO1gksDtAKEYi1ghsvMZhmjmkCPY1nYLxPtiG9jvQsrPXzAORGVINxt4MsWBXPX1L TD9ZWOsT8bIrRt5VjO3+8/ftC7H7W7zSpc8lYg X-Received: by 2002:a50:cd9d:0:b0:574:ffb1:eb52 with SMTP id 4fb4d7f45d1cf-578519c2f4bmr1890066a12.34.1716567618565; Fri, 24 May 2024 09:20:18 -0700 (PDT) X-Google-Smtp-Source: AGHT+IH1pRnOtoHrr+W35yt+VdNT6KX0JJUXAviYnbk2HjkBrALMIiXvUAhkLfepmP3rNAMTYT9lXQ== X-Received: by 2002:a50:cd9d:0:b0:574:ffb1:eb52 with SMTP id 4fb4d7f45d1cf-578519c2f4bmr1890046a12.34.1716567618080; Fri, 24 May 2024 09:20:18 -0700 (PDT) Received: from avogadro.local ([151.95.155.52]) by smtp.gmail.com with ESMTPSA id 4fb4d7f45d1cf-578524b9e80sm1904834a12.85.2024.05.24.09.20.16 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 24 May 2024 09:20:16 -0700 (PDT) From: Paolo Bonzini To: qemu-devel@nongnu.org Subject: [PATCH 5/5] migration: remove unnecessary zlib dependency Date: Fri, 24 May 2024 18:20:05 +0200 Message-ID: <20240524162006.1271778-6-pbonzini@redhat.com> X-Mailer: git-send-email 2.45.1 In-Reply-To: <20240524162006.1271778-1-pbonzini@redhat.com> References: <20240524162006.1271778-1-pbonzini@redhat.com> MIME-Version: 1.0 Received-SPF: pass client-ip=170.10.129.124; envelope-from=pbonzini@redhat.com; helo=us-smtp-delivery-124.mimecast.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, DKIMWL_WL_HIGH=-0.001, 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_H4=0.001, RCVD_IN_MSPIKE_WL=0.001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham 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 zlib code is only used by the emulators, not by the tests. Signed-off-by: Paolo Bonzini --- meson.build | 2 +- migration/dirtyrate.c | 1 - migration/qemu-file.c | 1 - migration/meson.build | 2 +- 4 files changed, 2 insertions(+), 4 deletions(-) diff --git a/meson.build b/meson.build index 7fd82b5f48c..63866071445 100644 --- a/meson.build +++ b/meson.build @@ -3696,7 +3696,7 @@ libmigration = static_library('migration', sources: migration_files + genh, name_suffix: 'fa', build_by_default: false) migration = declare_dependency(link_with: libmigration, - dependencies: [zlib, qom, io]) + dependencies: [qom, io]) system_ss.add(migration) block_ss = block_ss.apply({}) diff --git a/migration/dirtyrate.c b/migration/dirtyrate.c index d02d70b7b4b..1d9db812990 100644 --- a/migration/dirtyrate.c +++ b/migration/dirtyrate.c @@ -12,7 +12,6 @@ #include "qemu/osdep.h" #include "qemu/error-report.h" -#include #include "hw/core/cpu.h" #include "qapi/error.h" #include "exec/ramblock.h" diff --git a/migration/qemu-file.c b/migration/qemu-file.c index 9ccbbb00991..b6d2f588bd7 100644 --- a/migration/qemu-file.c +++ b/migration/qemu-file.c @@ -22,7 +22,6 @@ * THE SOFTWARE. */ #include "qemu/osdep.h" -#include #include "qemu/madvise.h" #include "qemu/error-report.h" #include "qemu/iov.h" diff --git a/migration/meson.build b/migration/meson.build index 8815f808374..bdc3244bce0 100644 --- a/migration/meson.build +++ b/migration/meson.build @@ -29,7 +29,7 @@ system_ss.add(files( 'socket.c', 'tls.c', 'threadinfo.c', -), gnutls) +), gnutls, zlib) if get_option('replication').allowed() system_ss.add(files('colo-failover.c', 'colo.c'))