From mboxrd@z Thu Jan 1 00:00:00 1970 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 02FACC433F5 for ; Sun, 31 Oct 2021 11:57:13 +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 7B80460F55 for ; Sun, 31 Oct 2021 11:57:12 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.4.1 mail.kernel.org 7B80460F55 Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=huawei.com Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=nongnu.org Received: from localhost ([::1]:58594 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1mh9SZ-0001QW-4d for qemu-devel@archiver.kernel.org; Sun, 31 Oct 2021 07:57:11 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:39016) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1mh9Rt-0000kb-UC for qemu-devel@nongnu.org; Sun, 31 Oct 2021 07:56:29 -0400 Received: from szxga01-in.huawei.com ([45.249.212.187]:2945) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1mh9Rq-0001P1-9A for qemu-devel@nongnu.org; Sun, 31 Oct 2021 07:56:29 -0400 Received: from dggemv711-chm.china.huawei.com (unknown [172.30.72.53]) by szxga01-in.huawei.com (SkyGuard) with ESMTP id 4Hhvdg00F6zbmhX; Sun, 31 Oct 2021 19:51:34 +0800 (CST) Received: from dggpemm500023.china.huawei.com (7.185.36.83) by dggemv711-chm.china.huawei.com (10.1.198.66) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2308.15; Sun, 31 Oct 2021 19:56:17 +0800 Received: from [10.174.187.128] (10.174.187.128) by dggpemm500023.china.huawei.com (7.185.36.83) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA256) id 15.1.2308.15; Sun, 31 Oct 2021 19:56:16 +0800 Subject: Re: [PATCH 4/4] hw/core: Restrict hotplug to system emulation To: =?UTF-8?Q?Philippe_Mathieu-Daud=c3=a9?= , References: <20211028150521.1973821-1-philmd@redhat.com> <20211028150521.1973821-5-philmd@redhat.com> From: "wangyanan (Y)" Message-ID: <5663b2dc-9e9c-761d-0cae-97e56cedba3b@huawei.com> Date: Sun, 31 Oct 2021 19:56:16 +0800 User-Agent: Mozilla/5.0 (Windows NT 10.0; Win64; x64; rv:78.0) Gecko/20100101 Thunderbird/78.4.0 MIME-Version: 1.0 In-Reply-To: <20211028150521.1973821-5-philmd@redhat.com> Content-Type: text/plain; charset="utf-8"; format=flowed Content-Transfer-Encoding: 8bit Content-Language: en-US X-Originating-IP: [10.174.187.128] X-ClientProxiedBy: dggeme711-chm.china.huawei.com (10.1.199.107) To dggpemm500023.china.huawei.com (7.185.36.83) X-CFilter-Loop: Reflected Received-SPF: pass client-ip=45.249.212.187; envelope-from=wangyanan55@huawei.com; helo=szxga01-in.huawei.com X-Spam_score_int: -47 X-Spam_score: -4.8 X-Spam_bar: ---- X-Spam_report: (-4.8 / 5.0 requ) BAYES_00=-1.9, NICE_REPLY_A=-0.592, RCVD_IN_DNSWL_MED=-2.3, 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: Paolo Bonzini , =?UTF-8?Q?Daniel_P=2e_Berrang=c3=a9?= , Eduardo Habkost , Igor Mammedov Errors-To: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Sender: "Qemu-devel" Hi Philippe, On 2021/10/28 23:05, Philippe Mathieu-Daudé wrote: > Restrict hotplug to system emulation, add stubs for the other uses. > > Signed-off-by: Philippe Mathieu-Daudé > --- > 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 Same as patch #3. > + * > + * 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')) Besides, Reviewed-by: Yanan Wang Thanks, Yanan