From nobody Fri May 17 05:16:04 2024 Delivered-To: importer2@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+importer2=patchew.org@nongnu.org; dmarc=pass(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1712591662; cv=none; d=zohomail.com; s=zohoarc; b=VAl70Im/nAd7PeJHmNhuoao7RS3s50zlCyL3QNGxrGHxfF7B/eGPnasp55O7s+uVOkaSkkkn7V3P/G5TUiCKQY6aRor/iUsZBkXm3Bp+kXBDyPIar9Urize9CLvLwDiTbffl7sPzBurD8vleOQqmhVhRNhVNTWOgoocA9mVabDg= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1712591662; h=Content-Type:Content-Transfer-Encoding:Cc:Cc:Date:Date:From:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:Subject:To:To:Message-Id:Reply-To; bh=tON+RxlIcOKUvuNbAsvnQBYFFWkRj/k0UEnvjOdoODI=; b=iFp0n+SuxBD7W7QT8dGL9n4mHn3pbkHk5DtheEOjNt2Lx4LVuqt7mqx86UbL440vI2luFkwy9WMe5AVO3ERn1hKLRAphuJmDh1rrGA8pgesGc9zUkPuS/84W4kfF8KgflVZT6jeKj5uD3JhhTF0Bu22SPwjPtJtsSRx3MpoF2sc= 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+importer2=patchew.org@nongnu.org; dmarc=pass header.from= (p=none dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 171259166299084.67552085673174; Mon, 8 Apr 2024 08:54:22 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1rtrJf-0001BT-86; Mon, 08 Apr 2024 11:53:51 -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 1rtrJZ-0001AT-13 for qemu-devel@nongnu.org; Mon, 08 Apr 2024 11:53:47 -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 1rtrJV-0001mD-I9 for qemu-devel@nongnu.org; Mon, 08 Apr 2024 11:53:43 -0400 Received: from mail-lj1-f198.google.com (mail-lj1-f198.google.com [209.85.208.198]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-340--O6dlww6Pm-krDbhPnpXmQ-1; Mon, 08 Apr 2024 11:53:39 -0400 Received: by mail-lj1-f198.google.com with SMTP id 38308e7fff4ca-2d87dad1640so14922911fa.3 for ; Mon, 08 Apr 2024 08:53:39 -0700 (PDT) Received: from avogadro.local ([151.95.152.232]) by smtp.gmail.com with ESMTPSA id l13-20020a05600c4f0d00b004167071617dsm4119939wmq.9.2024.04.08.08.53.34 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 08 Apr 2024 08:53:34 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1712591620; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=tON+RxlIcOKUvuNbAsvnQBYFFWkRj/k0UEnvjOdoODI=; b=KeLaRSLKdFFl5tTkNG4XpInQhHVtPNXjOAUqz54GaQ16Wmvths6tOUbT3QnSCm6CNx4Izq nfygUGGnmFRLHh4nXaMHxNaTijNet8luy16trF5dm2znTkaSh3RaSer69EERb2FOCLXhqW Bf+9UXjB1Bqcjyf6VIOM5DVVFVbkvf8= X-MC-Unique: -O6dlww6Pm-krDbhPnpXmQ-1 X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1712591617; x=1713196417; 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=tON+RxlIcOKUvuNbAsvnQBYFFWkRj/k0UEnvjOdoODI=; b=Er3UqUjuc3eC4yC8A6dohKnJfCx9N9KVI7K78zeMlsrNgErDG5Pp9Y8qgbcZ/1NVov cyq6u6wSrgyrP0kJa1fBhTI5/6IvF7/0g9qLXTTvTmgV5zpPmvimUKjGBpLhHHWT6z2B ICgv4Zyjunv8cUWgeRelvoNePqHypprQlSA4Vx4qzs9iRCx8PR7WkeJIKqTtEL94X1h1 AsQTRWVCHJvdaoP+g6kNokY15U+XImZbzpKrwqYAfl+Yj1QGBd+iIn8HLV9aI+clud3A qV3KNgKCu2VgPkMweW+OFE/t6D791wgYx1XW2UfpkqTDKho+bQPQ0m1nRgJonmFsnLzj xTig== X-Gm-Message-State: AOJu0Yw2uanSWg8/ZVHUbnJ/QAaxlM1Du3Pjs5H2Xe808EFzu3MqENPK 847TbtXuqEfRb8Cll/7bCPRMAD7zxl3THYHw5q/3qkxP1IVmrrHfn4ub4KkfQ0HyvN6OB0Cb4rY BibVulGfSdA6RZoO8sfaFyUpVAvrUj68MW+c6TScMYIYeV7n8dVGjffFa2R7SahBrLUwyBW/UpP Xa4+pJAti2agoe14A24svEqfMHQV8mQWtrX4wv X-Received: by 2002:a2e:8695:0:b0:2d8:7200:38ff with SMTP id l21-20020a2e8695000000b002d8720038ffmr4902604lji.24.1712591616829; Mon, 08 Apr 2024 08:53:36 -0700 (PDT) X-Google-Smtp-Source: AGHT+IEv+THxP+7lnUNqhkV3MzBGQ4Z7GqCw+HPCw9hv6w5tCj91zmuJAIZP6vv+CWi9SNtYl3nKwA== X-Received: by 2002:a2e:8695:0:b0:2d8:7200:38ff with SMTP id l21-20020a2e8695000000b002d8720038ffmr4902594lji.24.1712591616384; Mon, 08 Apr 2024 08:53:36 -0700 (PDT) From: Paolo Bonzini To: qemu-devel@nongnu.org Cc: philmd@linaro.org Subject: [PATCH v2 01/18] meson: do not link pixman automatically into all targets Date: Mon, 8 Apr 2024 17:53:13 +0200 Message-ID: <20240408155330.522792-2-pbonzini@redhat.com> X-Mailer: git-send-email 2.44.0 In-Reply-To: <20240408155330.522792-1-pbonzini@redhat.com> References: <20240408155330.522792-1-pbonzini@redhat.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable 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+importer2=patchew.org@nongnu.org; helo=lists.gnu.org; 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: -35 X-Spam_score: -3.6 X-Spam_bar: --- X-Spam_report: (-3.6 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-1.494, 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+importer2=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer2=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @redhat.com) X-ZM-MESSAGEID: 1712591663707100003 Content-Type: text/plain; charset="utf-8" The dependency on pixman is listed manually in all sourcesets that need it. There is no need to bring into libqemuutil, since there is nothing in util/ that needs pixman either. Reported-by: Michael Tokarev Signed-off-by: Paolo Bonzini Reviewed-by: Richard Henderson --- meson.build | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meson.build b/meson.build index c9c3217ba4b..09668e3c5f5 100644 --- a/meson.build +++ b/meson.build @@ -3477,7 +3477,7 @@ util_ss =3D util_ss.apply({}) libqemuutil =3D static_library('qemuutil', build_by_default: false, sources: util_ss.sources() + stub_ss.sources(= ) + genh, - dependencies: [util_ss.dependencies(), libm, = threads, glib, socket, malloc, pixman]) + dependencies: [util_ss.dependencies(), libm, = threads, glib, socket, malloc]) qemuutil =3D declare_dependency(link_with: libqemuutil, sources: genh + version_res, dependencies: [event_loop_base]) --=20 2.44.0 From nobody Fri May 17 05:16:04 2024 Delivered-To: importer2@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+importer2=patchew.org@nongnu.org; dmarc=pass(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1712591899; cv=none; d=zohomail.com; s=zohoarc; b=UwTQAcn9Uoj8hl5OG8N8TO7v/rTF8+8dN9Deg9sDc/+8+JRLw8YWscbqWVa2vgre9qcOEHYrlB9H2mOfLwgvIhRTWlQfHMz8J9dH9UAvmF4sHA8fciLYS0weNvdSovwo/YKAbJf+o3oS0/O31rE0/07+QPeXKqkdw8xvyvvSIQo= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1712591899; h=Content-Type:Content-Transfer-Encoding:Cc:Cc:Date:Date:From:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:Subject:To:To:Message-Id:Reply-To; bh=GE4i1kGwr7qusquI2eygxfjfNDhcy764/NdO3lS1rJo=; b=PjI5KWLIY2aG47EpYV/yYYZgC37pKTOZmmNUak5zelpn1OrghvRbqcHJnOCqP+wRpwlkO81zVqDhte0tF8TA4b6hTBpghMB/pBQhYd5cbXv4RX10vb0EBR+jhVDrj+WcuugEebdLupbTJ58VlUp2FZh6S0JnN50Sub+O9u6TJGU= 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+importer2=patchew.org@nongnu.org; dmarc=pass header.from= (p=none dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1712591899312401.4274959768853; Mon, 8 Apr 2024 08:58:19 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1rtrJu-0001FL-2v; Mon, 08 Apr 2024 11:54:06 -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 1rtrJb-0001Av-Hd for qemu-devel@nongnu.org; Mon, 08 Apr 2024 11:53:47 -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 1rtrJX-0001mI-8j for qemu-devel@nongnu.org; Mon, 08 Apr 2024 11:53:45 -0400 Received: from mail-wm1-f71.google.com (mail-wm1-f71.google.com [209.85.128.71]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-134-HpvWPshGM6aGw5TKt3nmpw-1; Mon, 08 Apr 2024 11:53:41 -0400 Received: by mail-wm1-f71.google.com with SMTP id 5b1f17b1804b1-416601b0f8dso9892735e9.0 for ; Mon, 08 Apr 2024 08:53:40 -0700 (PDT) Received: from avogadro.local ([151.95.152.232]) by smtp.gmail.com with ESMTPSA id f13-20020a5d64cd000000b00343e97150d6sm8749432wri.32.2024.04.08.08.53.38 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 08 Apr 2024 08:53:38 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1712591622; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=GE4i1kGwr7qusquI2eygxfjfNDhcy764/NdO3lS1rJo=; b=e/FqByBTPOn0hJRdkNl9LYXVnsOpcVtjt9kuXFHiIeOgkFuQS2v67Q3C/0AP3AtzzkB1oj h1KwBMaYY0RsmWWrloVa63D1jpsOiMaBBn2H26ZQnn0dyOY8qtt3UitTkszr2B8ciXhtBV gtQlr66IZu5zevZING/RBfBw36V2npo= X-MC-Unique: HpvWPshGM6aGw5TKt3nmpw-1 X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1712591619; x=1713196419; 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=GE4i1kGwr7qusquI2eygxfjfNDhcy764/NdO3lS1rJo=; b=KnyTRXfDk13aYkcuzEf/Q9CP6C25RAIQ8KooaSCN/nfRPZXuMrUDa7uRy5UgHdmfWP bMYPNnQxnUzYRk4ZP1Yb8azf+8iC2wwWnTtk5PfTkKODIZtPSxkxsi1zGV5XsqHm9Y71 AX9ULj0XY4n2L4lY/6S2srJEH3yXOqrZMkvJqw/GjR0c54SckDjhcF8ZxWuj9dQYk1d1 rEYZJ2XKwN1px5kmDgft97mdeIs5eX0lQ8IbR0e7Sk4olkv3xP0sGkWa2/4VnnqCSWO2 GO8tnyXglxo/5XtOAu6nlJm77AvOVOdOB4VQ06sXpkhfAYMCK4u6XEyU/uPH8+ydr+XW WZhg== X-Gm-Message-State: AOJu0Ywxar3RmBuDGBd2SPZQ+AqHjTBcAHdDU5AQpzatngZ8bRV6qRLb M6Hd60+eH+giGJ1AJL+r/C4p2MeueHVGZD1Mv+eGo3TeSzRPLIWmMkHSSUg8bsmD8Q87LMDVSCP pd8h+18z3WHzjx8zVTxM5ASqO1p+LqlUOBFjjPV5vWqzPUZclJvphe0vCMX5agImHiYEIXj1Zne aKJUk2CO3ZAuFukAJADvg4bANjmKpIY2VMex/d X-Received: by 2002:a05:600c:3552:b0:416:7ab3:4c02 with SMTP id i18-20020a05600c355200b004167ab34c02mr2360367wmq.14.1712591619788; Mon, 08 Apr 2024 08:53:39 -0700 (PDT) X-Google-Smtp-Source: AGHT+IGJknOtKv983rji68a9irVg4mWqzduYF450wABjT3zORD+W9ypQqIg8sx2AQNolniG3wzBrzw== X-Received: by 2002:a05:600c:3552:b0:416:7ab3:4c02 with SMTP id i18-20020a05600c355200b004167ab34c02mr2360351wmq.14.1712591619434; Mon, 08 Apr 2024 08:53:39 -0700 (PDT) From: Paolo Bonzini To: qemu-devel@nongnu.org Cc: philmd@linaro.org Subject: [PATCH v2 02/18] tests: only build plugins if TCG is enabled Date: Mon, 8 Apr 2024 17:53:14 +0200 Message-ID: <20240408155330.522792-3-pbonzini@redhat.com> X-Mailer: git-send-email 2.44.0 In-Reply-To: <20240408155330.522792-1-pbonzini@redhat.com> References: <20240408155330.522792-1-pbonzini@redhat.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable 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+importer2=patchew.org@nongnu.org; helo=lists.gnu.org; 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: -35 X-Spam_score: -3.6 X-Spam_bar: --- X-Spam_report: (-3.6 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-1.494, 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+importer2=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer2=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @redhat.com) X-ZM-MESSAGEID: 1712591900894100003 Content-Type: text/plain; charset="utf-8" There is no way to use them for testing, if all the available accelerators use hardware virtualization. Signed-off-by: Paolo Bonzini Reviewed-by: Philippe Mathieu-Daud=C3=A9 Reviewed-by: Richard Henderson --- tests/meson.build | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/meson.build b/tests/meson.build index 0a6f96f8f84..acb6807094b 100644 --- a/tests/meson.build +++ b/tests/meson.build @@ -78,9 +78,9 @@ subdir('decode') =20 if 'CONFIG_TCG' in config_all_accel subdir('fp') + subdir('plugin') endif =20 -subdir('plugin') subdir('unit') subdir('qapi-schema') subdir('qtest') --=20 2.44.0 From nobody Fri May 17 05:16:04 2024 Delivered-To: importer2@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+importer2=patchew.org@nongnu.org; dmarc=pass(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1712591884; cv=none; d=zohomail.com; s=zohoarc; b=OrVhlqnAJKsO7XcHITgWf03GeubCA8h31KBUe/rLEPfkGn9FZc4V9+eIEnncKe5aKH359bc78vLn0MVWeiWMrsk2HbaBQSU8js1Rz863ZFoct3kM0T14cu9FQmsbl/J3z+rKXc0Q8WziYxxw04LApu78ntuTfr/KNS1EfRS5JMU= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1712591884; h=Content-Type:Content-Transfer-Encoding:Cc:Cc:Date:Date:From:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:Subject:To:To:Message-Id:Reply-To; bh=bTNCByh+icoanj+/ty2qD1fER7UWLq9kG/8oHf0fqoU=; b=Cv+0CgxdlVeAEi7TZq1AkpauxT62Y0SYumlakIqh4pO/c+aDVsRH5n6ci+WmQtyvDWcFdYQoko9au7+JGiGnSD9yEvxMRKYQupA9QZBV1n2HIvWSPvLA9VY/QmyTE3L7U1swg77qBHymuFW0tJzpqg7qLrMMyUoBBBtJKY7Yh1U= 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+importer2=patchew.org@nongnu.org; dmarc=pass header.from= (p=none dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 171259188483787.51387327386044; Mon, 8 Apr 2024 08:58:04 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1rtrJm-0001Dp-4o; Mon, 08 Apr 2024 11:53:58 -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 1rtrJd-0001BU-AT for qemu-devel@nongnu.org; Mon, 08 Apr 2024 11:53:51 -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 1rtrJb-0001mW-C9 for qemu-devel@nongnu.org; Mon, 08 Apr 2024 11:53:48 -0400 Received: from mail-wr1-f71.google.com (mail-wr1-f71.google.com [209.85.221.71]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-26-eFI6fQAyM6-WAiDWF3GDXw-1; Mon, 08 Apr 2024 11:53:45 -0400 Received: by mail-wr1-f71.google.com with SMTP id ffacd0b85a97d-343e74dcf0bso1521176f8f.0 for ; Mon, 08 Apr 2024 08:53:45 -0700 (PDT) Received: from avogadro.local ([151.95.152.232]) by smtp.gmail.com with ESMTPSA id c11-20020adffb4b000000b00345bcb4fdb9sm2606101wrs.16.2024.04.08.08.53.41 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 08 Apr 2024 08:53:41 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1712591626; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-type:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=bTNCByh+icoanj+/ty2qD1fER7UWLq9kG/8oHf0fqoU=; b=C0mV+/DMW9P0L8OhDAOv8zUvF+I4ongeybEDM3/w1RqO0++aJ5HeI9om8GAgBRmlkWJb0K Jl2Da63PWgfglasL/d67tN/8GeszoYodJ467YRLRGfa9bsS/1+Q1XaXawpkCQVtQxHDi6/ cop6EmJTwEvIVHNb2K8m1mSSHZMjvKI= X-MC-Unique: eFI6fQAyM6-WAiDWF3GDXw-1 X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1712591623; x=1713196423; 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=bTNCByh+icoanj+/ty2qD1fER7UWLq9kG/8oHf0fqoU=; b=jQs083wfqF3GDWhEdqc/5mEFhGiF4gflYLQPbVpVCXtN2RFEJziBavR2aQxxs9Po3c Gjm2W4d9RtV92Jx6NCegtpshbbDSRPOP/OsaO0Cn/0SxdfHSqJMV1R/QF4WcxyAGcczz Tz0VAxhKzNXCEwMg8oz1uBhAWi7y5uFkvKeY4NmrR6VzS6fZv3paAJElGbKWdEc2p3Oh a+uz+8NDY7FXSbx+v3cOzdywZHBFmZdBtoCfpMW/VnUull5rAMwRdzW5fKFhgc1qnhMv J0oGMErkDLOisheJ257/WYERaapyEPS6wBViKLe8sh9PDLxqtLAVyZDoyT6gfQWDBxuq p4+w== X-Gm-Message-State: AOJu0YyM/kUL7z9ZBk7QUiPoEv1LYa27txGI67gEGBVz1KZ2LY0gdYri dJxr3yuOctqg2MsTU9UmYRX4OudRjSaxnNt783cDaXe/CeY9/S4p+v1wIlv823lX5LsdVIWd6u4 fXK3hxkZeUxvU6CvPY4LwQgflBToPqykeGpFvlMGZMblp/W+OZigRTDsp/DbikYCjpa9sPNpYqa L/jlekacoTssM+rRDs9IBtU/0UOqRNqegH5kU1 X-Received: by 2002:a5d:4d85:0:b0:343:9308:3af8 with SMTP id b5-20020a5d4d85000000b0034393083af8mr5502123wru.23.1712591622813; Mon, 08 Apr 2024 08:53:42 -0700 (PDT) X-Google-Smtp-Source: AGHT+IFqtoNzjTwyLvP2eD4xLvN5YeRpK3Zisnx1xNn7yJnwIBDyveuK8I7fcNFRVCz/jL+AAoMlEQ== X-Received: by 2002:a5d:4d85:0:b0:343:9308:3af8 with SMTP id b5-20020a5d4d85000000b0034393083af8mr5502111wru.23.1712591622420; Mon, 08 Apr 2024 08:53:42 -0700 (PDT) From: Paolo Bonzini To: qemu-devel@nongnu.org Cc: philmd@linaro.org Subject: [PATCH v2 03/18] ebpf: Restrict to system emulation Date: Mon, 8 Apr 2024 17:53:15 +0200 Message-ID: <20240408155330.522792-4-pbonzini@redhat.com> X-Mailer: git-send-email 2.44.0 In-Reply-To: <20240408155330.522792-1-pbonzini@redhat.com> References: <20240408155330.522792-1-pbonzini@redhat.com> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: quoted-printable 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+importer2=patchew.org@nongnu.org; helo=lists.gnu.org; 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: -35 X-Spam_score: -3.6 X-Spam_bar: --- X-Spam_report: (-3.6 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-1.494, 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+importer2=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer2=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @redhat.com) X-ZM-MESSAGEID: 1712591886872100011 From: Philippe Mathieu-Daud=C3=A9 eBPF is not used in user emulation. Signed-off-by: Philippe Mathieu-Daud=C3=A9 Reviewed-by: Richard Henderson Message-ID: <20240404194757.9343-2-philmd@linaro.org> Signed-off-by: Paolo Bonzini --- ebpf/meson.build | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ebpf/meson.build b/ebpf/meson.build index c5bf9295a20..bff6156f518 100644 --- a/ebpf/meson.build +++ b/ebpf/meson.build @@ -1 +1 @@ -common_ss.add(when: libbpf, if_true: files('ebpf.c', 'ebpf_rss.c'), if_fal= se: files('ebpf_rss-stub.c')) +system_ss.add(when: libbpf, if_true: files('ebpf.c', 'ebpf_rss.c'), if_fal= se: files('ebpf_rss-stub.c')) --=20 2.44.0 From nobody Fri May 17 05:16:04 2024 Delivered-To: importer2@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+importer2=patchew.org@nongnu.org; dmarc=pass(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1712591783; cv=none; d=zohomail.com; s=zohoarc; b=cNX1cEtQiCGPofUX4/yQUyPSOoA2rokpYPrXn9rRPkvGPPAiFkqrtw6vWoHD26S+Oc3QEW0gzj246cibAgaHJ4Joqf3dy1rnmNrAwuJLkUMwbv0bFuODeVmdKzSpNh5UZeZxwlHMI9R/UzEuB9VQ1bT+cHjQpW4CV0cz0nvZ/tc= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1712591783; h=Content-Type:Content-Transfer-Encoding:Cc:Cc:Date:Date:From:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:Subject:To:To:Message-Id:Reply-To; bh=79a7jGvfDO7Nuy6O+o9VgLKVj6InbBKNyoXameAAwIQ=; b=K1qAtsNsN3Nn93qcruPL5OKkNTNudQG2J7TPEQZHDNZZ7k2BsW6ouyCcOg+R9pbjUeIobazvc99+YrAbvwVAgzfUtZkZTRGICeR7U+XKWm2rImYs3qtbpwdAdiqYocquJj38dnD0Z98AymTnKYwrd+mXJJCzgguxO9no4/AAlOg= 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+importer2=patchew.org@nongnu.org; dmarc=pass header.from= (p=none dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 17125917837291012.7241355725262; Mon, 8 Apr 2024 08:56:23 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1rtrJq-0001EW-V0; Mon, 08 Apr 2024 11:54:05 -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 1rtrJf-0001By-Du for qemu-devel@nongnu.org; Mon, 08 Apr 2024 11:53:52 -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 1rtrJd-0001mo-UM for qemu-devel@nongnu.org; Mon, 08 Apr 2024 11:53:51 -0400 Received: from mail-wm1-f70.google.com (mail-wm1-f70.google.com [209.85.128.70]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-386-a8DdXFh_PGKMXwvvuHUxoQ-1; Mon, 08 Apr 2024 11:53:47 -0400 Received: by mail-wm1-f70.google.com with SMTP id 5b1f17b1804b1-4147ddecd52so24119485e9.0 for ; Mon, 08 Apr 2024 08:53:47 -0700 (PDT) Received: from avogadro.local ([151.95.152.232]) by smtp.gmail.com with ESMTPSA id p10-20020a05600c468a00b00415f496b9b7sm14718561wmo.39.2024.04.08.08.53.44 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 08 Apr 2024 08:53:44 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1712591629; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=79a7jGvfDO7Nuy6O+o9VgLKVj6InbBKNyoXameAAwIQ=; b=UuKNv8sGHoFd/ByXu7oxAESSYwqkPD2g8jLivlnjcAhqUnn1Gv/6wHexFqdOYDrlu/Iufz XCGNseYcWMiF4QwTV3UStMT6fiL7jKLVQf1j4gYObMt6A5dcqcc40/jpAkCywYEsDpjikt tJqyGlymPbIpaELNLiWbhXKhLTE9+wg= X-MC-Unique: a8DdXFh_PGKMXwvvuHUxoQ-1 X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1712591626; x=1713196426; 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=79a7jGvfDO7Nuy6O+o9VgLKVj6InbBKNyoXameAAwIQ=; b=MvutPsbw6AUcNIn7cPSKNR9ULejxP0QsHzJ0WnCtL/Mdfw3Ko81XDpPHL8aDHtvSu8 qebpBKlxZVGdzmfBKt8mbH7GbOZ5R5B3mBzPZiFJ/ixV8zc0gsWEr4skQA4YRe+Vpz4v TQDWzwYmqWdlQiwT6SRWLzb4Szjj2guaPdQHxDG0Jt4ScjtVwggBZOt/KuyBjcnsCSOC 55oiuRn8J8vGXzqy4kE3ERcbjkPITKP3DG4yhGaJUe0F1NGlFE7X9fBGQJGju0xLoyTr 25Yi9sjxeMpOTITt0yd4iYn2rfQrEsw8qhOxGT0hDyHMZwRCIQBZj5t7cn5W218rkTh3 ucnw== X-Gm-Message-State: AOJu0Yxl8RtLgOpO0g9USFwZOMrt2luo8+8b3ddk3lQbDwEZL50V+tta WM3gw13pC0OLNkPuUzWX3nlJYAATd5i8lfaSSfKWwxe5ipX48CXDeAJkq82nHgHt22uuKxjQBLE UQ2BVCqHzcmilv0N0YZmbsSkgg+4bSByK/koPRENJKFDJLLqjPuHOVCPL1jwaA2UJSnEaQ+41IM V/ytgIRBsok79leybyNLmPUL2USGCG0X6wk1mF X-Received: by 2002:a05:600c:3511:b0:414:8ffb:a6bf with SMTP id h17-20020a05600c351100b004148ffba6bfmr55862wmq.18.1712591626168; Mon, 08 Apr 2024 08:53:46 -0700 (PDT) X-Google-Smtp-Source: AGHT+IG9pby5yrYOx+zLbgIjZDWptPtSbnwRifWvzgLBkozQM8FYGpk54t/ZE2kLYFfJ+RlAq+BDPQ== X-Received: by 2002:a05:600c:3511:b0:414:8ffb:a6bf with SMTP id h17-20020a05600c351100b004148ffba6bfmr55850wmq.18.1712591625914; Mon, 08 Apr 2024 08:53:45 -0700 (PDT) From: Paolo Bonzini To: qemu-devel@nongnu.org Cc: philmd@linaro.org Subject: [PATCH v2 04/18] tests/unit: match some unit tests to corresponding feature switches Date: Mon, 8 Apr 2024 17:53:16 +0200 Message-ID: <20240408155330.522792-5-pbonzini@redhat.com> X-Mailer: git-send-email 2.44.0 In-Reply-To: <20240408155330.522792-1-pbonzini@redhat.com> References: <20240408155330.522792-1-pbonzini@redhat.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable 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+importer2=patchew.org@nongnu.org; helo=lists.gnu.org; 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: -35 X-Spam_score: -3.6 X-Spam_bar: --- X-Spam_report: (-3.6 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-1.494, 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+importer2=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer2=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @redhat.com) X-ZM-MESSAGEID: 1712591784419100013 Content-Type: text/plain; charset="utf-8" Try not to test code that is not used by user mode emulation, or by the block layer, unless they are being compiled; and fix test-timed-average which was not compiled with --disable-system --enable-tools. This is by no means complete, it only touches the more blatantly wrong cases. Signed-off-by: Paolo Bonzini Reviewed-by: Richard Henderson --- tests/unit/meson.build | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/tests/unit/meson.build b/tests/unit/meson.build index 228a21d03c2..26c109c968c 100644 --- a/tests/unit/meson.build +++ b/tests/unit/meson.build @@ -18,7 +18,6 @@ tests =3D { 'test-forward-visitor': [testqapi], 'test-string-input-visitor': [testqapi], 'test-string-output-visitor': [testqapi], - 'test-opts-visitor': [testqapi], 'test-visitor-serialization': [testqapi], 'test-bitmap': [], 'test-resv-mem': [], @@ -46,12 +45,8 @@ tests =3D { 'test-qemu-opts': [], 'test-keyval': [testqapi], 'test-logging': [], - 'test-uuid': [], - 'ptimer-test': ['ptimer-test-stubs.c', meson.project_source_root() / 'hw= /core/ptimer.c'], 'test-qapi-util': [], 'test-interval-tree': [], - 'test-xs-node': [qom], - 'test-virtio-dmabuf': [meson.project_source_root() / 'hw/display/virtio-= dmabuf.c'], } =20 if have_system or have_tools @@ -97,6 +92,8 @@ if have_block 'test-crypto-ivgen': [io], 'test-crypto-afsplit': [io], 'test-crypto-block': [io], + 'test-timed-average': [], + 'test-uuid': [], } if gnutls.found() and \ tasn1.found() and \ @@ -131,10 +128,13 @@ endif =20 if have_system tests +=3D { + 'ptimer-test': ['ptimer-test-stubs.c', meson.project_source_root() / '= hw/core/ptimer.c'], 'test-iov': [], + 'test-opts-visitor': [testqapi], + 'test-xs-node': [qom], + 'test-virtio-dmabuf': [meson.project_source_root() / 'hw/display/virti= o-dmabuf.c'], 'test-qmp-cmds': [testqapi], 'test-xbzrle': [migration], - 'test-timed-average': [], 'test-util-sockets': ['socket-helpers.c'], 'test-base64': [], 'test-bufferiszero': [], --=20 2.44.0 From nobody Fri May 17 05:16:04 2024 Delivered-To: importer2@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+importer2=patchew.org@nongnu.org; dmarc=pass(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1712591663; cv=none; d=zohomail.com; s=zohoarc; b=a1+40YPCx/pWfSIwlO4UgLWPmwhgVlERX5LR3zpXAZz26NEDWZmZ/c+3T1aPEZu1RuAY3Jw0JZ6zfkl9EfOSlMLmtZuk8Fvz+IUYLf53bov42NCtpkG1KZVt9Om7Bi/UtfLxSxsszWSfb17VQ8sLlYGPL0Hf3AyqVpE6CQ9Cbg8= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1712591663; h=Content-Type:Content-Transfer-Encoding:Cc:Cc:Date:Date:From:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:Subject:To:To:Message-Id:Reply-To; bh=IhGSxJKt87Lk51t1FMaldViRBBvgZjPXp/8O2/Jk8T4=; b=FDCsJyPc3A4OF17C9qQje6ECRu/48fHDvdNNl7DUg0AiwXkDXMlKPEgHClP80pmDDAnSMiPhPZJwBDcLkjkIelkRk0TcYXuTgkI9nruWmnGSIZudIhxJAbk8a+zM/QhuQFzT71LqIwn+52fv/6sTzn4CA9fUkQZbjtH9Sy9W7E4= 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+importer2=patchew.org@nongnu.org; dmarc=pass header.from= (p=none dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1712591663075506.1067014696848; Mon, 8 Apr 2024 08:54:23 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1rtrJn-0001EE-3a; Mon, 08 Apr 2024 11:53:59 -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 1rtrJk-0001Do-GX for qemu-devel@nongnu.org; Mon, 08 Apr 2024 11:53:56 -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 1rtrJi-0001oT-L7 for qemu-devel@nongnu.org; Mon, 08 Apr 2024 11:53:56 -0400 Received: from mail-wm1-f71.google.com (mail-wm1-f71.google.com [209.85.128.71]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-220-IVXSdqe2Phu1NUQbnUR_Bw-1; Mon, 08 Apr 2024 11:53:51 -0400 Received: by mail-wm1-f71.google.com with SMTP id 5b1f17b1804b1-416664de900so9016965e9.2 for ; Mon, 08 Apr 2024 08:53:50 -0700 (PDT) Received: from avogadro.local ([151.95.152.232]) by smtp.gmail.com with ESMTPSA id 5-20020a05600c024500b004161b59e230sm13600253wmj.41.2024.04.08.08.53.47 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 08 Apr 2024 08:53:47 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1712591632; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-type:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=IhGSxJKt87Lk51t1FMaldViRBBvgZjPXp/8O2/Jk8T4=; b=aKwYVOQq/dBNW1kqw4aaytIhLs6jLMd401jKmQayeCW3vu/JU8S2Mmpjk7Pqoat2Y86Dod QxNOcciOHv20fs14PfBQ+oxUbKjA53s/h797kQ5GA06pKv3xAeMzFUHV3UQuuiSyrR86m3 r3CxiIBe0j5qsvKa7rLrBdKNJv66zM4= X-MC-Unique: IVXSdqe2Phu1NUQbnUR_Bw-1 X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1712591628; x=1713196428; 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=IhGSxJKt87Lk51t1FMaldViRBBvgZjPXp/8O2/Jk8T4=; b=F88DbZTdvWkiCUg5o8DITZE2mTCznf8kOzQNjHC6A4RkV6hTiPEEJHC6AjXKc2caH6 5fHFgc3WC3Ix8Zq94epDc5jVP6JfnFr5YsGhW8l13KxnypZadDFPwHpSPpbi2aTUc8Bh T+In518vsBWfoGo6zgMyQewvCkAd7yzMz5wLVESGwZafwqEv4+g3ULQW7WBe6ZaVSSeB rKf+Xa3DROCsG3ZOXkDrF82q57Hrgq+rL4NJbIyImnyilJBFrVoeQyjc/Mr1sZhHS9+r OCCvAb7attmp+yCl3hPtXjjvnls8ExH4qUGyuU7RtL2hUAEZrnCICAnPn0i3jPEk+dNd 8c4A== X-Gm-Message-State: AOJu0YyNXQW6AAWs8n1C/WZV2ZSCGf1SG8Mkl/uzgkJoc6pPhxPbTEQ5 MSEESS4ya6k4RlSricOG4GLmE7VIGhWw7N+Lk/6Esj0Nk39nPUfR+hAsY9cC5/63s3I8NsvH2Hz Tu0AZQM4boyYm6If3p+QDDQOU0lcUnMBzIHYt/SOMJrlOSUsmpRYE7uaK1cUtI10tvtkgxaDfQr V8Fov7+PO+8EPqp5EnltevwK3zf9vqH+jgFsaI X-Received: by 2002:a05:600c:470b:b0:416:6be9:c477 with SMTP id v11-20020a05600c470b00b004166be9c477mr3030468wmo.10.1712591628728; Mon, 08 Apr 2024 08:53:48 -0700 (PDT) X-Google-Smtp-Source: AGHT+IEINZWfJhDokKx3xnRZM1ABWHSaUQpx8PvCCfJtW9YkdTuNYt5at91c8DW6LB0zUmrbG7S3og== X-Received: by 2002:a05:600c:470b:b0:416:6be9:c477 with SMTP id v11-20020a05600c470b00b004166be9c477mr3030456wmo.10.1712591628484; Mon, 08 Apr 2024 08:53:48 -0700 (PDT) From: Paolo Bonzini To: qemu-devel@nongnu.org Cc: philmd@linaro.org Subject: [PATCH v2 05/18] yank: only build if needed Date: Mon, 8 Apr 2024 17:53:17 +0200 Message-ID: <20240408155330.522792-6-pbonzini@redhat.com> X-Mailer: git-send-email 2.44.0 In-Reply-To: <20240408155330.522792-1-pbonzini@redhat.com> References: <20240408155330.522792-1-pbonzini@redhat.com> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: quoted-printable 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+importer2=patchew.org@nongnu.org; helo=lists.gnu.org; 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: -35 X-Spam_score: -3.6 X-Spam_bar: --- X-Spam_report: (-3.6 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-1.494, 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+importer2=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer2=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @redhat.com) X-ZM-MESSAGEID: 1712591663680100001 The yank feature is not used in user emulation. Suggested-by: Philippe Mathieu-Daud=C3=A9 Signed-off-by: Paolo Bonzini Reviewed-by: Philippe Mathieu-Daud=C3=A9 Reviewed-by: Richard Henderson --- util/meson.build | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/util/meson.build b/util/meson.build index 0ef9886be04..2ad57b10ba2 100644 --- a/util/meson.build +++ b/util/meson.build @@ -60,7 +60,6 @@ util_ss.add(files('stats64.c')) util_ss.add(files('systemd.c')) util_ss.add(files('transactions.c')) util_ss.add(files('guest-random.c')) -util_ss.add(files('yank.c')) util_ss.add(files('int128.c')) util_ss.add(files('memalign.c')) util_ss.add(files('interval-tree.c')) @@ -117,6 +116,7 @@ if have_block util_ss.add(files('vfio-helpers.c')) util_ss.add(files('chardev_open.c')) endif + util_ss.add(files('yank.c')) endif =20 if cpu =3D=3D 'aarch64' --=20 2.44.0 From nobody Fri May 17 05:16:04 2024 Delivered-To: importer2@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+importer2=patchew.org@nongnu.org; dmarc=pass(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1712591780; cv=none; d=zohomail.com; s=zohoarc; b=mM2l9V7vFRJRt4oM33py/oNdi4PpyNvPmN0VvecioQs1OXU90CBij8N6wGYHjUpT9cEuwVVGI6t7W2KICgxQiMHdc9ZGgOFyEAlp+UR1XDAEEOaCgKl1DTCSoS3HOKAH+EYOoqsnLi6IUxK+4pS+MgZJArLZcXM1zwUMyZESAwc= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1712591780; h=Content-Type:Content-Transfer-Encoding:Cc:Cc:Date:Date:From:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:Subject:To:To:Message-Id:Reply-To; bh=PmdNwXyiFhUtgfXJMD+Rd+g6jrns/otdMcglTgVPBvU=; b=FldCJJfLyzhqkmZ7pIblDxSXdgQiQxzlxxKj+UaC8fOjc2BOu+NS1GDB0DywFnabG2nCPKZmZalAzEBdIS8mHeWOjacc2d8898uzHR9Ox3yL5zdm6XrNdmGKsCRh7VDK3h6EX/3NwFtpKVRubaJQSJLRTUkm6pYgw8/hFhtjes0= 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+importer2=patchew.org@nongnu.org; dmarc=pass header.from= (p=none dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1712591780369949.4208961706411; Mon, 8 Apr 2024 08:56:20 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1rtrJy-0001IW-Q4; Mon, 08 Apr 2024 11:54:10 -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 1rtrJx-0001HY-12 for qemu-devel@nongnu.org; Mon, 08 Apr 2024 11:54:09 -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 1rtrJk-0001oi-A7 for qemu-devel@nongnu.org; Mon, 08 Apr 2024 11:54:08 -0400 Received: from mail-wm1-f72.google.com (mail-wm1-f72.google.com [209.85.128.72]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-370-iU5ubSLNOOOzsoJbSBhXpg-1; Mon, 08 Apr 2024 11:53:54 -0400 Received: by mail-wm1-f72.google.com with SMTP id 5b1f17b1804b1-4169877bfcdso859285e9.2 for ; Mon, 08 Apr 2024 08:53:54 -0700 (PDT) Received: from avogadro.local ([151.95.152.232]) by smtp.gmail.com with ESMTPSA id k16-20020a05600c1c9000b004166a7afd20sm4684104wms.10.2024.04.08.08.53.50 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 08 Apr 2024 08:53:50 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1712591635; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-type:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=PmdNwXyiFhUtgfXJMD+Rd+g6jrns/otdMcglTgVPBvU=; b=fezFFOs0KQE+xlwNEUKu0DoK6kiIxCHr6k6QVdA5bL9ePQ6knb7ngnjR3ANzlqDEnUznI7 Ni0pWs8VrJ8sNPknbMqt4uIVErO/nv8wbaboItYxjsrvHDCDEqeFjZKnEJzLHbr2Q+GMAr TOJdelNfWagwEIJ/zAwHWV5f5z+wqDw= X-MC-Unique: iU5ubSLNOOOzsoJbSBhXpg-1 X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1712591632; x=1713196432; 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=PmdNwXyiFhUtgfXJMD+Rd+g6jrns/otdMcglTgVPBvU=; b=Pwk3Y949SmNmWDO465olK6rN6xhzh1nySQHfR8ImuRDPzKEzJnCSosZY+BgRHURdmC hsGeYt82QlWS/ODbOQGMTRTaN6ge/MBFc2LQ7GCcnLyCvmSNVDr9ZNpI9ZiVOwNW3L9a aBtIPtxxSC504hWVDsmsLSeD0lyFDOHn1q6jiHdIxir1EFXv7EomOgGjpcvgm4r4Akt1 210HF6wPdXPmpSxC3j8f8GFjB4WnprbvjgNIItGR3KHoJg/3bQraljXGroqLHnngjPmy JaLJARVYCTV5iFg54/dQdQW72PgfX2rKTCH/iN7kPydq8RWWZUU4u1vUAuNq1nEV/HX3 9JVg== X-Gm-Message-State: AOJu0YwTdiCRVBR/IpCTgZgCdXOJr8Q5LUToLYfYTkF3lxmZrt2fMwsZ yfYwhMQx+rp9mUhY6WqIApLdcEq6/bidWWayfSPPURBF6j350pWExzx3BVFH31xiPp/6yRSnzF2 muu2DEw+XJzqx9A93F3LjXfO/FscbOXlfC1JPynxAO0idu05hlbblsQxTs5KPFsfF42LvpReHBl 9aCzPUxbpHnTbVGjB0ZdLr/8NuhIKp8q8UsWsB X-Received: by 2002:a05:600c:4fc2:b0:414:8e02:e432 with SMTP id o2-20020a05600c4fc200b004148e02e432mr7944001wmq.7.1712591632433; Mon, 08 Apr 2024 08:53:52 -0700 (PDT) X-Google-Smtp-Source: AGHT+IGiF/fu6pFNtz4XcgTlwUWCowyzHrQf35l8fNc+RExgGPU3vebHoprON6Gm73M2GfWNeAhUoA== X-Received: by 2002:a05:600c:4fc2:b0:414:8e02:e432 with SMTP id o2-20020a05600c4fc200b004148e02e432mr7943950wmq.7.1712591631205; Mon, 08 Apr 2024 08:53:51 -0700 (PDT) From: Paolo Bonzini To: qemu-devel@nongnu.org Cc: philmd@linaro.org Subject: [PATCH v2 06/18] util/qemu-config: Extract QMP commands to qemu-config-qmp.c Date: Mon, 8 Apr 2024 17:53:18 +0200 Message-ID: <20240408155330.522792-7-pbonzini@redhat.com> X-Mailer: git-send-email 2.44.0 In-Reply-To: <20240408155330.522792-1-pbonzini@redhat.com> References: <20240408155330.522792-1-pbonzini@redhat.com> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: quoted-printable 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+importer2=patchew.org@nongnu.org; helo=lists.gnu.org; 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: -35 X-Spam_score: -3.6 X-Spam_bar: --- X-Spam_report: (-3.6 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-1.494, 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+importer2=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer2=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @redhat.com) X-ZM-MESSAGEID: 1712591782392100011 From: Philippe Mathieu-Daud=C3=A9 QMP is irrelevant for user emulation. Extract the code related to QMP in a different source file, which won't be build for user emulation binaries. This avoid pulling pointless code. Signed-off-by: Philippe Mathieu-Daud=C3=A9 Message-ID: <20240404194757.9343-5-philmd@linaro.org> Signed-off-by: Paolo Bonzini --- include/qemu/config-file.h | 3 + monitor/qemu-config-qmp.c | 206 +++++++++++++++++++++++++++++++++++++ util/qemu-config.c | 204 +----------------------------------- monitor/meson.build | 1 + 4 files changed, 212 insertions(+), 202 deletions(-) create mode 100644 monitor/qemu-config-qmp.c diff --git a/include/qemu/config-file.h b/include/qemu/config-file.h index b82a778123f..51b310fa3b4 100644 --- a/include/qemu/config-file.h +++ b/include/qemu/config-file.h @@ -8,6 +8,9 @@ QemuOptsList *qemu_find_opts(const char *group); QemuOptsList *qemu_find_opts_err(const char *group, Error **errp); QemuOpts *qemu_find_opts_singleton(const char *group); =20 +extern QemuOptsList *vm_config_groups[]; +extern QemuOptsList *drive_config_groups[]; + void qemu_add_opts(QemuOptsList *list); void qemu_add_drive_opts(QemuOptsList *list); int qemu_global_option(const char *str); diff --git a/monitor/qemu-config-qmp.c b/monitor/qemu-config-qmp.c new file mode 100644 index 00000000000..24477a0e448 --- /dev/null +++ b/monitor/qemu-config-qmp.c @@ -0,0 +1,206 @@ +/* SPDX-License-Identifier: GPL-2.0-or-later */ +#include "qemu/osdep.h" +#include "qapi/error.h" +#include "qapi/qapi-commands-misc.h" +#include "qapi/qmp/qlist.h" +#include "qemu/option.h" +#include "qemu/config-file.h" +#include "hw/boards.h" + +static CommandLineParameterInfoList *query_option_descs(const QemuOptDesc = *desc) +{ + CommandLineParameterInfoList *param_list =3D NULL; + CommandLineParameterInfo *info; + int i; + + for (i =3D 0; desc[i].name !=3D NULL; i++) { + info =3D g_malloc0(sizeof(*info)); + info->name =3D g_strdup(desc[i].name); + + switch (desc[i].type) { + case QEMU_OPT_STRING: + info->type =3D COMMAND_LINE_PARAMETER_TYPE_STRING; + break; + case QEMU_OPT_BOOL: + info->type =3D COMMAND_LINE_PARAMETER_TYPE_BOOLEAN; + break; + case QEMU_OPT_NUMBER: + info->type =3D COMMAND_LINE_PARAMETER_TYPE_NUMBER; + break; + case QEMU_OPT_SIZE: + info->type =3D COMMAND_LINE_PARAMETER_TYPE_SIZE; + break; + } + + info->help =3D g_strdup(desc[i].help); + info->q_default =3D g_strdup(desc[i].def_value_str); + + QAPI_LIST_PREPEND(param_list, info); + } + + return param_list; +} + +/* remove repeated entry from the info list */ +static void cleanup_infolist(CommandLineParameterInfoList *head) +{ + CommandLineParameterInfoList *pre_entry, *cur, *del_entry; + + cur =3D head; + while (cur->next) { + pre_entry =3D head; + while (pre_entry !=3D cur->next) { + if (!strcmp(pre_entry->value->name, cur->next->value->name)) { + del_entry =3D cur->next; + cur->next =3D cur->next->next; + del_entry->next =3D NULL; + qapi_free_CommandLineParameterInfoList(del_entry); + break; + } + pre_entry =3D pre_entry->next; + } + cur =3D cur->next; + } +} + +/* merge the description items of two parameter infolists */ +static void connect_infolist(CommandLineParameterInfoList *head, + CommandLineParameterInfoList *new) +{ + CommandLineParameterInfoList *cur; + + cur =3D head; + while (cur->next) { + cur =3D cur->next; + } + cur->next =3D new; +} + +/* access all the local QemuOptsLists for drive option */ +static CommandLineParameterInfoList *get_drive_infolist(void) +{ + CommandLineParameterInfoList *head =3D NULL, *cur; + int i; + + for (i =3D 0; drive_config_groups[i] !=3D NULL; i++) { + if (!head) { + head =3D query_option_descs(drive_config_groups[i]->desc); + } else { + cur =3D query_option_descs(drive_config_groups[i]->desc); + connect_infolist(head, cur); + } + } + cleanup_infolist(head); + + return head; +} + +static CommandLineParameterInfo *objprop_to_cmdline_prop(ObjectProperty *p= rop) +{ + CommandLineParameterInfo *info; + + info =3D g_malloc0(sizeof(*info)); + info->name =3D g_strdup(prop->name); + + if (g_str_equal(prop->type, "bool") || g_str_equal(prop->type, "OnOffA= uto")) { + info->type =3D COMMAND_LINE_PARAMETER_TYPE_BOOLEAN; + } else if (g_str_equal(prop->type, "int")) { + info->type =3D COMMAND_LINE_PARAMETER_TYPE_NUMBER; + } else if (g_str_equal(prop->type, "size")) { + info->type =3D COMMAND_LINE_PARAMETER_TYPE_SIZE; + } else { + info->type =3D COMMAND_LINE_PARAMETER_TYPE_STRING; + } + + if (prop->description) { + info->help =3D g_strdup(prop->description); + } + + return info; +} + +static CommandLineParameterInfoList *query_all_machine_properties(void) +{ + CommandLineParameterInfoList *params =3D NULL, *clpiter; + CommandLineParameterInfo *info; + GSList *machines, *curr_mach; + ObjectPropertyIterator op_iter; + ObjectProperty *prop; + bool is_new; + + machines =3D object_class_get_list(TYPE_MACHINE, false); + assert(machines); + + /* Loop over all machine classes */ + for (curr_mach =3D machines; curr_mach; curr_mach =3D curr_mach->next)= { + object_class_property_iter_init(&op_iter, curr_mach->data); + /* ... and over the properties of each machine: */ + while ((prop =3D object_property_iter_next(&op_iter))) { + if (!prop->set) { + continue; + } + /* + * Check whether the property has already been put into the li= st + * (via another machine class) + */ + is_new =3D true; + for (clpiter =3D params; clpiter !=3D NULL; clpiter =3D clpite= r->next) { + if (g_str_equal(clpiter->value->name, prop->name)) { + is_new =3D false; + break; + } + } + /* If it hasn't been added before, add it now to the list */ + if (is_new) { + info =3D objprop_to_cmdline_prop(prop); + QAPI_LIST_PREPEND(params, info); + } + } + } + + g_slist_free(machines); + + /* Add entry for the "type" parameter */ + info =3D g_malloc0(sizeof(*info)); + info->name =3D g_strdup("type"); + info->type =3D COMMAND_LINE_PARAMETER_TYPE_STRING; + info->help =3D g_strdup("machine type"); + QAPI_LIST_PREPEND(params, info); + + return params; +} + +CommandLineOptionInfoList *qmp_query_command_line_options(const char *opti= on, + Error **errp) +{ + CommandLineOptionInfoList *conf_list =3D NULL; + CommandLineOptionInfo *info; + int i; + + for (i =3D 0; vm_config_groups[i] !=3D NULL; i++) { + if (!option || !strcmp(option, vm_config_groups[i]->name)) { + info =3D g_malloc0(sizeof(*info)); + info->option =3D g_strdup(vm_config_groups[i]->name); + if (!strcmp("drive", vm_config_groups[i]->name)) { + info->parameters =3D get_drive_infolist(); + } else { + info->parameters =3D + query_option_descs(vm_config_groups[i]->desc); + } + QAPI_LIST_PREPEND(conf_list, info); + } + } + + if (!option || !strcmp(option, "machine")) { + info =3D g_malloc0(sizeof(*info)); + info->option =3D g_strdup("machine"); + info->parameters =3D query_all_machine_properties(); + QAPI_LIST_PREPEND(conf_list, info); + } + + if (conf_list =3D=3D NULL) { + error_setg(errp, "invalid option name: %s", option); + } + + return conf_list; +} diff --git a/util/qemu-config.c b/util/qemu-config.c index 42076efe1ef..a90c18dad25 100644 --- a/util/qemu-config.c +++ b/util/qemu-config.c @@ -1,16 +1,14 @@ #include "qemu/osdep.h" #include "block/qdict.h" /* for qdict_extract_subqdict() */ #include "qapi/error.h" -#include "qapi/qapi-commands-misc.h" #include "qapi/qmp/qdict.h" #include "qapi/qmp/qlist.h" #include "qemu/error-report.h" #include "qemu/option.h" #include "qemu/config-file.h" -#include "hw/boards.h" =20 -static QemuOptsList *vm_config_groups[48]; -static QemuOptsList *drive_config_groups[5]; +QemuOptsList *vm_config_groups[48]; +QemuOptsList *drive_config_groups[5]; =20 static QemuOptsList *find_list(QemuOptsList **lists, const char *group, Error **errp) @@ -55,204 +53,6 @@ QemuOpts *qemu_find_opts_singleton(const char *group) return opts; } =20 -static CommandLineParameterInfoList *query_option_descs(const QemuOptDesc = *desc) -{ - CommandLineParameterInfoList *param_list =3D NULL; - CommandLineParameterInfo *info; - int i; - - for (i =3D 0; desc[i].name !=3D NULL; i++) { - info =3D g_malloc0(sizeof(*info)); - info->name =3D g_strdup(desc[i].name); - - switch (desc[i].type) { - case QEMU_OPT_STRING: - info->type =3D COMMAND_LINE_PARAMETER_TYPE_STRING; - break; - case QEMU_OPT_BOOL: - info->type =3D COMMAND_LINE_PARAMETER_TYPE_BOOLEAN; - break; - case QEMU_OPT_NUMBER: - info->type =3D COMMAND_LINE_PARAMETER_TYPE_NUMBER; - break; - case QEMU_OPT_SIZE: - info->type =3D COMMAND_LINE_PARAMETER_TYPE_SIZE; - break; - } - - info->help =3D g_strdup(desc[i].help); - info->q_default =3D g_strdup(desc[i].def_value_str); - - QAPI_LIST_PREPEND(param_list, info); - } - - return param_list; -} - -/* remove repeated entry from the info list */ -static void cleanup_infolist(CommandLineParameterInfoList *head) -{ - CommandLineParameterInfoList *pre_entry, *cur, *del_entry; - - cur =3D head; - while (cur->next) { - pre_entry =3D head; - while (pre_entry !=3D cur->next) { - if (!strcmp(pre_entry->value->name, cur->next->value->name)) { - del_entry =3D cur->next; - cur->next =3D cur->next->next; - del_entry->next =3D NULL; - qapi_free_CommandLineParameterInfoList(del_entry); - break; - } - pre_entry =3D pre_entry->next; - } - cur =3D cur->next; - } -} - -/* merge the description items of two parameter infolists */ -static void connect_infolist(CommandLineParameterInfoList *head, - CommandLineParameterInfoList *new) -{ - CommandLineParameterInfoList *cur; - - cur =3D head; - while (cur->next) { - cur =3D cur->next; - } - cur->next =3D new; -} - -/* access all the local QemuOptsLists for drive option */ -static CommandLineParameterInfoList *get_drive_infolist(void) -{ - CommandLineParameterInfoList *head =3D NULL, *cur; - int i; - - for (i =3D 0; drive_config_groups[i] !=3D NULL; i++) { - if (!head) { - head =3D query_option_descs(drive_config_groups[i]->desc); - } else { - cur =3D query_option_descs(drive_config_groups[i]->desc); - connect_infolist(head, cur); - } - } - cleanup_infolist(head); - - return head; -} - -static CommandLineParameterInfo *objprop_to_cmdline_prop(ObjectProperty *p= rop) -{ - CommandLineParameterInfo *info; - - info =3D g_malloc0(sizeof(*info)); - info->name =3D g_strdup(prop->name); - - if (g_str_equal(prop->type, "bool") || g_str_equal(prop->type, "OnOffA= uto")) { - info->type =3D COMMAND_LINE_PARAMETER_TYPE_BOOLEAN; - } else if (g_str_equal(prop->type, "int")) { - info->type =3D COMMAND_LINE_PARAMETER_TYPE_NUMBER; - } else if (g_str_equal(prop->type, "size")) { - info->type =3D COMMAND_LINE_PARAMETER_TYPE_SIZE; - } else { - info->type =3D COMMAND_LINE_PARAMETER_TYPE_STRING; - } - - if (prop->description) { - info->help =3D g_strdup(prop->description); - } - - return info; -} - -static CommandLineParameterInfoList *query_all_machine_properties(void) -{ - CommandLineParameterInfoList *params =3D NULL, *clpiter; - CommandLineParameterInfo *info; - GSList *machines, *curr_mach; - ObjectPropertyIterator op_iter; - ObjectProperty *prop; - bool is_new; - - machines =3D object_class_get_list(TYPE_MACHINE, false); - assert(machines); - - /* Loop over all machine classes */ - for (curr_mach =3D machines; curr_mach; curr_mach =3D curr_mach->next)= { - object_class_property_iter_init(&op_iter, curr_mach->data); - /* ... and over the properties of each machine: */ - while ((prop =3D object_property_iter_next(&op_iter))) { - if (!prop->set) { - continue; - } - /* - * Check whether the property has already been put into the li= st - * (via another machine class) - */ - is_new =3D true; - for (clpiter =3D params; clpiter !=3D NULL; clpiter =3D clpite= r->next) { - if (g_str_equal(clpiter->value->name, prop->name)) { - is_new =3D false; - break; - } - } - /* If it hasn't been added before, add it now to the list */ - if (is_new) { - info =3D objprop_to_cmdline_prop(prop); - QAPI_LIST_PREPEND(params, info); - } - } - } - - g_slist_free(machines); - - /* Add entry for the "type" parameter */ - info =3D g_malloc0(sizeof(*info)); - info->name =3D g_strdup("type"); - info->type =3D COMMAND_LINE_PARAMETER_TYPE_STRING; - info->help =3D g_strdup("machine type"); - QAPI_LIST_PREPEND(params, info); - - return params; -} - -CommandLineOptionInfoList *qmp_query_command_line_options(const char *opti= on, - Error **errp) -{ - CommandLineOptionInfoList *conf_list =3D NULL; - CommandLineOptionInfo *info; - int i; - - for (i =3D 0; vm_config_groups[i] !=3D NULL; i++) { - if (!option || !strcmp(option, vm_config_groups[i]->name)) { - info =3D g_malloc0(sizeof(*info)); - info->option =3D g_strdup(vm_config_groups[i]->name); - if (!strcmp("drive", vm_config_groups[i]->name)) { - info->parameters =3D get_drive_infolist(); - } else { - info->parameters =3D - query_option_descs(vm_config_groups[i]->desc); - } - QAPI_LIST_PREPEND(conf_list, info); - } - } - - if (!option || !strcmp(option, "machine")) { - info =3D g_malloc0(sizeof(*info)); - info->option =3D g_strdup("machine"); - info->parameters =3D query_all_machine_properties(); - QAPI_LIST_PREPEND(conf_list, info); - } - - if (conf_list =3D=3D NULL) { - error_setg(errp, "invalid option name: %s", option); - } - - return conf_list; -} - QemuOptsList *qemu_find_opts_err(const char *group, Error **errp) { return find_list(vm_config_groups, group, errp); diff --git a/monitor/meson.build b/monitor/meson.build index 5269492cf05..a71523a1ce8 100644 --- a/monitor/meson.build +++ b/monitor/meson.build @@ -4,6 +4,7 @@ system_ss.add(files( 'fds.c', 'hmp-cmds.c', 'hmp.c', + 'qemu-config-qmp.c', )) system_ss.add([spice_headers, files('qmp-cmds.c')]) =20 --=20 2.44.0 From nobody Fri May 17 05:16:04 2024 Delivered-To: importer2@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+importer2=patchew.org@nongnu.org; dmarc=pass(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1712591663; cv=none; d=zohomail.com; s=zohoarc; b=P00+GmeTklS9fb0TlVmft1tUK0upLIggYJ/lbYsOvfJR3+VwJd9dzqOAyu1LEWHyyLIy80cM/5XJNBArnnOXqGkOUhjT90ZQXIJ1Cd1eCUgtFCT0a2QYIxjOVjr/s5Nblkk3ybqn2Uc4LWp93/yBSEm23frBQ1Pc9MYtvQq28JI= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1712591663; h=Content-Type:Content-Transfer-Encoding:Cc:Cc:Date:Date:From:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:Subject:To:To:Message-Id:Reply-To; bh=rJPHrQ8+mHkfrSj8BF/mqVdGQxHQdb/HXh0jjzSiGaA=; b=egQP4ANEbLUaMYF+8mxyoXImuO1WRuLub1ew6ewlK3bl+GVlckdIqXSWuZV9ElnZ+JpX319Md5vjrHxrrsIvyuN8nhWpkrGnEpjj04RSUIDanIhzAHbWUJdArCV3puGGj8vhAt6mdD3Lx12X1aj7dJv0+XN2gpAlw9j7Ql/ahVA= 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+importer2=patchew.org@nongnu.org; dmarc=pass header.from= (p=none dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1712591663114826.7871828189902; Mon, 8 Apr 2024 08:54:23 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1rtrJv-0001Gl-9o; Mon, 08 Apr 2024 11:54:08 -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 1rtrJp-0001FB-Eo for qemu-devel@nongnu.org; Mon, 08 Apr 2024 11:54:02 -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 1rtrJn-0001p1-Ax for qemu-devel@nongnu.org; Mon, 08 Apr 2024 11:54:00 -0400 Received: from mail-wm1-f69.google.com (mail-wm1-f69.google.com [209.85.128.69]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-519-kOQl6fynNaquwfxDkwQyGw-1; Mon, 08 Apr 2024 11:53:57 -0400 Received: by mail-wm1-f69.google.com with SMTP id 5b1f17b1804b1-4140225e68aso23372805e9.1 for ; Mon, 08 Apr 2024 08:53:57 -0700 (PDT) Received: from avogadro.local ([151.95.152.232]) by smtp.gmail.com with ESMTPSA id fl9-20020a05600c0b8900b004167df5ed4bsm2877348wmb.29.2024.04.08.08.53.53 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 08 Apr 2024 08:53:53 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1712591638; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=rJPHrQ8+mHkfrSj8BF/mqVdGQxHQdb/HXh0jjzSiGaA=; b=XSvV66CKkAIKMATkC9MZXq2qoYQVkz+vzkUlJuhcQ4+ktq4Pn+QvNHiIBjrCj4CkLSiMAK fMPH6EVPdgP+SxOrmUD+r4NH44h+y5ql7tLjB4bYYB2taDFSjQjmWk5fFefqVlHf1ysh9k 6XvsbUmDkGVjIszxgL+zVg42703llL0= X-MC-Unique: kOQl6fynNaquwfxDkwQyGw-1 X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1712591635; x=1713196435; 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=rJPHrQ8+mHkfrSj8BF/mqVdGQxHQdb/HXh0jjzSiGaA=; b=jZVTair0QVpiN6/18+V4G5JmlsMunNPdO55UvaliR1lW/eIuv1Ie9kVINpuvnkLnQ3 /mhShsQmMs/fZRv8AR5hmsQ0OmZpTvCuTJF981S02nAX8b7Owh/mSuIZgIa1Zk2M0w+J mH3zEJf7NPlhcN2ern7Obzya2jT1K9NSBlLaPlJXaBfePbRrWevw+SCQtFi9NW1Haj/D 34GJc8QuwhPOqpSEkfHMraq8dCWp7xGupNmv/zCDAyAAguEkZXcaf0MZkXBBKXVoZfFw HrwbsXadrWibiwQfPIelBveqr23/SFSJMAAEMPMJQ81cV09Gf+Zs8HFy5e48uRUxW674 iXdg== X-Gm-Message-State: AOJu0YwlJ2S6Tjr958JWGKv1u9BmSttNyt+XfzLh/+lDFyLuFaAwyIN/ VYNPtXvqpC/3u/enbK+m95fc/84zsYJz7afvjuCcPrtxC7xfqe7ZUnXlfG+vAkg9YKfrfjvuPnn 05RVbIKKchU7eHJXPYdqDSHwn8XypofOIIYAal+RMtGLpLs4I3UYLzZrK53ZlTJWF4KgRYs4jeg QrP9acMwi2aILXVwQDKUYv1/HxEIIMXH9y/ukv X-Received: by 2002:a05:600c:3584:b0:416:4933:c8be with SMTP id p4-20020a05600c358400b004164933c8bemr4374169wmq.28.1712591635491; Mon, 08 Apr 2024 08:53:55 -0700 (PDT) X-Google-Smtp-Source: AGHT+IE5wYFu6MIfTnHU0R6dfjN/UNY4U1z9V1g6U1D7WJVIZAp2DTyo6EMgSNUMnthRVhSOznuEqA== X-Received: by 2002:a05:600c:3584:b0:416:4933:c8be with SMTP id p4-20020a05600c358400b004164933c8bemr4374156wmq.28.1712591635164; Mon, 08 Apr 2024 08:53:55 -0700 (PDT) From: Paolo Bonzini To: qemu-devel@nongnu.org Cc: philmd@linaro.org Subject: [PATCH v2 07/18] hw/core: Move system emulation files to system_ss Date: Mon, 8 Apr 2024 17:53:19 +0200 Message-ID: <20240408155330.522792-8-pbonzini@redhat.com> X-Mailer: git-send-email 2.44.0 In-Reply-To: <20240408155330.522792-1-pbonzini@redhat.com> References: <20240408155330.522792-1-pbonzini@redhat.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable 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+importer2=patchew.org@nongnu.org; helo=lists.gnu.org; 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: -35 X-Spam_score: -3.6 X-Spam_bar: --- X-Spam_report: (-3.6 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-1.494, 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+importer2=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer2=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @redhat.com) X-ZM-MESSAGEID: 1712591663685100002 Content-Type: text/plain; charset="utf-8" hotplug.c, qdev-hotplug.c and reset.c are not used by user emulation and need not be included in hwcore_ss. Move them to system_ss, where they belong, by letting the linker pull in the stubs when needed. Signed-off-by: Paolo Bonzini Reviewed-by: Richard Henderson --- {hw/core =3D> stubs}/hotplug-stubs.c | 0 hw/core/meson.build | 14 +++----------- stubs/meson.build | 1 + 3 files changed, 4 insertions(+), 11 deletions(-) rename {hw/core =3D> stubs}/hotplug-stubs.c (100%) diff --git a/hw/core/hotplug-stubs.c b/stubs/hotplug-stubs.c similarity index 100% rename from hw/core/hotplug-stubs.c rename to stubs/hotplug-stubs.c diff --git a/hw/core/meson.build b/hw/core/meson.build index e26f2e088c3..f20d4143f7a 100644 --- a/hw/core/meson.build +++ b/hw/core/meson.build @@ -3,7 +3,6 @@ hwcore_ss.add(files( 'bus.c', 'qdev-properties.c', 'qdev.c', - 'reset.c', 'resetcontainer.c', 'resettable.c', 'vmstate-if.c', @@ -12,16 +11,6 @@ hwcore_ss.add(files( 'clock.c', 'qdev-clock.c', )) -if have_system - hwcore_ss.add(files( - 'hotplug.c', - 'qdev-hotplug.c', - )) -else - hwcore_ss.add(files( - 'hotplug-stubs.c', - )) -endif =20 common_ss.add(files('cpu-common.c')) common_ss.add(files('machine-smp.c')) @@ -40,6 +29,7 @@ system_ss.add(files( 'cpu-sysemu.c', 'fw-path-provider.c', 'gpio.c', + 'hotplug.c', 'loader.c', 'machine-hmp-cmds.c', 'machine-qmp-cmds.c', @@ -48,7 +38,9 @@ system_ss.add(files( 'null-machine.c', 'numa.c', 'qdev-fw.c', + 'qdev-hotplug.c', 'qdev-properties-system.c', + 'reset.c', 'sysbus.c', 'vm-change-state-handler.c', 'clock-vmstate.c', diff --git a/stubs/meson.build b/stubs/meson.build index 0bf25e6ca53..f87f5c1110f 100644 --- a/stubs/meson.build +++ b/stubs/meson.build @@ -14,6 +14,7 @@ stub_ss.add(files('fdset.c')) stub_ss.add(files('gdbstub.c')) stub_ss.add(files('get-vm-name.c')) stub_ss.add(files('graph-lock.c')) +stub_ss.add(files('hotplug-stubs.c')) if linux_io_uring.found() stub_ss.add(files('io_uring.c')) endif --=20 2.44.0 From nobody Fri May 17 05:16:04 2024 Delivered-To: importer2@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+importer2=patchew.org@nongnu.org; dmarc=pass(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1712591758; cv=none; d=zohomail.com; s=zohoarc; b=iOFzGgO4CWfy53XldAmdx1HiczyIl5BT+8OW3RH6VUcSAn7/fBZdMIReg9ug/5rqRSeEH7fhmxddJ5kJFQon+yrBHvK91kWsWXtr0lhMHXrmzBJZsBTyQXxJVZKzYvn3vPhF32JKXN4gcClTDLdkQCBmYVK9DO2S/nHI77DtI18= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1712591758; h=Content-Type:Content-Transfer-Encoding:Cc:Cc:Date:Date:From:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:Subject:To:To:Message-Id:Reply-To; bh=KbjY7aIuc7IAjQmn1sxXdHMB6cOTkaQOGtjjzsthhOg=; b=AwEc/6mqMh9iTn+QYW0eeOHoapzNG7Kn3iOsZpHcWuD8HHBeCeMSQ/+iEp8JGXan0yL6RkEQirCL4KiDRln1xKSNyFNhGwCFyfw+qFOVxcU79UBBfSGCG6x2GuUsfVYTNgEp+bz4TFC3bivgqSKuOz9N2ttk1U1TyUA2f+nh9Cw= 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+importer2=patchew.org@nongnu.org; dmarc=pass header.from= (p=none dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1712591758933826.0358392257923; Mon, 8 Apr 2024 08:55:58 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1rtrJw-0001H0-5H; Mon, 08 Apr 2024 11:54:08 -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 1rtrJs-0001FQ-Il for qemu-devel@nongnu.org; Mon, 08 Apr 2024 11:54:05 -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 1rtrJq-0001pC-DS for qemu-devel@nongnu.org; Mon, 08 Apr 2024 11:54:04 -0400 Received: from mail-wr1-f70.google.com (mail-wr1-f70.google.com [209.85.221.70]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-613-rytjUqXSMzKbCTNbaScdUQ-1; Mon, 08 Apr 2024 11:54:00 -0400 Received: by mail-wr1-f70.google.com with SMTP id ffacd0b85a97d-33ed489edcaso2739284f8f.3 for ; Mon, 08 Apr 2024 08:53:59 -0700 (PDT) Received: from avogadro.local ([151.95.152.232]) by smtp.gmail.com with ESMTPSA id a4-20020a5d4564000000b00343826878e8sm9251321wrc.38.2024.04.08.08.53.56 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 08 Apr 2024 08:53:57 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1712591641; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-type:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=KbjY7aIuc7IAjQmn1sxXdHMB6cOTkaQOGtjjzsthhOg=; b=VYt3FHRaMnt9G3kNCVjq+bs7lsuxL+HsZa30P6bnBWPdknykHRSX10g3cZvgiOapvvhFOC iUSJYll5Vg4TIx3dlDRRxR8tGFree094uezgwWbYRihSeYvF4dB2zlZp7WJA8Wm19SmEgj Yey3MG6Bbe5pUeegCQszju6rAHkQAu4= X-MC-Unique: rytjUqXSMzKbCTNbaScdUQ-1 X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1712591638; x=1713196438; 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=KbjY7aIuc7IAjQmn1sxXdHMB6cOTkaQOGtjjzsthhOg=; b=sZLrtDdplZGrgmb8JVPZM9pBe+sptfS8B0X/AMyBJUZdoltrXf6KBUkSlsdV/YLg8n 4BjTlB2T14OMLsqhagmzSBYb9fihE/IerOEXsHrFnDANj6mTH056ZpCmGlIu7FZFkAAN 3j97CKcV80bwq26zZS4IjLBI1LibBgCZjJS2+TQRpU6gxO1oxh0vgTPzMJWMHZBUD1hZ NxFOy+V5fFXWLntE4qgCs/mHqq+remB5JichXWFp6KPxjRzBe9OqXfLWbgH9eeUDdIuv trod6BZHeAstOHoxv519cv/yuUpHBPvVYmkGi2W1RQk3Z+z1dKvHHurRr7wK2F87wE1y Z/Rg== X-Gm-Message-State: AOJu0Yxge0y6qPBiy5Q1tb8bobELr1GYcW/xB3ELQsmEyA4J1FywfYcZ KI9hrrx7WOpUKxDUwcws7Zs3Yfz3TtG5BWEkMPYpgkhqjGzlXJX0Fey8qalfwcNIEucYj77bGsI Oh0PW4qyIK6kde7YVm5qDrN+dm2pfSDs7j7C5HJw7j/T/KAhCwkIzMWex3fhYEUoxZBgJEeiFzd D6y4irydeo1MDbVazbvQOahGlwIOouzuxi3f7F X-Received: by 2002:a05:6000:1864:b0:343:5cac:8d9e with SMTP id d4-20020a056000186400b003435cac8d9emr9600562wri.33.1712591637834; Mon, 08 Apr 2024 08:53:57 -0700 (PDT) X-Google-Smtp-Source: AGHT+IEG3wsTpqOVEkjB3vEbxiXHj89C9rpVnLAII/I72Ouo0SVK3t6lVvEgDVURWOmu+3dLiG2sNw== X-Received: by 2002:a05:6000:1864:b0:343:5cac:8d9e with SMTP id d4-20020a056000186400b003435cac8d9emr9600544wri.33.1712591637524; Mon, 08 Apr 2024 08:53:57 -0700 (PDT) From: Paolo Bonzini To: qemu-devel@nongnu.org Cc: philmd@linaro.org Subject: [PATCH v2 08/18] hw: Include minimal source set in user emulation build Date: Mon, 8 Apr 2024 17:53:20 +0200 Message-ID: <20240408155330.522792-9-pbonzini@redhat.com> X-Mailer: git-send-email 2.44.0 In-Reply-To: <20240408155330.522792-1-pbonzini@redhat.com> References: <20240408155330.522792-1-pbonzini@redhat.com> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: quoted-printable 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+importer2=patchew.org@nongnu.org; helo=lists.gnu.org; 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: -35 X-Spam_score: -3.6 X-Spam_bar: --- X-Spam_report: (-3.6 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-1.494, 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+importer2=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer2=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @redhat.com) X-ZM-MESSAGEID: 1712591760269100003 From: Philippe Mathieu-Daud=C3=A9 Only the files in hwcore_ss[] are required to link a user emulation binary. Have meson process the hw/ sub-directories if system emulation is selected, otherwise directly process hw/core/ to get hwcore_ss[], which is the only set required by user emulation. This removes about 10% from the time needed to run "../configure --disable-system --disable-tools --disable-guest-agent". Signed-off-by: Philippe Mathieu-Daud=C3=A9 Reviewed-by: Richard Henderson Message-ID: <20240404194757.9343-8-philmd@linaro.org> Signed-off-by: Paolo Bonzini --- meson.build | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/meson.build b/meson.build index 09668e3c5f5..e8ac846fc5a 100644 --- a/meson.build +++ b/meson.build @@ -3447,8 +3447,12 @@ subdir('qom') subdir('authz') subdir('crypto') subdir('ui') -subdir('hw') subdir('gdbstub') +if have_system + subdir('hw') +else + subdir('hw/core') +endif =20 if enable_modules libmodulecommon =3D static_library('module-common', files('module-common= .c') + genh, pic: true, c_args: '-DBUILD_DSO') --=20 2.44.0 From nobody Fri May 17 05:16:04 2024 Delivered-To: importer2@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+importer2=patchew.org@nongnu.org; dmarc=pass(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1712591778; cv=none; d=zohomail.com; s=zohoarc; b=jRWVKGF+aYyV7tVEBjkfyDoOY6eur3h+op4iq0ID1Ci4D3LN0B5hXenG6jkOL03ZiO0Dw+nBFy8sVdh2iVioOwDKCGL02Y6Oaujm0BkruV7RcJYccEv5XzpUHk7kZKuCMtG//BNJADiRbLg+MlvGyKxjHoTklyKxz1fIh8QrY6Q= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1712591778; h=Content-Type:Content-Transfer-Encoding:Cc:Cc:Date:Date:From:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:Subject:To:To:Message-Id:Reply-To; bh=hf56ciMuERPF0cEabxiAJBGlTdfq68PH3JYLDVjSE20=; b=IoAw0HdoKl8VpcVdaY6nwkXfm2XyG1+Dk03uOggKwU0lkX+B4nhsMLrqy5VBMTo8SFkvobP/b2Yv7qC+E21PG4qMpQux/zHZ7s/4brnN8GWIqozJf8yXW5uOoY9USnT/lRud8r85ytAgybHot9Pp5a8ky4kCBpmKfrvXECmlQLY= 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+importer2=patchew.org@nongnu.org; dmarc=pass header.from= (p=none dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1712591778203220.01620279185113; Mon, 8 Apr 2024 08:56:18 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1rtrJx-0001HX-2J; Mon, 08 Apr 2024 11:54:09 -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 1rtrJv-0001Gz-Fe for qemu-devel@nongnu.org; Mon, 08 Apr 2024 11:54:08 -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 1rtrJs-0001pL-Jz for qemu-devel@nongnu.org; Mon, 08 Apr 2024 11:54:07 -0400 Received: from mail-wm1-f70.google.com (mail-wm1-f70.google.com [209.85.128.70]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-635-JHq2W5CKNkWCZ9LZtBBIfg-1; Mon, 08 Apr 2024 11:54:02 -0400 Received: by mail-wm1-f70.google.com with SMTP id 5b1f17b1804b1-416542ed388so7208065e9.0 for ; Mon, 08 Apr 2024 08:54:02 -0700 (PDT) Received: from avogadro.local ([151.95.152.232]) by smtp.gmail.com with ESMTPSA id u22-20020a05600c139600b004162b4c6366sm13859642wmf.20.2024.04.08.08.53.59 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 08 Apr 2024 08:53:59 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1712591643; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=hf56ciMuERPF0cEabxiAJBGlTdfq68PH3JYLDVjSE20=; b=jUspRLqFR0xPiF5iioyRakwgWiJu0Ss5webUUxshkVa0tSczDvV6oZFarlVK+aEhyafCuJ SmsIxx0wuI7LCRs7VLjpUggbFco97+nASuikysnEXcc30bPujABk7mxcKOC+edA5dWuu6K b40N6btGL4/SfhAPp8Jfi5W3cpIhROY= X-MC-Unique: JHq2W5CKNkWCZ9LZtBBIfg-1 X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1712591640; x=1713196440; 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=hf56ciMuERPF0cEabxiAJBGlTdfq68PH3JYLDVjSE20=; b=PAnjEQA9JRjzYFMBKi6QMVn91Xxk228zGOqZT9J82EB8VKQRCM6dKnlHWwdqXKsPlK ECsPFMbG/9ZKlVEBVBq4CnnRh6zc+w4b8cTeq3Syaud3Tu2QH1qNB3gD1VoDvfeUCluN HMEjpgtLm5dnUYP0ryfOB0IXXW0wJGd191I6OZTmKbI3Q0jXNn1wUf+UyE/7P6p0H5k+ z1ixou0SGBqkU8tLTq11AJ3y5OZluV6Mk4bh8S2QcNPuV/zBaghB3XHZumv922MUHN3H DSPiPJ8r5+e02hWETZG2hbhzO/bVr1gu1ifqA89PQNy8csYK9dVpmTe3vAfFQ8q0g6rK LHww== X-Gm-Message-State: AOJu0Yys+S4UYn9ZBVYkL9VqM7Wqawyg1eo2GmE/F47xYtsFvl/MGN/V 1jMtYC+46uoUTA5faGgWUlt5XwdosRnw0EpJcg+Hnhxa0ChGUGCZ+xY5A2Imtm/dmAs2wvJQ9o9 Gi6ojYSAahDd8ng5Xwmtaix1aJBDP7T+GVddzRoodvbqJeHRYSN4rG7PkTmuVJOuru+GCjHMEvs tdePKjOup7XoXNt6E1ONF9HKVkPitV6OjpUPmA X-Received: by 2002:a05:600c:3d86:b0:416:7398:8323 with SMTP id bi6-20020a05600c3d8600b0041673988323mr2344710wmb.18.1712591640436; Mon, 08 Apr 2024 08:54:00 -0700 (PDT) X-Google-Smtp-Source: AGHT+IGrzZnaDa0ICHGqM5UaF6A/JmT/3m9PPXJ9IcWiDKdH+UGs937tB8OGXUC/uCZ2TXVglPaeaA== X-Received: by 2002:a05:600c:3d86:b0:416:7398:8323 with SMTP id bi6-20020a05600c3d8600b0041673988323mr2344691wmb.18.1712591640114; Mon, 08 Apr 2024 08:54:00 -0700 (PDT) From: Paolo Bonzini To: qemu-devel@nongnu.org Cc: philmd@linaro.org Subject: [PATCH v2 09/18] stubs: remove obsolete stubs Date: Mon, 8 Apr 2024 17:53:21 +0200 Message-ID: <20240408155330.522792-10-pbonzini@redhat.com> X-Mailer: git-send-email 2.44.0 In-Reply-To: <20240408155330.522792-1-pbonzini@redhat.com> References: <20240408155330.522792-1-pbonzini@redhat.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable 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+importer2=patchew.org@nongnu.org; helo=lists.gnu.org; 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: -35 X-Spam_score: -3.6 X-Spam_bar: --- X-Spam_report: (-3.6 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-1.494, 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+importer2=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer2=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @redhat.com) X-ZM-MESSAGEID: 1712591780375100007 Content-Type: text/plain; charset="utf-8" These file define functions are are not called from common code anymore. Delete those functions and, if applicable, the entire files. Signed-off-by: Paolo Bonzini Acked-by: Richard Henderson --- include/sysemu/sysemu.h | 2 -- stubs/isa-bus.c | 7 ------- stubs/module-opts.c | 2 -- stubs/monitor-core.c | 6 ------ stubs/pci-bus.c | 7 ------- stubs/qdev.c | 6 ------ stubs/qtest.c | 10 ---------- stubs/usb-dev-stub.c | 5 ----- stubs/meson.build | 3 --- 9 files changed, 48 deletions(-) delete mode 100644 stubs/isa-bus.c delete mode 100644 stubs/module-opts.c delete mode 100644 stubs/pci-bus.c diff --git a/include/sysemu/sysemu.h b/include/sysemu/sysemu.h index eb1dc1e4eda..5b4397eeb80 100644 --- a/include/sysemu/sysemu.h +++ b/include/sysemu/sysemu.h @@ -71,8 +71,6 @@ Chardev *serial_hd(int i); =20 extern Chardev *parallel_hds[MAX_PARALLEL_PORTS]; =20 -void hmp_info_usb(Monitor *mon, const QDict *qdict); - void add_boot_device_path(int32_t bootindex, DeviceState *dev, const char *suffix); char *get_boot_devices_list(size_t *size); diff --git a/stubs/isa-bus.c b/stubs/isa-bus.c deleted file mode 100644 index 522f448997d..00000000000 --- a/stubs/isa-bus.c +++ /dev/null @@ -1,7 +0,0 @@ -#include "qemu/osdep.h" -#include "hw/isa/isa.h" - -ISADevice *isa_create_simple(ISABus *bus, const char *name) -{ - g_assert_not_reached(); -} diff --git a/stubs/module-opts.c b/stubs/module-opts.c deleted file mode 100644 index 5412429ea86..00000000000 --- a/stubs/module-opts.c +++ /dev/null @@ -1,2 +0,0 @@ -#include "qemu/osdep.h" -#include "qemu/config-file.h" diff --git a/stubs/monitor-core.c b/stubs/monitor-core.c index afa477aae65..1894cdfe1f8 100644 --- a/stubs/monitor-core.c +++ b/stubs/monitor-core.c @@ -12,10 +12,6 @@ Monitor *monitor_set_cur(Coroutine *co, Monitor *mon) return NULL; } =20 -void monitor_init_qmp(Chardev *chr, bool pretty, Error **errp) -{ -} - void qapi_event_emit(QAPIEvent event, QDict *qdict) { } @@ -24,5 +20,3 @@ int monitor_vprintf(Monitor *mon, const char *fmt, va_lis= t ap) { abort(); } - - diff --git a/stubs/pci-bus.c b/stubs/pci-bus.c deleted file mode 100644 index a8932fa9325..00000000000 --- a/stubs/pci-bus.c +++ /dev/null @@ -1,7 +0,0 @@ -#include "qemu/osdep.h" -#include "hw/pci/pci.h" - -PCIDevice *pci_create_simple(PCIBus *bus, int devfn, const char *name) -{ - g_assert_not_reached(); -} diff --git a/stubs/qdev.c b/stubs/qdev.c index 6869f6f90a2..7e957b3e524 100644 --- a/stubs/qdev.c +++ b/stubs/qdev.c @@ -20,9 +20,3 @@ void qapi_event_send_device_deleted(const char *device, { /* Nothing to do. */ } - -void qapi_event_send_device_unplug_guest_error(const char *device, - const char *path) -{ - /* Nothing to do. */ -} diff --git a/stubs/qtest.c b/stubs/qtest.c index 4666a49d7d1..39e376eb67d 100644 --- a/stubs/qtest.c +++ b/stubs/qtest.c @@ -13,13 +13,3 @@ =20 /* Needed for qtest_allowed() */ bool qtest_allowed; - -bool qtest_driver(void) -{ - return false; -} - -int64_t qtest_get_virtual_clock(void) -{ - return 0; -} diff --git a/stubs/usb-dev-stub.c b/stubs/usb-dev-stub.c index aa557692b71..fcabe8429e6 100644 --- a/stubs/usb-dev-stub.c +++ b/stubs/usb-dev-stub.c @@ -26,8 +26,3 @@ HumanReadableText *qmp_x_query_usb(Error **errp) error_setg(errp, "Support for USB devices not built-in"); return NULL; } - -void hmp_info_usb(Monitor *mon, const QDict *qdict) -{ - monitor_printf(mon, "Support for USB devices not built-in\n"); -} diff --git a/stubs/meson.build b/stubs/meson.build index f87f5c1110f..aa7120f7110 100644 --- a/stubs/meson.build +++ b/stubs/meson.build @@ -22,13 +22,11 @@ stub_ss.add(files('iothread-lock.c')) if have_block stub_ss.add(files('iothread-lock-block.c')) endif -stub_ss.add(files('isa-bus.c')) stub_ss.add(files('is-daemonized.c')) if libaio.found() stub_ss.add(files('linux-aio.c')) endif stub_ss.add(files('migr-blocker.c')) -stub_ss.add(files('module-opts.c')) stub_ss.add(files('monitor.c')) stub_ss.add(files('monitor-core.c')) stub_ss.add(files('physmem.c')) @@ -57,7 +55,6 @@ if have_block or have_ga endif if have_system stub_ss.add(files('fw_cfg.c')) - stub_ss.add(files('pci-bus.c')) stub_ss.add(files('semihost.c')) stub_ss.add(files('usb-dev-stub.c')) stub_ss.add(files('xen-hw-stub.c')) --=20 2.44.0 From nobody Fri May 17 05:16:04 2024 Delivered-To: importer2@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+importer2=patchew.org@nongnu.org; dmarc=pass(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1712591775; cv=none; d=zohomail.com; s=zohoarc; b=P5RCPHk97njG82cM3tL2Dz9Tg91GSzTVMq6mUyOccdFGDGF+D7Xh2KOlmUa+q5knJ4nsAYEDqTusof1w+SgWfbuTJUpHZgQ98WnJUVzovjOIbwX1WvkSs8nTkuTM5xNZvzZTiXFkSgpBs1yWO9xzrQJ9LUo8uIe6ZUiAAJRBmRg= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1712591775; h=Content-Type:Content-Transfer-Encoding:Cc:Cc:Date:Date:From:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:Subject:To:To:Message-Id:Reply-To; bh=O49FEyqxVwMKh/6RjnlTehcwAT4fAZK02uPZnpIFwno=; b=m09j/PWdSBKcPHARwuqOyOaL2k5EX0QAT3K0OUvb+wghu8zKu0iFOAG56uWYheIGLJdQ25BU9oyL60v3BrgxYPhqmQwW/PCBc4y9e+BrSipOrT0I1lHiDMN1UO224Qfqxl3wMJzyrfoiNzXznx7r8Z4iAVPFBkVe53kbGTcM9QQ= 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+importer2=patchew.org@nongnu.org; dmarc=pass header.from= (p=none dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1712591775529667.9594633242427; Mon, 8 Apr 2024 08:56:15 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1rtrJx-0001I8-Uj; Mon, 08 Apr 2024 11:54:09 -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 1rtrJw-0001HP-Qu for qemu-devel@nongnu.org; Mon, 08 Apr 2024 11:54:08 -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 1rtrJu-0001pY-Fo for qemu-devel@nongnu.org; Mon, 08 Apr 2024 11:54:08 -0400 Received: from mail-wr1-f71.google.com (mail-wr1-f71.google.com [209.85.221.71]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-629-utt6t9YaM6OSHtI3wHrhTw-1; Mon, 08 Apr 2024 11:54:04 -0400 Received: by mail-wr1-f71.google.com with SMTP id ffacd0b85a97d-343eb273904so1605029f8f.1 for ; Mon, 08 Apr 2024 08:54:04 -0700 (PDT) Received: from avogadro.local ([151.95.152.232]) by smtp.gmail.com with ESMTPSA id k26-20020adfb35a000000b0034607c7d194sm301597wrd.8.2024.04.08.08.54.01 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 08 Apr 2024 08:54:02 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1712591645; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=O49FEyqxVwMKh/6RjnlTehcwAT4fAZK02uPZnpIFwno=; b=hY5z3u90wB0NWFYScRZTkyMiBd/+TvaMCRqF5HOLTXtU5ccSE5VF2QjbNzWcl44PKyQE0D cLJ2IY4afi9YVzl6FiegeOoRqu28vIbY6+OKDn5mQds2lhOgwy0n0DjH51D/mkLY9ZYJDY zNOH9evc0MRzlA5qlXu8Tm+TuYiY9g8= X-MC-Unique: utt6t9YaM6OSHtI3wHrhTw-1 X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1712591643; x=1713196443; 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=O49FEyqxVwMKh/6RjnlTehcwAT4fAZK02uPZnpIFwno=; b=paeSh8VUzrD+wbSHr8favVJUJ6IHJup0LFF/rKXkN3Qz85XvhmcGqv4gWuJ4l5KQ9C P10V/UAL2dRjaBBfp1AvtalqKNUVpmGIET4sulBoidmTeoIwe7ItywTVs+9LoJpD3fyL 6vMlnEW2pziiBAmWyl9TOO8dFHC/U5ARJDwic+4rFvJphK7bJQ2aZQHemAVw89l+pPJa 2AsVRcPoBRkQ4hS8LAqD35oafJ29WJ+LEr/TjIAYcxoOB2G6UapLYc8kU+ps//0l1SBK WACXyxT8uTJpQJTjgHPY97E9xs2SWvAR3HDmiMK5EoDllHUac4QO9VBToyxmu9ngj0CG Nk7g== X-Gm-Message-State: AOJu0YwGI/20+FFm6gQyt67MiKHzOX8mizT6EBNKpVqROZWUGMMS9OAp I9GjZICslsefIiIHB1QHDgCUfhkBD9EQ+cjUV4l2ehT/G9FIQsxhLlEYbzI6SSasNCmRVwdhIFT OLaH3HgIpyezQ9fRj6vIT7pDS7+S/iA0jMvH9+EBbeDUrtKfYuNKs8VwsetNZJh3QPFUtzA3JhV JU79DZtLZ3QkmSnmG7qckxsJMCBCR4A5N0heUH X-Received: by 2002:adf:f14b:0:b0:342:40b0:abf5 with SMTP id y11-20020adff14b000000b0034240b0abf5mr6016552wro.55.1712591642764; Mon, 08 Apr 2024 08:54:02 -0700 (PDT) X-Google-Smtp-Source: AGHT+IGpRYlzRZjtf6WgchuEgz2KMAE4YJglRic3cJjII0dkCZsgjqPQpz8P+EFaN4H5YlFgHdSKbw== X-Received: by 2002:adf:f14b:0:b0:342:40b0:abf5 with SMTP id y11-20020adff14b000000b0034240b0abf5mr6016542wro.55.1712591642506; Mon, 08 Apr 2024 08:54:02 -0700 (PDT) From: Paolo Bonzini To: qemu-devel@nongnu.org Cc: philmd@linaro.org Subject: [PATCH v2 10/18] hw/usb: move stubs out of stubs/ Date: Mon, 8 Apr 2024 17:53:22 +0200 Message-ID: <20240408155330.522792-11-pbonzini@redhat.com> X-Mailer: git-send-email 2.44.0 In-Reply-To: <20240408155330.522792-1-pbonzini@redhat.com> References: <20240408155330.522792-1-pbonzini@redhat.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable 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+importer2=patchew.org@nongnu.org; helo=lists.gnu.org; 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: -35 X-Spam_score: -3.6 X-Spam_bar: --- X-Spam_report: (-3.6 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-1.494, 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+importer2=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer2=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @redhat.com) X-ZM-MESSAGEID: 1712591776352100001 Content-Type: text/plain; charset="utf-8" Since the USB stubs are needed exactly when the Kconfig symbols are not enabled, they can be placed in hw/usb/ and conditionalized on CONFIG_USB. Signed-off-by: Paolo Bonzini Reviewed-by: Philippe Mathieu-Daud=C3=A9 Reviewed-by: Richard Henderson --- stubs/usb-dev-stub.c =3D> hw/usb/bus-stub.c | 0 hw/usb/meson.build | 2 +- stubs/meson.build | 1 - 3 files changed, 1 insertion(+), 2 deletions(-) rename stubs/usb-dev-stub.c =3D> hw/usb/bus-stub.c (100%) diff --git a/stubs/usb-dev-stub.c b/hw/usb/bus-stub.c similarity index 100% rename from stubs/usb-dev-stub.c rename to hw/usb/bus-stub.c diff --git a/hw/usb/meson.build b/hw/usb/meson.build index aac3bb35f27..23f7f7acb50 100644 --- a/hw/usb/meson.build +++ b/hw/usb/meson.build @@ -9,7 +9,7 @@ system_ss.add(when: 'CONFIG_USB', if_true: files( 'desc-msos.c', 'libhw.c', 'pcap.c', -)) +), if_false: files('bus-stub.c')) =20 # usb host adapters system_ss.add(when: 'CONFIG_USB_UHCI', if_true: files('hcd-uhci.c')) diff --git a/stubs/meson.build b/stubs/meson.build index aa7120f7110..45616afbfaa 100644 --- a/stubs/meson.build +++ b/stubs/meson.build @@ -56,7 +56,6 @@ endif if have_system stub_ss.add(files('fw_cfg.c')) stub_ss.add(files('semihost.c')) - stub_ss.add(files('usb-dev-stub.c')) stub_ss.add(files('xen-hw-stub.c')) stub_ss.add(files('virtio-md-pci.c')) else --=20 2.44.0 From nobody Fri May 17 05:16:04 2024 Delivered-To: importer2@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+importer2=patchew.org@nongnu.org; dmarc=pass(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1712591883; cv=none; d=zohomail.com; s=zohoarc; b=DXfCbs1vAPyGaERDsD4uq/o+ur81r8BEJiDkDke+seOF70xMeO6jmk3scTNophvCW5Eq7Dqf+HcIwiPH0uUGps2HP01Hv4ax+MnInA5ab7cbTMPrOd0GyKJpCfEPOahSMrqGPIqeV9FDcs11eJaCZ6RJGQ8VpM1/mFNT2DO261Y= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1712591883; h=Content-Type:Content-Transfer-Encoding:Cc:Cc:Date:Date:From:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:Subject:To:To:Message-Id:Reply-To; bh=OvEz71KolpHlDr+wtkEJnZoMG97tnaT6MHtThZyJnbM=; b=fv0mHTL00CLHhz5ltlywLQUx8GtJq3tcG6pFSTZs9QsCD2GBu8tmbAHk8Wn5/eEbucgBU7SG7GCEdbGYGLWSkz1JXwImsoH6TRKZN+StFTPRyn5muzDssnkEp9+BwEQm79MlIq9gGYNI/Ux5sKJ+4Kj98OUCjwFYYnotGLDyxb4= 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+importer2=patchew.org@nongnu.org; dmarc=pass header.from= (p=none dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1712591883738940.3637836205891; Mon, 8 Apr 2024 08:58:03 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1rtrK0-0001Iy-MU; Mon, 08 Apr 2024 11:54:12 -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 1rtrJz-0001Ik-Lt for qemu-devel@nongnu.org; Mon, 08 Apr 2024 11:54:11 -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 1rtrJy-0001pt-6t for qemu-devel@nongnu.org; Mon, 08 Apr 2024 11:54:11 -0400 Received: from mail-wm1-f72.google.com (mail-wm1-f72.google.com [209.85.128.72]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-501-_DWMPJLtMwuy54RKPX5zeg-1; Mon, 08 Apr 2024 11:54:07 -0400 Received: by mail-wm1-f72.google.com with SMTP id 5b1f17b1804b1-416664de900so9019105e9.2 for ; Mon, 08 Apr 2024 08:54:06 -0700 (PDT) Received: from avogadro.local ([151.95.152.232]) by smtp.gmail.com with ESMTPSA id p5-20020adfce05000000b00343e760c637sm8826197wrn.84.2024.04.08.08.54.04 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 08 Apr 2024 08:54:04 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1712591648; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=OvEz71KolpHlDr+wtkEJnZoMG97tnaT6MHtThZyJnbM=; b=TNiP6vlCcgj0tkdY0EHiZo/6wZ8I9n44KuP2IMbFBW2mqGF60uF5mxgx/yb51ZGNIt/hp6 2hTZA809Fe26JkKr+WIJIOq9ERqz66Ig/VS8w6y7ieaNpHzFXfkp6YCV1HzDHPE9XrRPoH A/xn7LkkhzCpeCrto9LcuURvV54kFOY= X-MC-Unique: _DWMPJLtMwuy54RKPX5zeg-1 X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1712591645; x=1713196445; 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=OvEz71KolpHlDr+wtkEJnZoMG97tnaT6MHtThZyJnbM=; b=cmy3ev/vyd1py+3on3siGTrzY5AvaZFr1p0Dal1sv4qrNMYvQ3OmeRv8aSUaN/t8Wl P9DFwIdl00FQYGa83WHc57g9ODTZYRfLZsPpmJIJM4P3EX3Dg5fyFZNIJqt6rAHl8NdX 2ic5zqwKaYcLYJGVPXEK0dEIryJOYsTaqO2Z1Rohi7IRDuD7HxUVNHxmGJVqtntExUMh o5/Bq9rkRFxs1r+wrtLPfVI5CvII8ezUIyGUywXM2WiV0lBNsqrilnswDDbOHBVikI77 qIUorxxNoaMSXpZBkhjcRSkgfUXE5nH95ZfUzFRbr3QfJsPamB8CxjQ/mRylr14ZfFM+ mrjw== X-Gm-Message-State: AOJu0Yw3a46gf2KnFvFT9pxMHUkjG/7trI9jDS3kFdkAc6ydBjhcWf4r zyu6fh7zkABnaB2SCCOYQojjCQFlJhmgc06Yn4DRDLh7b9mtl3wrc95FZJ2uC4DJG4M38zxfaBg Z2+qw/iDBH3+KrIsF2asPdmH7f9ZYf8AywHm9J2e9q2kVk9E8rRrN9+dkTCgLv6ANhYMQqSwziu Mh1e3s/v8Zyyq21gcOFjj+SARirhXqoqY84R98 X-Received: by 2002:a05:600c:4fc6:b0:416:5f18:820d with SMTP id o6-20020a05600c4fc600b004165f18820dmr4237476wmq.2.1712591645347; Mon, 08 Apr 2024 08:54:05 -0700 (PDT) X-Google-Smtp-Source: AGHT+IGIc750yA3u0pXt4JtIGtQM43YSM0d1V/ikPnXq/IjDcmvZY6lH9qWMEPtCvSPu78ybfq7XDQ== X-Received: by 2002:a05:600c:4fc6:b0:416:5f18:820d with SMTP id o6-20020a05600c4fc600b004165f18820dmr4237460wmq.2.1712591645077; Mon, 08 Apr 2024 08:54:05 -0700 (PDT) From: Paolo Bonzini To: qemu-devel@nongnu.org Cc: philmd@linaro.org Subject: [PATCH v2 11/18] hw/virtio: move stubs out of stubs/ Date: Mon, 8 Apr 2024 17:53:23 +0200 Message-ID: <20240408155330.522792-12-pbonzini@redhat.com> X-Mailer: git-send-email 2.44.0 In-Reply-To: <20240408155330.522792-1-pbonzini@redhat.com> References: <20240408155330.522792-1-pbonzini@redhat.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable 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+importer2=patchew.org@nongnu.org; helo=lists.gnu.org; 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: -35 X-Spam_score: -3.6 X-Spam_bar: --- X-Spam_report: (-3.6 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-1.494, 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+importer2=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer2=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @redhat.com) X-ZM-MESSAGEID: 1712591884861100001 Content-Type: text/plain; charset="utf-8" Since the virtio memory device stubs are needed exactly when the Kconfig symbol is not enabled, they can be placed in hw/virtio/ and conditionalized on CONFIG_VIRTIO_MD. Signed-off-by: Paolo Bonzini Reviewed-by: Richard Henderson --- stubs/virtio-md-pci.c =3D> hw/virtio/virtio-md-stubs.c | 0 hw/virtio/meson.build | 3 ++- stubs/meson.build | 1 - 3 files changed, 2 insertions(+), 2 deletions(-) rename stubs/virtio-md-pci.c =3D> hw/virtio/virtio-md-stubs.c (100%) diff --git a/stubs/virtio-md-pci.c b/hw/virtio/virtio-md-stubs.c similarity index 100% rename from stubs/virtio-md-pci.c rename to hw/virtio/virtio-md-stubs.c diff --git a/hw/virtio/meson.build b/hw/virtio/meson.build index d7f18c96e60..2a086f7904b 100644 --- a/hw/virtio/meson.build +++ b/hw/virtio/meson.build @@ -80,7 +80,8 @@ virtio_pci_ss.add(when: 'CONFIG_VIRTIO_PMEM', if_true: fi= les('virtio-pmem-pci.c' virtio_pci_ss.add(when: 'CONFIG_VIRTIO_IOMMU', if_true: files('virtio-iomm= u-pci.c')) virtio_pci_ss.add(when: 'CONFIG_VIRTIO_MEM', if_true: files('virtio-mem-pc= i.c')) virtio_pci_ss.add(when: 'CONFIG_VHOST_VDPA_DEV', if_true: files('vdpa-dev-= pci.c')) -virtio_pci_ss.add(when: 'CONFIG_VIRTIO_MD', if_true: files('virtio-md-pci.= c')) +virtio_pci_ss.add(when: 'CONFIG_VIRTIO_MD', if_true: files('virtio-md-pci.= c'), + if_false: files('virtio-md-stu= bs.c')) =20 specific_virtio_ss.add_all(when: 'CONFIG_VIRTIO_PCI', if_true: virtio_pci_= ss) =20 diff --git a/stubs/meson.build b/stubs/meson.build index 45616afbfaa..60e32d363fa 100644 --- a/stubs/meson.build +++ b/stubs/meson.build @@ -57,7 +57,6 @@ if have_system stub_ss.add(files('fw_cfg.c')) stub_ss.add(files('semihost.c')) stub_ss.add(files('xen-hw-stub.c')) - stub_ss.add(files('virtio-md-pci.c')) else stub_ss.add(files('qdev.c')) endif --=20 2.44.0 From nobody Fri May 17 05:16:04 2024 Delivered-To: importer2@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+importer2=patchew.org@nongnu.org; dmarc=pass(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1712591758; cv=none; d=zohomail.com; s=zohoarc; b=RPS+SpOdte7aOIHi/dPFvkN24l+7/AMf1N7hMqLcVfliC+s7yOH0FiC8y5dZCvVBaPIhz8tw5VV+30O7PQRJVPAh4WtUSlmTTsLtVYzAEwtFe9dh7DC8+WqLMCvAExmV0eBlCiTQOOUE7v7FsUZROO7Awzsu2o0cFf2fkV9Uaq0= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1712591758; h=Content-Type:Content-Transfer-Encoding:Cc:Cc:Date:Date:From:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:Subject:To:To:Message-Id:Reply-To; bh=n8MpXgSrFJSCnePEmrzhpTfLb35G0CERg/TyFB4eszo=; b=bZlzwYggYRbva3+I8BsLdNcLNAALFGFjy18sIgi9z/2ZWZF9ovhlQ8yqyUCHTTirLAli7s5+J4ZGgLlzK6liBaetqT7FgWHRZWJN4zC0ZiHI8y74Ow8PSvtYHqlWIO3I4Fc55DBz6Mfz87JmIIJQxICF5uy2xS/9kzpbqNJCKBk= 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+importer2=patchew.org@nongnu.org; dmarc=pass header.from= (p=none dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1712591758823231.46602974690848; Mon, 8 Apr 2024 08:55:58 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1rtrK3-0001KU-Cr; Mon, 08 Apr 2024 11:54:15 -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 1rtrK1-0001Jx-T6 for qemu-devel@nongnu.org; Mon, 08 Apr 2024 11:54:13 -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 1rtrK0-0001qZ-De for qemu-devel@nongnu.org; Mon, 08 Apr 2024 11:54:13 -0400 Received: from mail-wm1-f71.google.com (mail-wm1-f71.google.com [209.85.128.71]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-13-K8SqHeFrMB6qGkJEtwsrVA-1; Mon, 08 Apr 2024 11:54:10 -0400 Received: by mail-wm1-f71.google.com with SMTP id 5b1f17b1804b1-41663c713b7so6462065e9.0 for ; Mon, 08 Apr 2024 08:54:10 -0700 (PDT) Received: from avogadro.local ([151.95.152.232]) by smtp.gmail.com with ESMTPSA id m37-20020a05600c3b2500b00416665d3e09sm5019754wms.9.2024.04.08.08.54.07 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 08 Apr 2024 08:54:07 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1712591651; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=n8MpXgSrFJSCnePEmrzhpTfLb35G0CERg/TyFB4eszo=; b=A8wC9N7/WnAj+TWZwt06qIuj8YxOAeVbje0kTxmFvEVhad13dXHCf3dyqBMkJSS7wsT6i8 aNcBkKXKUOEhSJthOrDprEqr6/6kSPo62tBIsp8+17EbtHBetvQ0DChQmvw8abQLfYGVVy PGo6uETkwIvkOBC97RxvtIhLHB0l2Wc= X-MC-Unique: K8SqHeFrMB6qGkJEtwsrVA-1 X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1712591648; x=1713196448; 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=n8MpXgSrFJSCnePEmrzhpTfLb35G0CERg/TyFB4eszo=; b=eweWsyDW6rv9A7BUZeSiKIYxKzMvnvMre7stt82e71gpEQ/gkgr9ISS7ePBJHqwRRn jIPhv/D4h3e288YamN2XF3QqvMTk9V8C/ihn1QKL1pFY0Kncg/nzXxftGGF9PboMw91a 5HRtSkNibp2RdofPFp6KSJKByjPm3rFSnkpxWv3BOoM6boagU46Q1NvS82BORD9OFhrU 4HFeF4RGydbCJ86XZSqDOySgNeHt++I8Wo1yCTso5wodfI2xyVC5+oAzjDlQ2PQGriS/ RvljuCpcn/oIGXX+8gq3//yIBqBpe3oGd/SF+9N9Ira5+2gPif8/ol1ouBptcyj4ujOd BPIg== X-Gm-Message-State: AOJu0Yx3oM7esbTaiUg2ru598LpFBcqIRcQtCosZCfNvssF327MBjPqc nGQiWSvo6SCnjgZ/maX54Mcac8HYfRFedDcLuxnk2k2CybYxRYgoBe5HCT9AFNxmPwUB4hOB4pm Hz2YluxEVQgJU5R9M80EUA5uNTuNAb6Eo6gBFdaM8iNIa4K7eNoRVQRALXLVoLpyhL61HQbF7qN 7mANcSrjtQgXTVmWSnWPpWnHurTwgp+vm9KOnG X-Received: by 2002:a05:600c:3b05:b0:416:350c:db48 with SMTP id m5-20020a05600c3b0500b00416350cdb48mr66708wms.9.1712591647835; Mon, 08 Apr 2024 08:54:07 -0700 (PDT) X-Google-Smtp-Source: AGHT+IGP9lHEYolnWP9iqS/nlVDLY633f/HIAymM5td6KUGBoZefnbs6NoGM8NjjedsS6fvl3gVyiQ== X-Received: by 2002:a05:600c:3b05:b0:416:350c:db48 with SMTP id m5-20020a05600c3b0500b00416350cdb48mr66698wms.9.1712591647565; Mon, 08 Apr 2024 08:54:07 -0700 (PDT) From: Paolo Bonzini To: qemu-devel@nongnu.org Cc: philmd@linaro.org Subject: [PATCH v2 12/18] semihosting: move stubs out of stubs/ Date: Mon, 8 Apr 2024 17:53:24 +0200 Message-ID: <20240408155330.522792-13-pbonzini@redhat.com> X-Mailer: git-send-email 2.44.0 In-Reply-To: <20240408155330.522792-1-pbonzini@redhat.com> References: <20240408155330.522792-1-pbonzini@redhat.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable 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+importer2=patchew.org@nongnu.org; helo=lists.gnu.org; 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: -35 X-Spam_score: -3.6 X-Spam_bar: --- X-Spam_report: (-3.6 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-1.494, 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+importer2=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer2=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @redhat.com) X-ZM-MESSAGEID: 1712591760270100004 Content-Type: text/plain; charset="utf-8" Since the semihosting stubs are needed exactly when the Kconfig symbols are not needed, move them to semihosting/ and conditionalize them on CONFIG_SEMIHOSTING and/or CONFIG_SYSTEM_ONLY. Signed-off-by: Paolo Bonzini --- stubs/semihost-all.c =3D> semihosting/stubs-all.c | 0 stubs/semihost.c =3D> semihosting/stubs-system.c | 0 semihosting/meson.build | 3 +++ stubs/meson.build | 2 -- 4 files changed, 3 insertions(+), 2 deletions(-) rename stubs/semihost-all.c =3D> semihosting/stubs-all.c (100%) rename stubs/semihost.c =3D> semihosting/stubs-system.c (100%) diff --git a/stubs/semihost-all.c b/semihosting/stubs-all.c similarity index 100% rename from stubs/semihost-all.c rename to semihosting/stubs-all.c diff --git a/stubs/semihost.c b/semihosting/stubs-system.c similarity index 100% rename from stubs/semihost.c rename to semihosting/stubs-system.c diff --git a/semihosting/meson.build b/semihosting/meson.build index b07cbd980f2..34933e5a195 100644 --- a/semihosting/meson.build +++ b/semihosting/meson.build @@ -9,5 +9,8 @@ specific_ss.add(when: ['CONFIG_SEMIHOSTING', 'CONFIG_SYSTEM= _ONLY'], if_true: fil 'uaccess.c', )) =20 +common_ss.add(when: ['CONFIG_SEMIHOSTING', 'CONFIG_SYSTEM_ONLY'], if_false= : files('stubs-all.c')) +system_ss.add(when: ['CONFIG_SEMIHOSTING'], if_false: files('stubs-system.= c')) + specific_ss.add(when: ['CONFIG_ARM_COMPATIBLE_SEMIHOSTING'], if_true: files('arm-compat-semi.c')) diff --git a/stubs/meson.build b/stubs/meson.build index 60e32d363fa..84ecaa4daa1 100644 --- a/stubs/meson.build +++ b/stubs/meson.build @@ -55,9 +55,7 @@ if have_block or have_ga endif if have_system stub_ss.add(files('fw_cfg.c')) - stub_ss.add(files('semihost.c')) stub_ss.add(files('xen-hw-stub.c')) else stub_ss.add(files('qdev.c')) endif -stub_ss.add(files('semihost-all.c')) --=20 2.44.0 From nobody Fri May 17 05:16:04 2024 Delivered-To: importer2@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+importer2=patchew.org@nongnu.org; dmarc=pass(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1712591739; cv=none; d=zohomail.com; s=zohoarc; b=lhQClpr/Wxvqj7yyg6l+LjfsU4jf9YDZaMz7SNC6O/JJe+ZBQAEvOupgd3AtFd5kH4vnxRwstsPVHP+AzkwBx0kLbkDkYaIydjoUufguONq2LAgWgEhH9Rcv+0P2q2Nyklb44ccJHLVK04zeM4QMEgOy/0VTNY9fUI/VNMZDWcM= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1712591739; h=Content-Type:Content-Transfer-Encoding:Cc:Cc:Date:Date:From:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:Subject:To:To:Message-Id:Reply-To; bh=OUsSvx4rS/JvSGux26uwYxv9XLnSYU17H3EwXSZxQ0w=; b=ZuQAJxaM6PCm7nGl5gp4BKVuY0wpKowi7E4X8ZOXEgc8Kda4nXYays9H7KRRZML9DCR+2B/WcU6ctAJfWXOxR4JIYAQEDBDoNkVfuMM1OlwtnkC9OA4FjpqFX27TetHUXkzrDOwjUivadrFfFd94LnyJJ32NuFQsa8BSoj5agOE= 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+importer2=patchew.org@nongnu.org; dmarc=pass header.from= (p=none dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1712591739096664.8995710397845; Mon, 8 Apr 2024 08:55:39 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1rtrK6-0001L2-OU; Mon, 08 Apr 2024 11:54:18 -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 1rtrK5-0001Kr-CV for qemu-devel@nongnu.org; Mon, 08 Apr 2024 11:54:17 -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 1rtrK3-0001ql-QF for qemu-devel@nongnu.org; Mon, 08 Apr 2024 11:54:17 -0400 Received: from mail-lj1-f199.google.com (mail-lj1-f199.google.com [209.85.208.199]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-321--BzWSn6IOeuQMHI4E7u0SQ-1; Mon, 08 Apr 2024 11:54:14 -0400 Received: by mail-lj1-f199.google.com with SMTP id 38308e7fff4ca-2d883dab079so15545861fa.3 for ; Mon, 08 Apr 2024 08:54:13 -0700 (PDT) Received: from avogadro.local ([151.95.152.232]) by smtp.gmail.com with ESMTPSA id j22-20020a05600c1c1600b004165315d885sm6677512wms.11.2024.04.08.08.54.09 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 08 Apr 2024 08:54:09 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1712591655; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=OUsSvx4rS/JvSGux26uwYxv9XLnSYU17H3EwXSZxQ0w=; b=gy79+6suawwLTSIT4PQOIfAWmYYVXRKE2BY6auKr2Qy9NthbePJLuXXyfpzyjHNs0R3dgP h+zAG0ur7vG3uaRV6bTanpeD0UAq0HkRA/p5/zkt+qDn5SbtflhRrLuY9wnu+31rgnBfYK 816Q8rr2RFA0R+MObHuaJLSFss8ame4= X-MC-Unique: -BzWSn6IOeuQMHI4E7u0SQ-1 X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1712591651; x=1713196451; 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=OUsSvx4rS/JvSGux26uwYxv9XLnSYU17H3EwXSZxQ0w=; b=ciEYuGUzLqfap69a1We4NrAvlRQYADOAj69xjZ0TLsHcbXCsidx98ii5b+tJGa3yrq /Mqsqa1KuubVTpmiZoFVBaTDK36DEAFk3s1J+NT9UdkgqoAugEsnTfp5EGBhitQS65Mg z3O0MS+/zT0Ki+mfckzp3q8r6tcyTh41ss6X+kcAnMXHtO/iVbWuxF81FINJuONwJ3JW hjn9ooPgCVPsjk1z16jsrci1LY/VJQqTIdIcXtRhlkganjLUCUVsC1VzO1qSgo+knMU/ GiCQmyKag1Kc03YC1No/9aUsaH4ceuGLbW+n7Xv3/j/+WLJnIUPRCioMFSfR1tpQyQx9 0PBA== X-Gm-Message-State: AOJu0YyLnXYveA+LBhZiVZkCt+Q3RaDI+xePvQlLvIx6Nldfa0q9mqXV isY3mSY5433NFbbZxVwW8ujRC4jK8v0YSogxI12SMI11LYkuFB7mgsL6u+ccTwW9KT8VBle2Fji s3kL7twKgcXgUhWF9NWkuHXavv7xe9Kzm8JMQNgiB2FscEl2WovKTWdAHt3TZg/ZfGWxz/BOpdl lJNM0vO0Xl5PCaamRK6UQl24nGqkqvtIq3JYEz X-Received: by 2002:a2e:95d4:0:b0:2d6:e0a9:9981 with SMTP id y20-20020a2e95d4000000b002d6e0a99981mr6868185ljh.9.1712591651334; Mon, 08 Apr 2024 08:54:11 -0700 (PDT) X-Google-Smtp-Source: AGHT+IEAlgKqvGt9x55z6ZFndNEXaNbZHVKmVcSb0sgjkM6ZyItdDQGtCMUMtuYoEPo3E8eNRfHvqw== X-Received: by 2002:a2e:95d4:0:b0:2d6:e0a9:9981 with SMTP id y20-20020a2e95d4000000b002d6e0a99981mr6868172ljh.9.1712591650995; Mon, 08 Apr 2024 08:54:10 -0700 (PDT) From: Paolo Bonzini To: qemu-devel@nongnu.org Cc: philmd@linaro.org Subject: [PATCH v2 13/18] ramfb: move stubs out of stubs/ Date: Mon, 8 Apr 2024 17:53:25 +0200 Message-ID: <20240408155330.522792-14-pbonzini@redhat.com> X-Mailer: git-send-email 2.44.0 In-Reply-To: <20240408155330.522792-1-pbonzini@redhat.com> References: <20240408155330.522792-1-pbonzini@redhat.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable 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+importer2=patchew.org@nongnu.org; helo=lists.gnu.org; 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: -35 X-Spam_score: -3.6 X-Spam_bar: --- X-Spam_report: (-3.6 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-1.494, 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+importer2=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer2=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @redhat.com) X-ZM-MESSAGEID: 1712591740237100004 Content-Type: text/plain; charset="utf-8" Since the ramfb stubs are needed exactly when the Kconfig symbols are not needed, move them to hw/display/ and compile them when ramfb.c is absent. Signed-off-by: Paolo Bonzini Reviewed-by: Philippe Mathieu-Daud=C3=A9 Reviewed-by: Richard Henderson --- stubs/ramfb.c =3D> hw/display/ramfb-stubs.c | 0 hw/display/meson.build | 2 +- stubs/meson.build | 1 - 3 files changed, 1 insertion(+), 2 deletions(-) rename stubs/ramfb.c =3D> hw/display/ramfb-stubs.c (100%) diff --git a/stubs/ramfb.c b/hw/display/ramfb-stubs.c similarity index 100% rename from stubs/ramfb.c rename to hw/display/ramfb-stubs.c diff --git a/hw/display/meson.build b/hw/display/meson.build index f93a69f70f4..4751aab3ba9 100644 --- a/hw/display/meson.build +++ b/hw/display/meson.build @@ -3,7 +3,7 @@ hw_display_modules =3D {} system_ss.add(when: 'CONFIG_DDC', if_true: files('i2c-ddc.c')) system_ss.add(when: 'CONFIG_EDID', if_true: files('edid-generate.c', 'edid= -region.c')) =20 -system_ss.add(when: 'CONFIG_FW_CFG_DMA', if_true: files('ramfb.c')) +system_ss.add(when: 'CONFIG_FW_CFG_DMA', if_true: files('ramfb.c'), if_fal= se: files('ramfb-stubs.c')) system_ss.add(when: 'CONFIG_FW_CFG_DMA', if_true: files('ramfb-standalone.= c')) =20 system_ss.add(when: 'CONFIG_VGA_CIRRUS', if_true: files('cirrus_vga.c')) diff --git a/stubs/meson.build b/stubs/meson.build index 84ecaa4daa1..92887660e41 100644 --- a/stubs/meson.build +++ b/stubs/meson.build @@ -36,7 +36,6 @@ stub_ss.add(files('qmp-command-available.c')) stub_ss.add(files('qmp-quit.c')) stub_ss.add(files('qtest.c')) stub_ss.add(files('ram-block.c')) -stub_ss.add(files('ramfb.c')) stub_ss.add(files('replay.c')) stub_ss.add(files('runstate-check.c')) stub_ss.add(files('sysbus.c')) --=20 2.44.0 From nobody Fri May 17 05:16:04 2024 Delivered-To: importer2@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+importer2=patchew.org@nongnu.org; dmarc=pass(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1712591686; cv=none; d=zohomail.com; s=zohoarc; b=Hlv8wsBZq84vhWrC+XL7D282tITQJ+RcU9bbCQAtgSRYKaUTjSaZZ6p451wKEMK/iu4IIdLXVSTsdnmBFIMo7bihFcCZZdcxyQstrLiedUlrLDC+987F75/uHm1UAI6+btfKYmZab8pBD2161QndDHoZhWUtc81vv/95+tkr6fI= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1712591686; h=Content-Type:Content-Transfer-Encoding:Cc:Cc:Date:Date:From:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:Subject:To:To:Message-Id:Reply-To; bh=HTrT2BEVdcUWgqnmnvX6ad7E9+4n+PuOGXheGFWkRfI=; b=C70g426tae8+HApbJdB+p4uOrZoeSt1z2Ht40Pdh24pgVi+U6iCpkbgq0D06hQhL8DBd4kAiEyvvW2gGLe8fAy5jpWNE4A7TvsJpzUWLGcqKDeDSn7tHmS0F3th8K38EYfR0fFecblCXWQ62VrwoH1CRYWzvtdUSdi50y8SejFU= 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+importer2=patchew.org@nongnu.org; dmarc=pass header.from= (p=none dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1712591686130602.5261071970768; Mon, 8 Apr 2024 08:54:46 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1rtrK9-0001LT-C1; Mon, 08 Apr 2024 11:54:21 -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 1rtrK8-0001LJ-1G for qemu-devel@nongnu.org; Mon, 08 Apr 2024 11:54:20 -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 1rtrK6-0001r4-L6 for qemu-devel@nongnu.org; Mon, 08 Apr 2024 11:54:19 -0400 Received: from mail-wm1-f69.google.com (mail-wm1-f69.google.com [209.85.128.69]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-590-cmH3mPuGPIS0AQihc0w2EA-1; Mon, 08 Apr 2024 11:54:16 -0400 Received: by mail-wm1-f69.google.com with SMTP id 5b1f17b1804b1-4165339d3a5so7513905e9.3 for ; Mon, 08 Apr 2024 08:54:16 -0700 (PDT) Received: from avogadro.local ([151.95.152.232]) by smtp.gmail.com with ESMTPSA id p15-20020a05600c358f00b004156b689edfsm13918903wmq.33.2024.04.08.08.54.12 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 08 Apr 2024 08:54:13 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1712591658; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=HTrT2BEVdcUWgqnmnvX6ad7E9+4n+PuOGXheGFWkRfI=; b=cc15dIc/hWaRCxVVvLSACOLTD90A7rjVC8R/vQIz/CBwJBTpzF2mHSWfnp/3+Vix7us/ub ZG9afpJXydVBsq6WxHu+pd5OoM8PehldnjA+7dAb7vtnlB93cf0AAzZ6ueuWrhMm3h/r14 Ao58es6BQmECVwbg1MlB/MNg+0wdg20= X-MC-Unique: cmH3mPuGPIS0AQihc0w2EA-1 X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1712591654; x=1713196454; 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=HTrT2BEVdcUWgqnmnvX6ad7E9+4n+PuOGXheGFWkRfI=; b=Yku6i0ujnbGKSy4/HfuT0qBGkcuw9Qd0oxQm3UR7e4k3MXz/ih/Ct6Eswaoq/OsT1B sq5CU3YHUNjjwhtZxBHuo1nRzIhm8aEJJNxJg79Z3h6Rqdye90C8S45znasYqc846VFQ Btb7JO6SaT5+qk8biA/cUUTrCGq7AOp2WapExzsKXDEjHBtxPePtrX69BwMBmExywRtt xbsng2IpKLnGfkTTkOPkUbJS8OJ4c4wyraRy7otm19ucJxRjOAiWJIZAGdTlDjsOTbDn HAd1nLOkmo5sli0tQtBk4px8vUQSVWqe8hjBBt9jDcedB0qvD2WRM9xz05U8GqzQ94u4 z5eA== X-Gm-Message-State: AOJu0YwRvnSzrCra+zGd+g2GCUJ7BM73KiZNSWiPj3JfORutIMOgoqv1 KZTTpvb/nAWdqLsly1qoExSnuibTn3+WkV0R4yB2Ov/t8bT2AI8dHFCevBqsg7LP0pmHKJ2tzZF zcw54qQ1HWeLN8XkaA6X0Em6a6DGRq+ThwIAHp4WFcrkK6FYKZIM3fY74HWddKQOggFcpfRQZ0v Huk/VIpFBvQcDPGLL6oEH2BF3oJ4AZbVdtgH59 X-Received: by 2002:a05:600c:3592:b0:416:8152:8a70 with SMTP id p18-20020a05600c359200b0041681528a70mr1347598wmq.33.1712591654767; Mon, 08 Apr 2024 08:54:14 -0700 (PDT) X-Google-Smtp-Source: AGHT+IHsAfPLKZcP/L4W12iqKbbF1J8CSVamSQWifNyHScTj3pfsqnHu7p+STcDmCalydrTXyhm1tg== X-Received: by 2002:a05:600c:3592:b0:416:8152:8a70 with SMTP id p18-20020a05600c359200b0041681528a70mr1347591wmq.33.1712591654520; Mon, 08 Apr 2024 08:54:14 -0700 (PDT) From: Paolo Bonzini To: qemu-devel@nongnu.org Cc: philmd@linaro.org Subject: [PATCH v2 14/18] memory-device: move stubs out of stubs/ Date: Mon, 8 Apr 2024 17:53:26 +0200 Message-ID: <20240408155330.522792-15-pbonzini@redhat.com> X-Mailer: git-send-email 2.44.0 In-Reply-To: <20240408155330.522792-1-pbonzini@redhat.com> References: <20240408155330.522792-1-pbonzini@redhat.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable 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+importer2=patchew.org@nongnu.org; helo=lists.gnu.org; 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: -35 X-Spam_score: -3.6 X-Spam_bar: --- X-Spam_report: (-3.6 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-1.494, 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+importer2=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer2=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @redhat.com) X-ZM-MESSAGEID: 1712591687761100003 Content-Type: text/plain; charset="utf-8" Since the memory-device stubs are needed exactly when the Kconfig symbols a= re not needed, move them to hw/mem/. Signed-off-by: Paolo Bonzini Reviewed-by: Philippe Mathieu-Daud=C3=A9 Reviewed-by: Richard Henderson --- stubs/memory_device.c =3D> hw/mem/memory-device-stubs.c | 0 hw/mem/meson.build | 1 + stubs/meson.build | 1 - 3 files changed, 1 insertion(+), 1 deletion(-) rename stubs/memory_device.c =3D> hw/mem/memory-device-stubs.c (100%) diff --git a/stubs/memory_device.c b/hw/mem/memory-device-stubs.c similarity index 100% rename from stubs/memory_device.c rename to hw/mem/memory-device-stubs.c diff --git a/hw/mem/meson.build b/hw/mem/meson.build index faee1fe9360..1c1c6da24b5 100644 --- a/hw/mem/meson.build +++ b/hw/mem/meson.build @@ -6,6 +6,7 @@ mem_ss.add(when: 'CONFIG_NVDIMM', if_true: files('nvdimm.c'= )) mem_ss.add(when: 'CONFIG_CXL_MEM_DEVICE', if_true: files('cxl_type3.c')) system_ss.add(when: 'CONFIG_CXL_MEM_DEVICE', if_false: files('cxl_type3_st= ubs.c')) =20 +system_ss.add(when: 'CONFIG_MEM_DEVICE', if_false: files('memory-device-st= ubs.c')) system_ss.add_all(when: 'CONFIG_MEM_DEVICE', if_true: mem_ss) =20 system_ss.add(when: 'CONFIG_SPARSE_MEM', if_true: files('sparse-mem.c')) diff --git a/stubs/meson.build b/stubs/meson.build index 92887660e41..a4404e765ab 100644 --- a/stubs/meson.build +++ b/stubs/meson.build @@ -31,7 +31,6 @@ stub_ss.add(files('monitor.c')) stub_ss.add(files('monitor-core.c')) stub_ss.add(files('physmem.c')) stub_ss.add(files('qemu-timer-notify-cb.c')) -stub_ss.add(files('memory_device.c')) stub_ss.add(files('qmp-command-available.c')) stub_ss.add(files('qmp-quit.c')) stub_ss.add(files('qtest.c')) --=20 2.44.0 From nobody Fri May 17 05:16:04 2024 Delivered-To: importer2@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+importer2=patchew.org@nongnu.org; dmarc=pass(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1712591715; cv=none; d=zohomail.com; s=zohoarc; b=cFr21C4qeYBvw/KrHndym8VYxd4s0xRPS03mlbXiUuJ2B2t/Nu6VdgvlwdMNjOM77H7GRDQOv1I44omHj+Iz3fNocBs1JvJ5zO3oiqf2khUXblsji3LUrOaeHGUj4cSIBH5P7nQRnthjjE9FQLf+tY91FYcNEhcli1wD6WjmbWU= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1712591715; h=Content-Type:Content-Transfer-Encoding:Cc:Cc:Date:Date:From:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:Subject:To:To:Message-Id:Reply-To; bh=5kAFeFR3TFnC6ZvXg8Xbg86O1uug64SjMekWiPxE76o=; b=lKMZQiN+qK72SdqQ+ZlKIgJMphhIXSTQC6akD/kZ1RWAkvx9nqNIXVX+ciZJdGcNGOiRTCicHGXh+9JF66xkBYcaBXRUXDJ3C2A0Rd3WeYJs4Z98GjIvcr0B8YyeFWx0OKifq+UM46GwoadX1Gi4qrJ+Ipr8ru4RiKgkB8IoTns= 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+importer2=patchew.org@nongnu.org; dmarc=pass header.from= (p=none dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1712591715445696.751021685264; Mon, 8 Apr 2024 08:55:15 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1rtrKD-0001ZZ-0e; Mon, 08 Apr 2024 11:54: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 1rtrKB-0001Yd-Qv for qemu-devel@nongnu.org; Mon, 08 Apr 2024 11:54:23 -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 1rtrKA-0001rQ-96 for qemu-devel@nongnu.org; Mon, 08 Apr 2024 11:54:23 -0400 Received: from mail-wm1-f72.google.com (mail-wm1-f72.google.com [209.85.128.72]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-658-PE7CnRVSMwGPg3FO6Tz9Hg-1; Mon, 08 Apr 2024 11:54:20 -0400 Received: by mail-wm1-f72.google.com with SMTP id 5b1f17b1804b1-416664de900so9021365e9.2 for ; Mon, 08 Apr 2024 08:54:20 -0700 (PDT) Received: from avogadro.local ([151.95.152.232]) by smtp.gmail.com with ESMTPSA id i11-20020adff30b000000b0034334af2957sm9276431wro.37.2024.04.08.08.54.16 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 08 Apr 2024 08:54:16 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1712591661; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=5kAFeFR3TFnC6ZvXg8Xbg86O1uug64SjMekWiPxE76o=; b=cwV81roU+h3vrc0p5P4F2VAXiMHhyfUI+IJ079p8b2/gio4P6Il54P0W4y/w7MzcJKFLJx ntxRCzbfALRxUMZJ0eyBWU2qCqnzs+gmcxZl3ibruckAJu+szCucRL487iHNCvZGFWV1rG LXzAWL1Hz0pof8gGb8yxi//hWPUGyRQ= X-MC-Unique: PE7CnRVSMwGPg3FO6Tz9Hg-1 X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1712591658; x=1713196458; 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=5kAFeFR3TFnC6ZvXg8Xbg86O1uug64SjMekWiPxE76o=; b=RGvBnMhGwyjMKHXaD1lR3HM0Pz1h1q0e8XXb5/YNhjqvEuAgfjjYDeqz/e51iKXxwb xG1uN87YrKfUWBev/6714QZGEqCN/kUym9HBtCIXPg1VhE+KmaYH+sBw26xHuNoz3Va1 KePiVKIqE8Wmw5qydtR88bR67tcsjFHYS9eyXR9kEGUU5Wx07TCiBEvAgcXQhH5CFApQ vsk4L8q2VtroUfJZ/KZBJGbGF2vebDUyqiqlo+9VQmcqZkywGziR5mnk9meqM0QD2VDi +KDBBLK7DxMi0WUCZhGt1kQ+2HimfdeCef+IuFNDUwZGOTclx3wyfrODKU+GFTQi2wyY kurw== X-Gm-Message-State: AOJu0YyrbcpCUl+nqPsvLoAC0xJyb62USERs7KRIVNuj1eobUox9OIXZ 4pgL89mW7DOZb5qcDHUDYMqCFiXcGuxHpMSzdEPs6TAkrF2HTvf0mRyPdD74upwnjuAMX4c6DVU 2zNrx8j5mmenMEZMvwIN2L9qAUHoYNqomLE5k4Sc9nmqtqucR4kY/dslMAtkF7HBTWzOysQXd6T g/rsQn+boxbgTneWY2GOgU+AQuwD9kctBL3Db7 X-Received: by 2002:a05:600c:1906:b0:416:3217:15be with SMTP id j6-20020a05600c190600b00416321715bemr9490133wmq.35.1712591658269; Mon, 08 Apr 2024 08:54:18 -0700 (PDT) X-Google-Smtp-Source: AGHT+IE+C98nJTrHFPPnw9odefebrxdXIWiWcUNnyJuVsAcd5QoanIT+a34seTwiStU9JJY1CwZmxw== X-Received: by 2002:a05:600c:1906:b0:416:3217:15be with SMTP id j6-20020a05600c190600b00416321715bemr9490118wmq.35.1712591658024; Mon, 08 Apr 2024 08:54:18 -0700 (PDT) From: Paolo Bonzini To: qemu-devel@nongnu.org Cc: philmd@linaro.org Subject: [PATCH v2 15/18] colo: move stubs out of stubs/ Date: Mon, 8 Apr 2024 17:53:27 +0200 Message-ID: <20240408155330.522792-16-pbonzini@redhat.com> X-Mailer: git-send-email 2.44.0 In-Reply-To: <20240408155330.522792-1-pbonzini@redhat.com> References: <20240408155330.522792-1-pbonzini@redhat.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable 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+importer2=patchew.org@nongnu.org; helo=lists.gnu.org; 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: -35 X-Spam_score: -3.6 X-Spam_bar: --- X-Spam_report: (-3.6 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-1.494, 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+importer2=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer2=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @redhat.com) X-ZM-MESSAGEID: 1712591715894100002 Content-Type: text/plain; charset="utf-8" Since the colo stubs are needed exactly when the build options are not enabled, move them together with the code they stub. Signed-off-by: Paolo Bonzini --- stubs/colo.c =3D> migration/colo-stubs.c | 0 stubs/colo-compare.c =3D> net/colo-stubs.c | 0 migration/meson.build | 2 ++ net/meson.build | 2 ++ stubs/meson.build | 2 -- 5 files changed, 4 insertions(+), 2 deletions(-) rename stubs/colo.c =3D> migration/colo-stubs.c (100%) rename stubs/colo-compare.c =3D> net/colo-stubs.c (100%) diff --git a/stubs/colo.c b/migration/colo-stubs.c similarity index 100% rename from stubs/colo.c rename to migration/colo-stubs.c diff --git a/stubs/colo-compare.c b/net/colo-stubs.c similarity index 100% rename from stubs/colo-compare.c rename to net/colo-stubs.c diff --git a/migration/meson.build b/migration/meson.build index 1eeb915ff63..f76b1ba3289 100644 --- a/migration/meson.build +++ b/migration/meson.build @@ -34,6 +34,8 @@ system_ss.add(files( =20 if get_option('replication').allowed() system_ss.add(files('colo-failover.c', 'colo.c')) +else + system_ss.add(files('colo-stubs.c')) endif =20 system_ss.add(when: rdma, if_true: files('rdma.c')) diff --git a/net/meson.build b/net/meson.build index 9432a588e4e..e0cd71470e0 100644 --- a/net/meson.build +++ b/net/meson.build @@ -20,6 +20,8 @@ if get_option('replication').allowed() or \ get_option('colo_proxy').allowed() system_ss.add(files('colo-compare.c')) system_ss.add(files('colo.c')) +else + system_ss.add(files('colo-stubs.c')) endif =20 if get_option('colo_proxy').allowed() diff --git a/stubs/meson.build b/stubs/meson.build index a4404e765ab..a252bffad00 100644 --- a/stubs/meson.build +++ b/stubs/meson.build @@ -42,8 +42,6 @@ stub_ss.add(files('target-get-monitor-def.c')) stub_ss.add(files('target-monitor-defs.c')) stub_ss.add(files('trace-control.c')) stub_ss.add(files('uuid.c')) -stub_ss.add(files('colo.c')) -stub_ss.add(files('colo-compare.c')) stub_ss.add(files('vmstate.c')) stub_ss.add(files('vm-stop.c')) stub_ss.add(files('win32-kbd-hook.c')) --=20 2.44.0 From nobody Fri May 17 05:16:04 2024 Delivered-To: importer2@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+importer2=patchew.org@nongnu.org; dmarc=pass(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1712591888; cv=none; d=zohomail.com; s=zohoarc; b=h+ou7qqUkFMV6GOYLazwQjjLxjOF80Lu3i3UH3ToQ25fojHR7nvrDm31xFgRDgE79u90ZDaSTyM/op2BIEZaLEiumHrzUM9ppRN1O3fW/4dX81mzWw7aneqzJ9aLTfqDk28NqyecbjaG+t0cx6CJqZzeKCCXXGkTobVnNqveelw= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1712591888; h=Content-Type:Content-Transfer-Encoding:Cc:Cc:Date:Date:From:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:Subject:To:To:Message-Id:Reply-To; bh=OeF0i7q0SM9JchJ70Oic3dnROBkXEo3V3rWVabZC2/Q=; b=logR1nmO/4xbfypoiTsn8AgcUX2mRJXiSsEYqj4zlqq0/UPyV+G5THU5NIBwXwKqFICFk6UIYrZow+wrdo4JTvtt0O9MrwFKeDr6+/zGzAGj8gORvxe9hV7zmjJent85EGCmyirz35o9W6WAg2vhyKHxTq5t/VRdWfCKLN0lchM= 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+importer2=patchew.org@nongnu.org; dmarc=pass header.from= (p=none dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 171259188844568.27905268502002; Mon, 8 Apr 2024 08:58:08 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1rtrKN-0001ch-63; Mon, 08 Apr 2024 11:54:35 -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 1rtrKK-0001bv-L9 for qemu-devel@nongnu.org; Mon, 08 Apr 2024 11:54:33 -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 1rtrKD-0001rb-P6 for qemu-devel@nongnu.org; Mon, 08 Apr 2024 11:54:32 -0400 Received: from mail-lj1-f197.google.com (mail-lj1-f197.google.com [209.85.208.197]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-155-79GDfeVANC2dvIx1_lPyFg-1; Mon, 08 Apr 2024 11:54:23 -0400 Received: by mail-lj1-f197.google.com with SMTP id 38308e7fff4ca-2d8729a1126so22708661fa.3 for ; Mon, 08 Apr 2024 08:54:22 -0700 (PDT) Received: from avogadro.local ([151.95.152.232]) by smtp.gmail.com with ESMTPSA id l5-20020adfe9c5000000b00344a8f9cf18sm6660956wrn.7.2024.04.08.08.54.20 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 08 Apr 2024 08:54:20 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1712591665; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=OeF0i7q0SM9JchJ70Oic3dnROBkXEo3V3rWVabZC2/Q=; b=O8bsJqVyzHQhWDB2mSQxWiB/+bCuTGnZeeC04dzvggEiuzCY9tfwG/G/SJgXZ/3sj48PaQ QkoT9tI9EP/9DLllz7pW224bif/Ab3Jn63Kp6bObPpc29jvdvGKqwPstBzk7IbLXYkP+E+ 7KMt3yAeXy6a5leiMN9UKM0up+sUP9c= X-MC-Unique: 79GDfeVANC2dvIx1_lPyFg-1 X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1712591661; x=1713196461; 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=OeF0i7q0SM9JchJ70Oic3dnROBkXEo3V3rWVabZC2/Q=; b=wn8giDCEKrK1wfmJOaC4DYZV4OIkM+ZRDVxc0VpNJZqQALzJbaiJBEwpoPlrCe3hI1 qLLuus27+ip/3SBFl0TM2CYJH6rUbw7v7veios7c6XZQsP6Leb9GJGLGtqlUNiTF/vVN 69JvlBGnK/a2X7V5LZQNtHLa7s/I9LjpWqJgJomtqedto4z9nTnfY0+5Sx+81wzIy17w VPxuCuRFlWVAqW8ETBZHmilnNcezzapeH6cCCGAq6diXIVgkmydTxjMal2LHGUZ/d6TM se7rRNvFqQdhqFrJ3Gng451iBEhpVkRo8uoHqONA6PObijnP+zHXBgw7SjM5i2K9xlVi l1cA== X-Gm-Message-State: AOJu0YytflyspZuLOw/4lfXTBhaHO/gU94acqIXTEjk2IHk0WzK3bVx/ iAUqBSh2BNZ6vhaScaxKdB7xcNB6vvQlshVTEBDcYXG3e0fN+RMVyz8py6acuF24MVKUj6Z+Xog MBFMarxi0miwywIrsiWQdwNTE9A4hY1iwyOlVL6wrIsg9Bv4SD7vks787ln5TReVwrPDgThTsE6 sF74iAy6TmtVFFk08Y3Fsm2Hab3yLvX7zyxeMm X-Received: by 2002:a2e:7e12:0:b0:2d8:6787:eb45 with SMTP id z18-20020a2e7e12000000b002d86787eb45mr5412161ljc.25.1712591661056; Mon, 08 Apr 2024 08:54:21 -0700 (PDT) X-Google-Smtp-Source: AGHT+IFIo+Y27WDuwjl3tYOc5fyfTjhuuYo0nwCZpQebjSkF13C0J3K2UClBQsL8uHzwiVF2dUWSpw== X-Received: by 2002:a2e:7e12:0:b0:2d8:6787:eb45 with SMTP id z18-20020a2e7e12000000b002d86787eb45mr5412147ljc.25.1712591660688; Mon, 08 Apr 2024 08:54:20 -0700 (PDT) From: Paolo Bonzini To: qemu-devel@nongnu.org Cc: philmd@linaro.org Subject: [PATCH v2 16/18] stubs: split record/replay stubs further Date: Mon, 8 Apr 2024 17:53:28 +0200 Message-ID: <20240408155330.522792-17-pbonzini@redhat.com> X-Mailer: git-send-email 2.44.0 In-Reply-To: <20240408155330.522792-1-pbonzini@redhat.com> References: <20240408155330.522792-1-pbonzini@redhat.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable 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+importer2=patchew.org@nongnu.org; helo=lists.gnu.org; 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: -35 X-Spam_score: -3.6 X-Spam_bar: --- X-Spam_report: (-3.6 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-1.494, 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+importer2=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer2=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @redhat.com) X-ZM-MESSAGEID: 1712591888913100001 Content-Type: text/plain; charset="utf-8" replay.c symbols are only needed by user mode emulation, with the exception of replay_mode that is needed by both user mode emulation (by way of qemu_guest_getrandom) and block layer tools (by way of util/qemu-timer.c). Since it is needed by libqemuutil rather than specific files that are part of the tools and emulators, split the replay_mode stub into its own file. Signed-off-by: Paolo Bonzini --- stubs/replay-mode.c | 4 ++++ stubs/replay.c | 2 -- stubs/meson.build | 1 + 3 files changed, 5 insertions(+), 2 deletions(-) create mode 100644 stubs/replay-mode.c diff --git a/stubs/replay-mode.c b/stubs/replay-mode.c new file mode 100644 index 00000000000..264be9d96c9 --- /dev/null +++ b/stubs/replay-mode.c @@ -0,0 +1,4 @@ +#include "qemu/osdep.h" +#include "sysemu/replay.h" + +ReplayMode replay_mode; diff --git a/stubs/replay.c b/stubs/replay.c index 42c92e4acb8..b4dd6a566e8 100644 --- a/stubs/replay.c +++ b/stubs/replay.c @@ -1,8 +1,6 @@ #include "qemu/osdep.h" #include "exec/replay-core.h" =20 -ReplayMode replay_mode; - void replay_finish(void) { } diff --git a/stubs/meson.build b/stubs/meson.build index a252bffad00..4a524f5816b 100644 --- a/stubs/meson.build +++ b/stubs/meson.build @@ -36,6 +36,7 @@ stub_ss.add(files('qmp-quit.c')) stub_ss.add(files('qtest.c')) stub_ss.add(files('ram-block.c')) stub_ss.add(files('replay.c')) +stub_ss.add(files('replay-mode.c')) stub_ss.add(files('runstate-check.c')) stub_ss.add(files('sysbus.c')) stub_ss.add(files('target-get-monitor-def.c')) --=20 2.44.0 From nobody Fri May 17 05:16:04 2024 Delivered-To: importer2@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+importer2=patchew.org@nongnu.org; dmarc=pass(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1712591786; cv=none; d=zohomail.com; s=zohoarc; b=eaRXaeDXWUtNsPEaB7FIb2bDCfk/R6ztoVRKpFWBqsaDNqrxfqKMdVX+3sZUSXqHi3IuSaCBaxk9HYPTDyogGXM6d4JFO0EOEb5kPgGWj7kdPP+Q3/1VwWy+wFTlE+fpfHOYknPdkgZ2amendtiFcqnvNbBNXuiK7547+lQS/9c= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1712591786; h=Content-Type:Content-Transfer-Encoding:Cc:Cc:Date:Date:From:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:Subject:To:To:Message-Id:Reply-To; bh=kzLCimdhAyi0rVMbm3kXFpGr3NcS9gM1RUctxanXbE8=; b=Gfhd1+YVV+UuriSY2Ee/8ByMqmNo0Kxaro3d99Jsp4lHsZXuyjBcEKSmarzIAEtp2cWkdEekefnvAmS3IhAC7vas15hszBHtdJXovnmaFhL+z0c/+9hQiwmEOTtTeuQ/tTjKoVbEYPZUIR2D7SU8RtvZryoy/jrhPlho7DOFeTk= 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+importer2=patchew.org@nongnu.org; dmarc=pass header.from= (p=none dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1712591786055150.1943984677863; Mon, 8 Apr 2024 08:56:26 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1rtrKK-0001be-AM; Mon, 08 Apr 2024 11:54:32 -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 1rtrKI-0001bG-37 for qemu-devel@nongnu.org; Mon, 08 Apr 2024 11:54:30 -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 1rtrKF-0001rg-Vl for qemu-devel@nongnu.org; Mon, 08 Apr 2024 11:54:29 -0400 Received: from mail-wm1-f70.google.com (mail-wm1-f70.google.com [209.85.128.70]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-617-LUCuDad-PeG03Rixa8diLQ-1; Mon, 08 Apr 2024 11:54:26 -0400 Received: by mail-wm1-f70.google.com with SMTP id 5b1f17b1804b1-41545bc8962so20502085e9.2 for ; Mon, 08 Apr 2024 08:54:26 -0700 (PDT) Received: from avogadro.local ([151.95.152.232]) by smtp.gmail.com with ESMTPSA id jg1-20020a05600ca00100b00414688af147sm16994248wmb.20.2024.04.08.08.54.22 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 08 Apr 2024 08:54:22 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1712591667; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=kzLCimdhAyi0rVMbm3kXFpGr3NcS9gM1RUctxanXbE8=; b=HHeB7toBz2NbMGkTgVG4cjcWs7ja88273gytvrjEvaF4+1rYVb1n+EvkNlphfqvZiuAqTA eTw4c700QzruqKzBTM5D/H0LYOaARDmtZ2m5g70p676t1BQ18wupAtdJKlFsbJJfckiIVc DFOo7rJpMUJYuX+TLaH2k8aWUXrJ8HI= X-MC-Unique: LUCuDad-PeG03Rixa8diLQ-1 X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1712591664; x=1713196464; 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=kzLCimdhAyi0rVMbm3kXFpGr3NcS9gM1RUctxanXbE8=; b=EgXiDXjBdxKvN/ml8aH6w4UWoBPtUr6Bl3DVM33MYj5e6sEECoezjmRaxt+BKlj2ea KJFkTn1nqngh2In+Alz5ppfWIel8J8CD/DzuFRz4KtjQ77182g++mXqSnio8NBoQB8rp u5LTwBLDxKGJ//nX7XUKUU2Lx86S62lcVRmEfrBTHTJ8mWdw1Zl7P/TQS6nerebLENiv vX8vBEzznB6YK0rRMicp2tU22Tfgzl7bKxr+a/8Eq019r6DIhUWUX1QVPmhWqN3lWLzX jIUwshKcl2qhwZzCg9HbkCCvKmhbMHAUe2y+gVsQm4OzVOofeP5EW8XdQ1GuLhqSWa+1 IwMQ== X-Gm-Message-State: AOJu0YyML2iM6Sug8GCkQLKEjJKI5V3oW4DGqUl1gRm+iIPiEZj47FTG ILQxLE89+xmsKXUxXCR/8BxTIO77LWMp5CX3vcTql3g83fvK+IVwejcIGmW/SIwGODyY4ZW5ugt FEw6vVwBNJtRA0KLX7/luVIGHJu40qLeWxY29Mi5QorN4MdoGF5/h6hDE2P8cUCLDAUkhZFjsVg 7Tyt1F+2Ewzq/O0nZX+lnr8K74etw6zybDAQao X-Received: by 2002:a05:600c:4fcf:b0:415:6456:c530 with SMTP id o15-20020a05600c4fcf00b004156456c530mr6842357wmq.14.1712591664312; Mon, 08 Apr 2024 08:54:24 -0700 (PDT) X-Google-Smtp-Source: AGHT+IFkrHzUmRjlW5K21kYzQ2sQ8L4wMJGkCkZA+fN1zJHrc6uSXQXBStJ1qiJ0gyurnRF8F/dT2g== X-Received: by 2002:a05:600c:4fcf:b0:415:6456:c530 with SMTP id o15-20020a05600c4fcf00b004156456c530mr6842341wmq.14.1712591663951; Mon, 08 Apr 2024 08:54:23 -0700 (PDT) From: Paolo Bonzini To: qemu-devel@nongnu.org Cc: philmd@linaro.org Subject: [PATCH v2 17/18] stubs: include stubs only if needed Date: Mon, 8 Apr 2024 17:53:29 +0200 Message-ID: <20240408155330.522792-18-pbonzini@redhat.com> X-Mailer: git-send-email 2.44.0 In-Reply-To: <20240408155330.522792-1-pbonzini@redhat.com> References: <20240408155330.522792-1-pbonzini@redhat.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable 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+importer2=patchew.org@nongnu.org; helo=lists.gnu.org; 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: -35 X-Spam_score: -3.6 X-Spam_bar: --- X-Spam_report: (-3.6 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-1.494, 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+importer2=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer2=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @redhat.com) X-ZM-MESSAGEID: 1712591786429100017 Content-Type: text/plain; charset="utf-8" Currently it is not documented anywhere why some functions need to be stubbed. Group the files in stubs/meson.build according to who needs them, both to reduce the size of the compilation and to clarify the use of stubs. Signed-off-by: Paolo Bonzini --- stubs/{monitor.c =3D> monitor-internal.c} | 0 stubs/meson.build | 122 +++++++++++++++--------- 2 files changed, 75 insertions(+), 47 deletions(-) rename stubs/{monitor.c =3D> monitor-internal.c} (100%) diff --git a/stubs/monitor.c b/stubs/monitor-internal.c similarity index 100% rename from stubs/monitor.c rename to stubs/monitor-internal.c diff --git a/stubs/meson.build b/stubs/meson.build index 4a524f5816b..8ff25faaf1c 100644 --- a/stubs/meson.build +++ b/stubs/meson.build @@ -1,58 +1,86 @@ -stub_ss.add(files('bdrv-next-monitor-owned.c')) -stub_ss.add(files('blk-commit-all.c')) -stub_ss.add(files('blk-exp-close-all.c')) -stub_ss.add(files('blockdev-close-all-bdrv-states.c')) -stub_ss.add(files('change-state-handler.c')) -stub_ss.add(files('cmos.c')) +# If possible, add new files to other directories, by using "if_false". +# If you need them here, try to add them under one of the if statements +# below, so that it is clear who needs the stubbed functionality. + stub_ss.add(files('cpu-get-clock.c')) -stub_ss.add(files('cpus-get-virtual-clock.c')) -stub_ss.add(files('qemu-timer-notify-cb.c')) -stub_ss.add(files('icount.c')) -stub_ss.add(files('dump.c')) -stub_ss.add(files('error-printf.c')) stub_ss.add(files('fdset.c')) -stub_ss.add(files('gdbstub.c')) -stub_ss.add(files('get-vm-name.c')) -stub_ss.add(files('graph-lock.c')) -stub_ss.add(files('hotplug-stubs.c')) -if linux_io_uring.found() - stub_ss.add(files('io_uring.c')) -endif stub_ss.add(files('iothread-lock.c')) -if have_block - stub_ss.add(files('iothread-lock-block.c')) -endif stub_ss.add(files('is-daemonized.c')) -if libaio.found() - stub_ss.add(files('linux-aio.c')) -endif -stub_ss.add(files('migr-blocker.c')) -stub_ss.add(files('monitor.c')) stub_ss.add(files('monitor-core.c')) -stub_ss.add(files('physmem.c')) -stub_ss.add(files('qemu-timer-notify-cb.c')) -stub_ss.add(files('qmp-command-available.c')) -stub_ss.add(files('qmp-quit.c')) -stub_ss.add(files('qtest.c')) -stub_ss.add(files('ram-block.c')) -stub_ss.add(files('replay.c')) stub_ss.add(files('replay-mode.c')) -stub_ss.add(files('runstate-check.c')) -stub_ss.add(files('sysbus.c')) -stub_ss.add(files('target-get-monitor-def.c')) -stub_ss.add(files('target-monitor-defs.c')) stub_ss.add(files('trace-control.c')) -stub_ss.add(files('uuid.c')) -stub_ss.add(files('vmstate.c')) -stub_ss.add(files('vm-stop.c')) -stub_ss.add(files('win32-kbd-hook.c')) -stub_ss.add(files('cpu-synchronize-state.c')) -if have_block or have_ga + +if have_block + stub_ss.add(files('bdrv-next-monitor-owned.c')) + stub_ss.add(files('blk-commit-all.c')) + stub_ss.add(files('blk-exp-close-all.c')) + stub_ss.add(files('blockdev-close-all-bdrv-states.c')) + stub_ss.add(files('change-state-handler.c')) + stub_ss.add(files('get-vm-name.c')) + stub_ss.add(files('iothread-lock-block.c')) + stub_ss.add(files('migr-blocker.c')) + stub_ss.add(files('physmem.c')) + stub_ss.add(files('ram-block.c')) stub_ss.add(files('replay-tools.c')) + stub_ss.add(files('runstate-check.c')) + stub_ss.add(files('uuid.c')) endif -if have_system - stub_ss.add(files('fw_cfg.c')) - stub_ss.add(files('xen-hw-stub.c')) -else + +if have_block or have_ga + # stubs for hooks in util/main-loop.c, util/async.c etc. + stub_ss.add(files('cpus-get-virtual-clock.c')) + stub_ss.add(files('icount.c')) + stub_ss.add(files('graph-lock.c')) + if linux_io_uring.found() + stub_ss.add(files('io_uring.c')) + endif + if libaio.found() + stub_ss.add(files('linux-aio.c')) + endif + stub_ss.add(files('qemu-timer-notify-cb.c')) + + # stubs for monitor + stub_ss.add(files('monitor-internal.c')) + stub_ss.add(files('qmp-command-available.c')) + stub_ss.add(files('qmp-quit.c')) +endif + +if have_block or have_user + stub_ss.add(files('qtest.c')) + stub_ss.add(files('vm-stop.c')) + stub_ss.add(files('vmstate.c')) + + # more symbols provided by the monitor + stub_ss.add(files('error-printf.c')) +endif + +if have_user + # Symbols that are used by hw/core. + stub_ss.add(files('cpu-synchronize-state.c')) stub_ss.add(files('qdev.c')) endif + +if have_system + # Symbols that are only needed in some configurations. Try not + # adding more of these. If the symbol is used in specific_ss, + # in particular, consider adding a symbol in configs/targets/ + # instead. + stub_ss.add(files('dump.c')) + stub_ss.add(files('cmos.c')) + stub_ss.add(files('fw_cfg.c')) + stub_ss.add(files('target-get-monitor-def.c')) + stub_ss.add(files('target-monitor-defs.c')) + stub_ss.add(files('win32-kbd-hook.c')) + stub_ss.add(files('xen-hw-stub.c')) +endif + +if have_system or have_user + stub_ss.add(files('gdbstub.c')) + + # Also included in have_system for --disable-tcg builds + stub_ss.add(files('replay.c')) + + # Also included in have_system for tests/unit/test-qdev-global-props + stub_ss.add(files('hotplug-stubs.c')) + stub_ss.add(files('sysbus.c')) +endif --=20 2.44.0 From nobody Fri May 17 05:16:04 2024 Delivered-To: importer2@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+importer2=patchew.org@nongnu.org; dmarc=pass(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1712591714; cv=none; d=zohomail.com; s=zohoarc; b=ZearNUfEoZAuqi+XDRGQDKgWH1yEqWPTiwnQW4gMEMOGpYUKWmOCkeKJR0bUT7YedB79CY4hCFalRurhcIwZbGBA009Ab3GD/G3zOIgJSrJfMfQ3PPVQYLfPAGPJX1vez8332ufazfd2eLYCBjp0LG61cD4j20e4AZD2pNgvWcE= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1712591714; h=Content-Type:Content-Transfer-Encoding:Cc:Cc:Date:Date:From:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:Subject:To:To:Message-Id:Reply-To; bh=8O1sCH//2khNzwilmMHZpPjVB9bTVHLD9KmdZboVxcI=; b=JkskIQHi09Z/mDWHpDRRUVVdo/UEj8ymTi5ZuHU9KY5gkh53owwik5GLp5KMFMaJLz3cnQEJ+CEc2Bf52Vmf1emo9e/FXYdtidL4fN1F+jInTogQtQUp1h4j+BLVpvEE8GpV7TAWPwP+TZE4JTbzjE4KuVHoi6C+llfvl1a3kb8= 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+importer2=patchew.org@nongnu.org; dmarc=pass header.from= (p=none dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1712591714686103.88058935570473; Mon, 8 Apr 2024 08:55:14 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1rtrKP-0001eY-4o; Mon, 08 Apr 2024 11:54: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 1rtrKL-0001cT-NR for qemu-devel@nongnu.org; Mon, 08 Apr 2024 11:54:34 -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 1rtrKJ-0001rp-AJ for qemu-devel@nongnu.org; Mon, 08 Apr 2024 11:54:32 -0400 Received: from mail-wr1-f71.google.com (mail-wr1-f71.google.com [209.85.221.71]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-610-LX7vRJDoMRWIkmkA4dU4fw-1; Mon, 08 Apr 2024 11:54:28 -0400 Received: by mail-wr1-f71.google.com with SMTP id ffacd0b85a97d-343f8b51910so1431668f8f.3 for ; Mon, 08 Apr 2024 08:54:28 -0700 (PDT) Received: from avogadro.local ([151.95.152.232]) by smtp.gmail.com with ESMTPSA id k26-20020adfb35a000000b0034607c7d194sm302429wrd.8.2024.04.08.08.54.25 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 08 Apr 2024 08:54:26 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1712591670; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=8O1sCH//2khNzwilmMHZpPjVB9bTVHLD9KmdZboVxcI=; b=HUJHyquIhZw9ClOUCkSS6JaH5g7fxPrfM/X70GmMrG0dJVC+CGBBLe6pAP/RgIwPwFJgEg 2bHqNVOqqlOMJTDICW0Ek4xCphiU5eqXrEUpQXpy0sYlB1IaXDefD5sApCtbV4P4CtZ1GU jdhszUAdUg0eRY3S4/psTkwSRzBfgtc= X-MC-Unique: LX7vRJDoMRWIkmkA4dU4fw-1 X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1712591666; x=1713196466; 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=8O1sCH//2khNzwilmMHZpPjVB9bTVHLD9KmdZboVxcI=; b=Cci6vL7SuzxCfmAANfTWGWVWsmOBXkNmpCYxa1fuJwk+FhT3XF6MGaXlgZsp1MXSv4 hFxdi6uZjmzs4/YdgwT1afRx3+ryUpbL81MD0ofVni80WvWFqDXai/oRptBcDyC1sL/k xs/okrpZ/2pFepz3VYOVwOCYg7ngce8Kbhsp4rwx0aWdjpyClUr64ZJE2KkRO1EpI20n tzCKMAqYs5k56iZUjX38mgmdTx5oDGqbOhxAuvLx8IwGLyPv7zO1yklvx12MKegcR9BC DOAU0a6ODDY7HAxqeGP91jUdvKAM6lZxdmWUdYOfhb+B6Ro/cS6T6otO7Vn+wYB/nEHe 0PDg== X-Gm-Message-State: AOJu0YyHpLXtNMaxPhdXrApwZCp1Jzi87nhRaYGLHQl5JoPyhzxETECi KYN7PF3F7muGOFizF8amj5OG/YEt8Kx8qMRrIXhQiZICGPZoT2VDWLWTId7kdNt8ItywDGI3Yft ooW7REnqNvw0rol9WaojGUpA+Z+wYvPFer3WZajVUONWkLhh5WVYz7uZKeghXNBdhBGLZ70Veu8 lcbmFdLnp2jmtG+3sfQh/numc1HeulXHUs/dxS X-Received: by 2002:a5d:64cf:0:b0:33d:c657:6ae3 with SMTP id f15-20020a5d64cf000000b0033dc6576ae3mr9372015wri.7.1712591666758; Mon, 08 Apr 2024 08:54:26 -0700 (PDT) X-Google-Smtp-Source: AGHT+IHsebQi1+SKUqEl/6WVAJcKM5Us5+PJlc7NfjUB6OgjychLQlmTG/0iAiXB6/7IdOOLNdK8mg== X-Received: by 2002:a5d:64cf:0:b0:33d:c657:6ae3 with SMTP id f15-20020a5d64cf000000b0033dc6576ae3mr9372004wri.7.1712591666516; Mon, 08 Apr 2024 08:54:26 -0700 (PDT) From: Paolo Bonzini To: qemu-devel@nongnu.org Cc: philmd@linaro.org Subject: [PATCH v2 18/18] stubs: move monitor_fdsets_cleanup with other fdset stubs Date: Mon, 8 Apr 2024 17:53:30 +0200 Message-ID: <20240408155330.522792-19-pbonzini@redhat.com> X-Mailer: git-send-email 2.44.0 In-Reply-To: <20240408155330.522792-1-pbonzini@redhat.com> References: <20240408155330.522792-1-pbonzini@redhat.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable 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+importer2=patchew.org@nongnu.org; helo=lists.gnu.org; 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: -35 X-Spam_score: -3.6 X-Spam_bar: --- X-Spam_report: (-3.6 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-1.494, 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+importer2=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer2=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @redhat.com) X-ZM-MESSAGEID: 1712591715886100001 Content-Type: text/plain; charset="utf-8" Even though monitor_get_fd() has to remain separate because it is mocked by tests/unit/test-util-sockets, monitor_fdsets_cleanup() is logically part of the stubs for monitor/fds.c, so move it there. Signed-off-by: Paolo Bonzini Reviewed-by: Richard Henderson --- stubs/fdset.c | 6 ++++++ stubs/monitor-internal.c | 5 ----- 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/stubs/fdset.c b/stubs/fdset.c index 56b3663d588..d7c39a28acb 100644 --- a/stubs/fdset.c +++ b/stubs/fdset.c @@ -1,5 +1,7 @@ #include "qemu/osdep.h" +#include "qapi/error.h" #include "monitor/monitor.h" +#include "../monitor/monitor-internal.h" =20 int monitor_fdset_dup_fd_add(int64_t fdset_id, int flags) { @@ -15,3 +17,7 @@ int64_t monitor_fdset_dup_fd_find(int dup_fd) void monitor_fdset_dup_fd_remove(int dupfd) { } + +void monitor_fdsets_cleanup(void) +{ +} diff --git a/stubs/monitor-internal.c b/stubs/monitor-internal.c index 20786ac4ffb..4fece49d531 100644 --- a/stubs/monitor-internal.c +++ b/stubs/monitor-internal.c @@ -1,7 +1,6 @@ #include "qemu/osdep.h" #include "qapi/error.h" #include "monitor/monitor.h" -#include "../monitor/monitor-internal.h" =20 int monitor_get_fd(Monitor *mon, const char *name, Error **errp) { @@ -12,7 +11,3 @@ int monitor_get_fd(Monitor *mon, const char *name, Error = **errp) void monitor_init_hmp(Chardev *chr, bool use_readline, Error **errp) { } - -void monitor_fdsets_cleanup(void) -{ -} --=20 2.44.0