From patchwork Thu Oct 28 15:05:18 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= X-Patchwork-Id: 12590417 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 76845C433F5 for ; Thu, 28 Oct 2021 15:12:03 +0000 (UTC) Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id B1B4061214 for ; Thu, 28 Oct 2021 15:12:02 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.4.1 mail.kernel.org B1B4061214 Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=redhat.com Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=nongnu.org Received: from localhost ([::1]:37878 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1mg74T-0005kV-Qd for qemu-devel@archiver.kernel.org; Thu, 28 Oct 2021 11:12:01 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:39548) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1mg6yG-0006gV-2i for qemu-devel@nongnu.org; Thu, 28 Oct 2021 11:05:36 -0400 Received: from us-smtp-delivery-124.mimecast.com ([216.205.24.124]:36195) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1mg6yD-00078L-33 for qemu-devel@nongnu.org; Thu, 28 Oct 2021 11:05:35 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1635433532; 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=64kbEvhgsvTtmcrJ2XOWOXD5KZT50cBaqVp/eA5mjE8=; b=hXE+leyqyK3Q5y3UBVdp/XtoUIbT+AH5OzNTyMGeZKDzqWTtcMzK3L7h9TzGWNolDIVWwM MYj8+pTJFD3hxZwP6+D8K1+9vIplH8N86p9uZMmQDhpf7fzgIo8xVX+Zs/IKEhbRIj2bcE HCz1J1gzdNRUdMl1sxY1hLan4uFr+oc= Received: from mail-wr1-f69.google.com (mail-wr1-f69.google.com [209.85.221.69]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-557-NLPHQToXMcSiu57vTXtbJQ-1; Thu, 28 Oct 2021 11:05:31 -0400 X-MC-Unique: NLPHQToXMcSiu57vTXtbJQ-1 Received: by mail-wr1-f69.google.com with SMTP id c4-20020a056000184400b0016e0cc310b3so2243399wri.3 for ; Thu, 28 Oct 2021 08:05:30 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=64kbEvhgsvTtmcrJ2XOWOXD5KZT50cBaqVp/eA5mjE8=; b=gQxHv18MWvfoCwjjyGA2RlpUGDTW5ZEOlBJ4mpg1MF+h54YLaCQWiLITd9W+kTnOVT yuISX8d3+Kl1Mc6ZKDxjFXnVQePDhph0cZsdRwMA8O0RIXVTbwFLfYhF8GsYMdmWt2Cr 0Of9gp2OQUwBwgOn9uA2J/rqEuGjFPQUoi++09EmYahI8ZA2Q2vGKmvY6gin9+DopSHV H+5tyVLhpahdpduS5IxGWARe/f0gY+ALEnyxB3GxyaSM9umkvlXmx6jph75/fuTKi43e EcNJxNViBy/Z8YqDpB8Y2JTU4k53aqP9/g8D/l/rG8z04QoynfTj/iSCIWK37fb+TT/g xWfg== X-Gm-Message-State: AOAM532dmy9I0xzNh2yHQt27bSPrPqm2T2SgOuYjJDrbPlPYNe4kwdtW kCTP9j/4pNNtJnqlZh5oiYs6028vYxAa1UT8wAr5BJEf2lzrujfFGm8NUMV0xZa00X0mNN0Thiq WpMvf6THfDL+bM6jBwxJ1jX65qGvZaVBpIagQzMTO2pnMDRPIi7lLBdFTpvDaxtou X-Received: by 2002:a05:600c:3581:: with SMTP id p1mr12883779wmq.34.1635433529429; Thu, 28 Oct 2021 08:05:29 -0700 (PDT) X-Google-Smtp-Source: ABdhPJw9cNv+UTrZZcL1WQuz+EcitzSKpMp9UvkyFxL9PUhH9XTloF6Tsz5tBixL62aVHvKKaiXXmQ== X-Received: by 2002:a05:600c:3581:: with SMTP id p1mr12883730wmq.34.1635433529134; Thu, 28 Oct 2021 08:05:29 -0700 (PDT) Received: from x1w.redhat.com (62.red-83-57-168.dynamicip.rima-tde.net. [83.57.168.62]) by smtp.gmail.com with ESMTPSA id j10sm3176917wrx.94.2021.10.28.08.05.27 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 28 Oct 2021 08:05:28 -0700 (PDT) From: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Subject: [PATCH 1/4] hw/core: Restrict sysemu specific files Date: Thu, 28 Oct 2021 17:05:18 +0200 Message-Id: <20211028150521.1973821-2-philmd@redhat.com> X-Mailer: git-send-email 2.31.1 In-Reply-To: <20211028150521.1973821-1-philmd@redhat.com> References: <20211028150521.1973821-1-philmd@redhat.com> MIME-Version: 1.0 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=philmd@redhat.com X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Received-SPF: pass client-ip=216.205.24.124; envelope-from=philmd@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-Spam_score_int: -27 X-Spam_score: -2.8 X-Spam_bar: -- X-Spam_report: (-2.8 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.001, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_LOW=-0.7, RCVD_IN_MSPIKE_H2=-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.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: =?utf-8?q?Daniel_P=2E_Berrang=C3=A9?= , Eduardo Habkost , Yanan Wang , Igor Mammedov , Paolo Bonzini , =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= Errors-To: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Sender: "Qemu-devel" All these files don't make sense for tools and user emulation, restrict them to system emulation. Signed-off-by: Philippe Mathieu-Daudé Reviewed-by: Yanan Wang Tested-by: Yanan Wang --- hw/core/meson.build | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/hw/core/meson.build b/hw/core/meson.build index 18f44fb7c24..a829cc4245b 100644 --- a/hw/core/meson.build +++ b/hw/core/meson.build @@ -14,15 +14,15 @@ ) common_ss.add(files('cpu-common.c')) -common_ss.add(when: 'CONFIG_FITLOADER', if_true: files('loader-fit.c')) -common_ss.add(when: 'CONFIG_GENERIC_LOADER', if_true: files('generic-loader.c')) -common_ss.add(when: ['CONFIG_GUEST_LOADER', fdt], if_true: files('guest-loader.c')) -common_ss.add(when: 'CONFIG_OR_IRQ', if_true: files('or-irq.c')) -common_ss.add(when: 'CONFIG_PLATFORM_BUS', if_true: files('platform-bus.c')) -common_ss.add(when: 'CONFIG_PTIMER', if_true: files('ptimer.c')) -common_ss.add(when: 'CONFIG_REGISTER', if_true: files('register.c')) -common_ss.add(when: 'CONFIG_SPLIT_IRQ', if_true: files('split-irq.c')) -common_ss.add(when: 'CONFIG_XILINX_AXI', if_true: files('stream.c')) +softmmu_ss.add(when: 'CONFIG_FITLOADER', if_true: files('loader-fit.c')) +softmmu_ss.add(when: 'CONFIG_GENERIC_LOADER', if_true: files('generic-loader.c')) +softmmu_ss.add(when: ['CONFIG_GUEST_LOADER', fdt], if_true: files('guest-loader.c')) +softmmu_ss.add(when: 'CONFIG_OR_IRQ', if_true: files('or-irq.c')) +softmmu_ss.add(when: 'CONFIG_PLATFORM_BUS', if_true: files('platform-bus.c')) +softmmu_ss.add(when: 'CONFIG_PTIMER', if_true: files('ptimer.c')) +softmmu_ss.add(when: 'CONFIG_REGISTER', if_true: files('register.c')) +softmmu_ss.add(when: 'CONFIG_SPLIT_IRQ', if_true: files('split-irq.c')) +softmmu_ss.add(when: 'CONFIG_XILINX_AXI', if_true: files('stream.c')) softmmu_ss.add(files( 'cpu-sysemu.c', From patchwork Thu Oct 28 15:05:19 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= X-Patchwork-Id: 12590427 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 17A8DC433EF for ; Thu, 28 Oct 2021 15:14:20 +0000 (UTC) Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id A59F761130 for ; Thu, 28 Oct 2021 15:14:19 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.4.1 mail.kernel.org A59F761130 Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=redhat.com Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=nongnu.org Received: from localhost ([::1]:45380 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1mg76g-0002Ga-Od for qemu-devel@archiver.kernel.org; Thu, 28 Oct 2021 11:14:18 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:39564) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1mg6yL-0006ji-63 for qemu-devel@nongnu.org; Thu, 28 Oct 2021 11:05:42 -0400 Received: from us-smtp-delivery-124.mimecast.com ([170.10.133.124]:33452) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1mg6yH-00078l-SM for qemu-devel@nongnu.org; Thu, 28 Oct 2021 11:05:40 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1635433536; 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=bgN4VtmbpKha1U3dbSRWObWfSCBYh9C5Ynebd+aNbtU=; b=WUBXmjcwI5YDMjaD2tpxBKq1E2IYtqo1lsbJs8NKAd5jpz9V9TOJAQD9AHN46fGFuGK/uT IQ2TeE48U0E5FxK56rXwemKP9sgpKTlow4jPJTmnLEchXkY2CFJzIYZFLdgdr4Z/KnkqD8 1CLfQXSUti5k3PkuEdOl1Yrpfkel3Zs= Received: from mail-wr1-f69.google.com (mail-wr1-f69.google.com [209.85.221.69]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-188-f_1ua9ihPxuGDV2o8o3dHQ-1; Thu, 28 Oct 2021 11:05:35 -0400 X-MC-Unique: f_1ua9ihPxuGDV2o8o3dHQ-1 Received: by mail-wr1-f69.google.com with SMTP id d13-20020adf9b8d000000b00160a94c235aso2246908wrc.2 for ; Thu, 28 Oct 2021 08:05:35 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=bgN4VtmbpKha1U3dbSRWObWfSCBYh9C5Ynebd+aNbtU=; b=VLrOcDrs+SmaFdazM59jjwtd/i6vxkoa2zRcP/wRpeCrAf1qeboa3T7zDQ7EA3XtN7 ipYmijZJUhq/CZX/mGjBz/qJkpaJZOvpcH+C0rDHt+ZMhLLYtmA1yJWO6Bj4G501evCF LE1C0/OTNhKFMKVkLQ8ZcLAu+TyvtJEo0QDye6WGAaebiWfODi8hlGIxA0Y0gTuhDvY0 ONtoVMGFzlS6SljI6WKUEhfAQa39AKw4QWMVlkJoNgnE57rPq8eX42nIkyE784rdJqRg upfrCoCr3fq1poA3muhj3GEmDsFmjtVPqTW0MZizENPqmDtNDkuUt9AVfQptp0Q5FoeR qJhA== X-Gm-Message-State: AOAM530M/Dm3/uTHug79qN4xNXHtHlgtCISW/ryz7TTkMu8ORKADV0Hq l0vZOPycCL7Tj/hmGU8J0CD8plyQnITspkUXg9y9Rdvb9BoAH4mOYLE2uCDtq/ZKxKw5ySmmILq TOzcjnTUS4nCdufjQrOBTukljvrihHc3zqaW4RrS+UoN4DcATPQXRD5PiLrC+KKt1 X-Received: by 2002:a05:600c:4ca9:: with SMTP id g41mr5044235wmp.139.1635433533876; Thu, 28 Oct 2021 08:05:33 -0700 (PDT) X-Google-Smtp-Source: ABdhPJzBY6nM4w+6cGO0BZPqNwsdGY74MpF1H5H5JYsXRWlFcytsIqWLK8OMU19gFFGgxqk/oSM8Fg== X-Received: by 2002:a05:600c:4ca9:: with SMTP id g41mr5044197wmp.139.1635433533600; Thu, 28 Oct 2021 08:05:33 -0700 (PDT) Received: from x1w.redhat.com (62.red-83-57-168.dynamicip.rima-tde.net. [83.57.168.62]) by smtp.gmail.com with ESMTPSA id l8sm4265906wry.43.2021.10.28.08.05.32 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 28 Oct 2021 08:05:33 -0700 (PDT) From: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Subject: [PATCH 2/4] hw/core: Declare meson source set Date: Thu, 28 Oct 2021 17:05:19 +0200 Message-Id: <20211028150521.1973821-3-philmd@redhat.com> X-Mailer: git-send-email 2.31.1 In-Reply-To: <20211028150521.1973821-1-philmd@redhat.com> References: <20211028150521.1973821-1-philmd@redhat.com> MIME-Version: 1.0 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=philmd@redhat.com X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Received-SPF: pass client-ip=170.10.133.124; envelope-from=philmd@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-Spam_score_int: -27 X-Spam_score: -2.8 X-Spam_bar: -- X-Spam_report: (-2.8 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.001, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_LOW=-0.7, RCVD_IN_MSPIKE_H2=-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.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: =?utf-8?q?Daniel_P=2E_Berrang=C3=A9?= , Eduardo Habkost , Yanan Wang , Igor Mammedov , Paolo Bonzini , =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= Errors-To: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Sender: "Qemu-devel" As we want to be able to conditionally add files to the hw/core file list, use a source set. Signed-off-by: Philippe Mathieu-Daudé Reviewed-by: Yanan Wang Tested-by: Yanan Wang --- meson.build | 4 +++- hw/core/meson.build | 4 ++-- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/meson.build b/meson.build index 2c5b53cbe2e..2eb76c187c3 100644 --- a/meson.build +++ b/meson.build @@ -2365,6 +2365,7 @@ chardev_ss = ss.source_set() common_ss = ss.source_set() crypto_ss = ss.source_set() +hwcore_ss = ss.source_set() io_ss = ss.source_set() linux_user_ss = ss.source_set() qmp_ss = ss.source_set() @@ -2805,7 +2806,8 @@ chardev = declare_dependency(link_whole: libchardev) -libhwcore = static_library('hwcore', sources: hwcore_files + genh, +hwcore_ss = hwcore_ss.apply(config_host, strict: false) +libhwcore = static_library('hwcore', sources: hwcore_ss.sources() + genh, name_suffix: 'fa', build_by_default: false) hwcore = declare_dependency(link_whole: libhwcore) diff --git a/hw/core/meson.build b/hw/core/meson.build index a829cc4245b..4d04069f85f 100644 --- a/hw/core/meson.build +++ b/hw/core/meson.build @@ -1,5 +1,5 @@ # core qdev-related obj files, also used by *-user and unit tests -hwcore_files = files( +hwcore_ss.add(files( 'bus.c', 'hotplug.c', 'qdev-properties.c', @@ -11,7 +11,7 @@ 'irq.c', 'clock.c', 'qdev-clock.c', -) +)) common_ss.add(files('cpu-common.c')) softmmu_ss.add(when: 'CONFIG_FITLOADER', if_true: files('loader-fit.c')) From patchwork Thu Oct 28 15:05:20 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= X-Patchwork-Id: 12590415 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 9B48DC433EF for ; Thu, 28 Oct 2021 15:08:55 +0000 (UTC) Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 2CF4860527 for ; Thu, 28 Oct 2021 15:08:55 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.4.1 mail.kernel.org 2CF4860527 Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=redhat.com Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=nongnu.org Received: from localhost ([::1]:60464 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1mg71S-0001s2-As for qemu-devel@archiver.kernel.org; Thu, 28 Oct 2021 11:08:54 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:39624) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1mg6yZ-0006lP-4G for qemu-devel@nongnu.org; Thu, 28 Oct 2021 11:05:55 -0400 Received: from us-smtp-delivery-124.mimecast.com ([216.205.24.124]:43693) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1mg6yM-00079A-N5 for qemu-devel@nongnu.org; Thu, 28 Oct 2021 11:05:45 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1635433541; 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=BP2YG+UwU9At2GQjrOrvf7QoxC3M4wZVtXRCu8IsEeY=; b=TjkGzlmgXnOkH2gZG4zrYyTFvctDXxl5L4wYAOpcjZx4j2gMMLTl0cwaDTPsom1Rd+LRYi CVwSek6WEzyhXxa09MCZZAs+AM/bZiOkaW0wj0Ab00wRJiw6611ocEDPiwxoXY7q80rFkE QnS8SU7CSxx8XP42p6caEVz1BDdHHFk= Received: from mail-wr1-f70.google.com (mail-wr1-f70.google.com [209.85.221.70]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-379-7gVa7QvqN-iod2DJO9LNNA-1; Thu, 28 Oct 2021 11:05:40 -0400 X-MC-Unique: 7gVa7QvqN-iod2DJO9LNNA-1 Received: by mail-wr1-f70.google.com with SMTP id f18-20020a5d58f2000000b001645b92c65bso2236832wrd.6 for ; Thu, 28 Oct 2021 08:05:39 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=BP2YG+UwU9At2GQjrOrvf7QoxC3M4wZVtXRCu8IsEeY=; b=XfN9Z9pAROd7p0Yf+jyUaaAiDcfXZOHDuitnoNVDHnWn9cgoqj8V/bqi+QRdmtrX7l z8fOiPE1Rvw06uLwwdkUUOzgJzHdoD0fStP8XGBUTyv62I0M5VPS1j8BiaztXYPg8zfc VfuetpuKOKp+RsS5dJkmhIZec7lxmiKCwWkFbkW3vpBLITR+Z5C/naimWYq0uszcmuJp Q8tbhrSGVD0PYxD5ULKcXoJRHN2pZ5EHztD+G8ECIhDgGzxR5UBhii0bsQC+t6wCaeUy gssci3d4VI+BkqXJHtkyU1CZXGCvxROGhZwCWN+W7n2yso+8mFTlmEV0WWPLVfuPkEaj TiNA== X-Gm-Message-State: AOAM532AsZE4tKKfguNJSP4WS+e4mqMYNdsHMV+xLqpzkS9Egxv8rMNq rQrSclc/wC32wuMPyZCfbbh2rkyeDMLYycvKukkEzdWV4l3bc6mGVwvFJINZ3PjZQX3ouLeGUu+ ghsP1RI74W7RkbWeD/y0sxN+WrkSGILhcleojgT1jETsqYdGXLAoh9w7Eq0Ftn4B5 X-Received: by 2002:adf:959a:: with SMTP id p26mr6332351wrp.342.1635433538356; Thu, 28 Oct 2021 08:05:38 -0700 (PDT) X-Google-Smtp-Source: ABdhPJyfdaIODQY29LG0UaL6aZJ/CT3C9MkLEbsk0ssVIEjXTS5y0fcCVo0BKxF3WM4rkYpS0feH1Q== X-Received: by 2002:adf:959a:: with SMTP id p26mr6332298wrp.342.1635433538083; Thu, 28 Oct 2021 08:05:38 -0700 (PDT) Received: from x1w.redhat.com (62.red-83-57-168.dynamicip.rima-tde.net. [83.57.168.62]) by smtp.gmail.com with ESMTPSA id e9sm3252978wrn.2.2021.10.28.08.05.37 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 28 Oct 2021 08:05:37 -0700 (PDT) From: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Subject: [PATCH 3/4] hw/core: Extract hotplug-related functions to qdev-hotplug.c Date: Thu, 28 Oct 2021 17:05:20 +0200 Message-Id: <20211028150521.1973821-4-philmd@redhat.com> X-Mailer: git-send-email 2.31.1 In-Reply-To: <20211028150521.1973821-1-philmd@redhat.com> References: <20211028150521.1973821-1-philmd@redhat.com> MIME-Version: 1.0 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=philmd@redhat.com X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Received-SPF: pass client-ip=216.205.24.124; envelope-from=philmd@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-Spam_score_int: -27 X-Spam_score: -2.8 X-Spam_bar: -- X-Spam_report: (-2.8 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.001, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_LOW=-0.7, RCVD_IN_MSPIKE_H2=-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.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: =?utf-8?q?Daniel_P=2E_Berrang=C3=A9?= , Eduardo Habkost , Yanan Wang , Igor Mammedov , Paolo Bonzini , =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= Errors-To: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Sender: "Qemu-devel" Signed-off-by: Philippe Mathieu-Daudé Reviewed-by: Yanan Wang --- hw/core/qdev-hotplug.c | 73 ++++++++++++++++++++++++++++++++++++++++++ hw/core/qdev.c | 60 ---------------------------------- hw/core/meson.build | 1 + 3 files changed, 74 insertions(+), 60 deletions(-) create mode 100644 hw/core/qdev-hotplug.c diff --git a/hw/core/qdev-hotplug.c b/hw/core/qdev-hotplug.c new file mode 100644 index 00000000000..d495d0e9c70 --- /dev/null +++ b/hw/core/qdev-hotplug.c @@ -0,0 +1,73 @@ +/* + * QDev Hotplug handlers + * + * Copyright (c) Red Hat + * + * SPDX-License-Identifier: GPL-2.0-or-later + * + * This work is licensed under the terms of the GNU GPL, version 2 or later. + * See the COPYING file in the top-level directory. + */ + +#include "qemu/osdep.h" +#include "hw/qdev-core.h" +#include "hw/boards.h" + +HotplugHandler *qdev_get_machine_hotplug_handler(DeviceState *dev) +{ + MachineState *machine; + MachineClass *mc; + Object *m_obj = qdev_get_machine(); + + if (object_dynamic_cast(m_obj, TYPE_MACHINE)) { + machine = MACHINE(m_obj); + mc = MACHINE_GET_CLASS(machine); + if (mc->get_hotplug_handler) { + return mc->get_hotplug_handler(machine, dev); + } + } + + return NULL; +} + +bool qdev_hotplug_allowed(DeviceState *dev, Error **errp) +{ + MachineState *machine; + MachineClass *mc; + Object *m_obj = qdev_get_machine(); + + if (object_dynamic_cast(m_obj, TYPE_MACHINE)) { + machine = MACHINE(m_obj); + mc = MACHINE_GET_CLASS(machine); + if (mc->hotplug_allowed) { + return mc->hotplug_allowed(machine, dev, errp); + } + } + + return true; +} + +HotplugHandler *qdev_get_bus_hotplug_handler(DeviceState *dev) +{ + if (dev->parent_bus) { + return dev->parent_bus->hotplug_handler; + } + return NULL; +} + +HotplugHandler *qdev_get_hotplug_handler(DeviceState *dev) +{ + HotplugHandler *hotplug_ctrl = qdev_get_machine_hotplug_handler(dev); + + if (hotplug_ctrl == NULL && dev->parent_bus) { + hotplug_ctrl = qdev_get_bus_hotplug_handler(dev); + } + return hotplug_ctrl; +} + +/* can be used as ->unplug() callback for the simple cases */ +void qdev_simple_device_unplug_cb(HotplugHandler *hotplug_dev, + DeviceState *dev, Error **errp) +{ + qdev_unrealize(dev); +} diff --git a/hw/core/qdev.c b/hw/core/qdev.c index 7f06403752d..cede76fce47 100644 --- a/hw/core/qdev.c +++ b/hw/core/qdev.c @@ -33,7 +33,6 @@ #include "qapi/visitor.h" #include "qemu/error-report.h" #include "qemu/option.h" -#include "hw/hotplug.h" #include "hw/irq.h" #include "hw/qdev-properties.h" #include "hw/boards.h" @@ -238,58 +237,6 @@ void qdev_set_legacy_instance_id(DeviceState *dev, int alias_id, dev->alias_required_for_version = required_for_version; } -HotplugHandler *qdev_get_machine_hotplug_handler(DeviceState *dev) -{ - MachineState *machine; - MachineClass *mc; - Object *m_obj = qdev_get_machine(); - - if (object_dynamic_cast(m_obj, TYPE_MACHINE)) { - machine = MACHINE(m_obj); - mc = MACHINE_GET_CLASS(machine); - if (mc->get_hotplug_handler) { - return mc->get_hotplug_handler(machine, dev); - } - } - - return NULL; -} - -bool qdev_hotplug_allowed(DeviceState *dev, Error **errp) -{ - MachineState *machine; - MachineClass *mc; - Object *m_obj = qdev_get_machine(); - - if (object_dynamic_cast(m_obj, TYPE_MACHINE)) { - machine = MACHINE(m_obj); - mc = MACHINE_GET_CLASS(machine); - if (mc->hotplug_allowed) { - return mc->hotplug_allowed(machine, dev, errp); - } - } - - return true; -} - -HotplugHandler *qdev_get_bus_hotplug_handler(DeviceState *dev) -{ - if (dev->parent_bus) { - return dev->parent_bus->hotplug_handler; - } - return NULL; -} - -HotplugHandler *qdev_get_hotplug_handler(DeviceState *dev) -{ - HotplugHandler *hotplug_ctrl = qdev_get_machine_hotplug_handler(dev); - - if (hotplug_ctrl == NULL && dev->parent_bus) { - hotplug_ctrl = qdev_get_bus_hotplug_handler(dev); - } - return hotplug_ctrl; -} - static int qdev_prereset(DeviceState *dev, void *opaque) { trace_qdev_reset_tree(dev, object_get_typename(OBJECT(dev))); @@ -371,13 +318,6 @@ static void device_reset_child_foreach(Object *obj, ResettableChildCallback cb, } } -/* can be used as ->unplug() callback for the simple cases */ -void qdev_simple_device_unplug_cb(HotplugHandler *hotplug_dev, - DeviceState *dev, Error **errp) -{ - qdev_unrealize(dev); -} - bool qdev_realize(DeviceState *dev, BusState *bus, Error **errp) { assert(!dev->realized && !dev->parent_bus); diff --git a/hw/core/meson.build b/hw/core/meson.build index 4d04069f85f..85f2ad1374b 100644 --- a/hw/core/meson.build +++ b/hw/core/meson.build @@ -11,6 +11,7 @@ 'irq.c', 'clock.c', 'qdev-clock.c', + 'qdev-hotplug.c', )) common_ss.add(files('cpu-common.c')) From patchwork Thu Oct 28 15:05:21 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= X-Patchwork-Id: 12590413 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 58DEDC433EF for ; Thu, 28 Oct 2021 15:08:08 +0000 (UTC) Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id E1C8960527 for ; Thu, 28 Oct 2021 15:08:07 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.4.1 mail.kernel.org E1C8960527 Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=redhat.com Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=nongnu.org Received: from localhost ([::1]:58680 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1mg70h-0000gG-39 for qemu-devel@archiver.kernel.org; Thu, 28 Oct 2021 11:08:07 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:39630) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1mg6ya-0006lk-5i for qemu-devel@nongnu.org; Thu, 28 Oct 2021 11:05:57 -0400 Received: from us-smtp-delivery-124.mimecast.com ([216.205.24.124]:60380) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1mg6yT-0007C9-If for qemu-devel@nongnu.org; Thu, 28 Oct 2021 11:05:55 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1635433545; 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=8q5NxY4tZqQ6nhyl14l1qak+/GhyQMQefx1CQ7dFSew=; b=GM5y7XINaRg+762D80/TVUxV9ISNZzWYkIFZvIw7jGwoLEd9pWigX0jyWuXhlbQM7lYoRs 9nM1qDfAk3bRh5jay2dyvrab3hP+B3LylZyLlxIlu1NeIJuLk6w0/gdi0LK7qvvi43zBz5 SbKubCXI5CWXCg1dc18ZTFHd72tAx1s= Received: from mail-wm1-f71.google.com (mail-wm1-f71.google.com [209.85.128.71]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-279-jE34CjoUNHq0truS20VqcA-1; Thu, 28 Oct 2021 11:05:44 -0400 X-MC-Unique: jE34CjoUNHq0truS20VqcA-1 Received: by mail-wm1-f71.google.com with SMTP id 125-20020a1c0183000000b003306ae8bfb7so453857wmb.7 for ; Thu, 28 Oct 2021 08:05:44 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=8q5NxY4tZqQ6nhyl14l1qak+/GhyQMQefx1CQ7dFSew=; b=NhFXfHAm0OYQG6CPnpUh1CGN2L27aZYFN0setQaO6jCewTnFQaU0u8zkb1txK/L6oU oCSoACdEKSg5e9UxAiXlHvEBkdBxRVZ7K0QUz33822MpC3prrNCEMbDpSaWfw/HlIm2D 2HUlCtUeXsvrIzN7WRb2XNUaNPg4h60DtlEg7gqpnLr0/0aSzvJSCttkSkFmfsdxagkC SoFm68iFHyxuGfXTFYTVW9zP0DZT/4fp69w+6PhPjxxh0GzIAq3UZFiZCjGNxG846MUh DxHr/sv0i/h1JoQqLyjRKmnsNWe3dYMALOdbB9mKvuNkEg9P0iUcgkVsef+8DiywfoBR a2lg== X-Gm-Message-State: AOAM530YhnG7VgfkGPQGTmEttvewogcoF7xKQ0xYXv2z68GsAUOR2fdp bRxsjP8btwisEKN5FDwiKbfIHwZOCxgV3snM3nSoKbugmVZQYgE2Rx8R3n5ihy/sct5mhy6rR/S 9mOPbM9W4LQGhrvTJXRWuk33ZAZIYpqbjmaoDwpcqtO+pCClYeQ6WJ7lXAzyZOwbZ X-Received: by 2002:a5d:40c9:: with SMTP id b9mr6434990wrq.409.1635433542848; Thu, 28 Oct 2021 08:05:42 -0700 (PDT) X-Google-Smtp-Source: ABdhPJzd1kqs1by55shHybx9lNYM5phs/FDWTGPd6saDF/V6Wo9O75N5Gwy7mKGDkWq7aS/rAzA+QQ== X-Received: by 2002:a5d:40c9:: with SMTP id b9mr6434964wrq.409.1635433542668; Thu, 28 Oct 2021 08:05:42 -0700 (PDT) Received: from x1w.redhat.com (62.red-83-57-168.dynamicip.rima-tde.net. [83.57.168.62]) by smtp.gmail.com with ESMTPSA id e8sm3468827wrp.58.2021.10.28.08.05.41 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 28 Oct 2021 08:05:42 -0700 (PDT) From: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Subject: [PATCH 4/4] hw/core: Restrict hotplug to system emulation Date: Thu, 28 Oct 2021 17:05:21 +0200 Message-Id: <20211028150521.1973821-5-philmd@redhat.com> X-Mailer: git-send-email 2.31.1 In-Reply-To: <20211028150521.1973821-1-philmd@redhat.com> References: <20211028150521.1973821-1-philmd@redhat.com> MIME-Version: 1.0 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=philmd@redhat.com X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Received-SPF: pass client-ip=216.205.24.124; envelope-from=philmd@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-Spam_score_int: -27 X-Spam_score: -2.8 X-Spam_bar: -- X-Spam_report: (-2.8 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.001, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_LOW=-0.7, RCVD_IN_MSPIKE_H2=-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.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: =?utf-8?q?Daniel_P=2E_Berrang=C3=A9?= , Eduardo Habkost , Yanan Wang , Igor Mammedov , Paolo Bonzini , =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= Errors-To: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Sender: "Qemu-devel" Restrict hotplug to system emulation, add stubs for the other uses. Signed-off-by: Philippe Mathieu-Daudé Reviewed-by: Yanan Wang --- hw/core/hotplug-stubs.c | 34 ++++++++++++++++++++++++++++++++++ hw/core/meson.build | 12 ++++++++++-- 2 files changed, 44 insertions(+), 2 deletions(-) create mode 100644 hw/core/hotplug-stubs.c diff --git a/hw/core/hotplug-stubs.c b/hw/core/hotplug-stubs.c new file mode 100644 index 00000000000..7aadaa29bd5 --- /dev/null +++ b/hw/core/hotplug-stubs.c @@ -0,0 +1,34 @@ +/* + * Hotplug handler stubs + * + * Copyright (c) Red Hat + * + * Authors: + * Philippe Mathieu-Daudé , + * + * SPDX-License-Identifier: GPL-2.0-or-later + * + * This work is licensed under the terms of the GNU GPL, version 2 or later. + * See the COPYING file in the top-level directory. + */ +#include "qemu/osdep.h" +#include "hw/qdev-core.h" + +HotplugHandler *qdev_get_hotplug_handler(DeviceState *dev) +{ + return NULL; +} + +void hotplug_handler_pre_plug(HotplugHandler *plug_handler, + DeviceState *plugged_dev, + Error **errp) +{ + g_assert_not_reached(); +} + +void hotplug_handler_plug(HotplugHandler *plug_handler, + DeviceState *plugged_dev, + Error **errp) +{ + g_assert_not_reached(); +} diff --git a/hw/core/meson.build b/hw/core/meson.build index 85f2ad1374b..afc5ed2c906 100644 --- a/hw/core/meson.build +++ b/hw/core/meson.build @@ -1,7 +1,6 @@ # core qdev-related obj files, also used by *-user and unit tests hwcore_ss.add(files( 'bus.c', - 'hotplug.c', 'qdev-properties.c', 'qdev.c', 'reset.c', @@ -11,8 +10,17 @@ 'irq.c', 'clock.c', 'qdev-clock.c', - 'qdev-hotplug.c', )) +if have_system + hwcore_ss.add(files( + 'hotplug.c', + 'qdev-hotplug.c', + )) +else + hwcore_ss.add(files( + 'hotplug-stubs.c', + )) +endif common_ss.add(files('cpu-common.c')) softmmu_ss.add(when: 'CONFIG_FITLOADER', if_true: files('loader-fit.c'))