Received: by 2002:ac2:4c26:0:0:0:0:0 with SMTP id u6csp550167lfq; Tue, 8 Sep 2020 05:16:44 -0700 (PDT) X-Google-Smtp-Source: ABdhPJxLTcTQgaee51ijt6Dgj2J5VJlDeK/7p4npzZHYz/sJ4G7aBAPjSFYSBobGCCpkSfKk5UG7 X-Received: by 2002:a25:3258:: with SMTP id y85mr11187814yby.473.1599567404732; Tue, 08 Sep 2020 05:16:44 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1599567404; cv=none; d=google.com; s=arc-20160816; b=sp8Z49u4495DAXAO2o0k8h/4gVncBsYYHJOkrPlvvGha9+bEjqkc3GVH673fug6vHy hMfMtyJt9B/d5ktINVMrKBJzPAR4hxvFXcTwCTu9IxRWBb0F+fSTkgJ4QoAVuWqNPjXx JDdOrleIRbLUZ+kpa088gYmWtOtTkdXeb7ejP/uZE1XSmzr50bHoj07OF18X1sz99EFm oX25Nh5SueVWH5GjUNF3nP2lessp0rOHOKiDIV3RgneMADE1em03koY/DEtOL+jIZgon PctcAWbr4qC4O756+toglZ7jSJWbORCXhcqQj3AKdTDwJ9jEmV6XaUQNlnFYo3u+Pqbm 2RGQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:cc:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:content-transfer-encoding :mime-version:references:in-reply-to:message-id:date:subject:to:from :dkim-signature; bh=7WupihrubTyVUDCyRuf11xOUpe+0jDZC5WwdAXgUf0U=; b=WgIiHcfPlwKmnWRTZveo0rrQaHlpgmHWJ5GPVS+mKMExr6UBoPV3ipfp5OCEEsNIcW pXFIcEOOmmDa9Yr6P4qr1eSzYPmV/e+v3CWdVbTawv6MxmoYEQOGLu5LYB3JJ7GQ66Vz 6yXKSk0DXEHswbG0npXO7j7oveBgPuGTIX4ZQuAxyQDzyWM+hvEDEQS/Lh2FYYrnptlq ApDkYeyt3/S20mZ+ZcdX6jCIp5m+OqbT3pHnUCLjtqaMXv21bsU6GpZ5FVq5lT90bTG2 Ip4N5iCYS7yMvJsSDDSptxuNk6fV4qkuMTo4HIimXDQZeiBD75fiAcGylRnhpo2o2Dxf gmyQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@redhat.com header.s=mimecast20190719 header.b=Xm9TxzMA; spf=pass (google.com: domain of qemu-arm-bounces+alex.bennee=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-arm-bounces+alex.bennee=linaro.org@nongnu.org"; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=redhat.com Return-Path: Received: from lists.gnu.org (lists.gnu.org. [209.51.188.17]) by mx.google.com with ESMTPS id s88si18846959ybi.379.2020.09.08.05.16.44 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Tue, 08 Sep 2020 05:16:44 -0700 (PDT) Received-SPF: pass (google.com: domain of qemu-arm-bounces+alex.bennee=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; Authentication-Results: mx.google.com; dkim=fail header.i=@redhat.com header.s=mimecast20190719 header.b=Xm9TxzMA; spf=pass (google.com: domain of qemu-arm-bounces+alex.bennee=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-arm-bounces+alex.bennee=linaro.org@nongnu.org"; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=redhat.com Received: from localhost ([::1]:37468 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1kFcYG-0000Oj-4I for alex.bennee@linaro.org; Tue, 08 Sep 2020 08:16:44 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:57796) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kFcTI-0001AI-PY for qemu-arm@nongnu.org; Tue, 08 Sep 2020 08:11:36 -0400 Received: from us-smtp-delivery-124.mimecast.com ([63.128.21.124]:41974) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_CBC_SHA1:256) (Exim 4.90_1) (envelope-from ) id 1kFcSz-0005gG-1V for qemu-arm@nongnu.org; Tue, 08 Sep 2020 08:11:36 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1599567067; 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=7WupihrubTyVUDCyRuf11xOUpe+0jDZC5WwdAXgUf0U=; b=Xm9TxzMAZ9wiu7PNMYfuBRn33PEbBQup3hVvy8/fDOFeNnDbY/POzqe3Icffs0Yk/mcZsO wuaceHx60AKIKbOmE9jCj6/ZQsFkiIXnW+a9ZnXKEqNb16j6f6ZclsrZJTFHPRdK2HZnOs 6cMSjEjci9whec1pa9j+Pib32BbSuFI= Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-502-dQIMpUFpPEO0iBUXZW_3ZA-1; Tue, 08 Sep 2020 08:11:06 -0400 X-MC-Unique: dQIMpUFpPEO0iBUXZW_3ZA-1 Received: from smtp.corp.redhat.com (int-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.12]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id C96CA12CCE3; Tue, 8 Sep 2020 12:11:04 +0000 (UTC) Received: from sirius.home.kraxel.org (ovpn-112-56.ams2.redhat.com [10.36.112.56]) by smtp.corp.redhat.com (Postfix) with ESMTP id 411DC60C17; Tue, 8 Sep 2020 12:11:04 +0000 (UTC) Received: by sirius.home.kraxel.org (Postfix, from userid 1000) id 393F831F93; Tue, 8 Sep 2020 14:10:51 +0200 (CEST) From: Gerd Hoffmann To: qemu-devel@nongnu.org Subject: [PATCH v7 16/21] microvm: wire up hotplug Date: Tue, 8 Sep 2020 14:10:45 +0200 Message-Id: <20200908121050.1162-17-kraxel@redhat.com> In-Reply-To: <20200908121050.1162-1-kraxel@redhat.com> References: <20200908121050.1162-1-kraxel@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.12 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=kraxel@redhat.com X-Mimecast-Spam-Score: 0.001 X-Mimecast-Originator: redhat.com Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: 8bit Received-SPF: pass client-ip=63.128.21.124; envelope-from=kraxel@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-detected-operating-system: by eggs.gnu.org: First seen = 2020/09/08 02:11:34 X-ACL-Warn: Detected OS = Linux 2.2.x-3.x [generic] [fuzzy] X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.001, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, RCVD_IN_MSPIKE_H5=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-arm@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Laurent Vivier , Peter Maydell , Thomas Huth , Eduardo Habkost , Sergio Lopez , "Michael S. Tsirkin" , Shannon Zhao , qemu-arm@nongnu.org, Gerd Hoffmann , Marcel Apfelbaum , Igor Mammedov , Paolo Bonzini , Richard Henderson Errors-To: qemu-arm-bounces+alex.bennee=linaro.org@nongnu.org Sender: "Qemu-arm" X-TUID: MWJ4/b7Mu7cL The cpu hotplug code handles the initialization of coldplugged cpus too, so it is needed even in case cpu hotplug is not supported. Wire cpu hotplug up for microvm. Without this we get a broken MADT table. Signed-off-by: Gerd Hoffmann Reviewed-by: Igor Mammedov Reviewed-by: Sergio Lopez --- hw/i386/microvm.c | 42 ++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 42 insertions(+) diff --git a/hw/i386/microvm.c b/hw/i386/microvm.c index 9df15354ce0f..8de8ca864963 100644 --- a/hw/i386/microvm.c +++ b/hw/i386/microvm.c @@ -320,6 +320,39 @@ static void microvm_fix_kernel_cmdline(MachineState *machine) g_free(cmdline); } +static void microvm_device_pre_plug_cb(HotplugHandler *hotplug_dev, + DeviceState *dev, Error **errp) +{ + x86_cpu_pre_plug(hotplug_dev, dev, errp); +} + +static void microvm_device_plug_cb(HotplugHandler *hotplug_dev, + DeviceState *dev, Error **errp) +{ + x86_cpu_plug(hotplug_dev, dev, errp); +} + +static void microvm_device_unplug_request_cb(HotplugHandler *hotplug_dev, + DeviceState *dev, Error **errp) +{ + error_setg(errp, "unplug not supported by microvm"); +} + +static void microvm_device_unplug_cb(HotplugHandler *hotplug_dev, + DeviceState *dev, Error **errp) +{ + error_setg(errp, "unplug not supported by microvm"); +} + +static HotplugHandler *microvm_get_hotplug_handler(MachineState *machine, + DeviceState *dev) +{ + if (object_dynamic_cast(OBJECT(dev), TYPE_CPU)) { + return HOTPLUG_HANDLER(machine); + } + return NULL; +} + static void microvm_machine_state_init(MachineState *machine) { MicrovmMachineState *mms = MICROVM_MACHINE(machine); @@ -503,6 +536,7 @@ static void microvm_machine_initfn(Object *obj) static void microvm_class_init(ObjectClass *oc, void *data) { MachineClass *mc = MACHINE_CLASS(oc); + HotplugHandlerClass *hc = HOTPLUG_HANDLER_CLASS(oc); mc->init = microvm_machine_state_init; @@ -524,6 +558,13 @@ static void microvm_class_init(ObjectClass *oc, void *data) /* Machine class handlers */ mc->reset = microvm_machine_reset; + /* hotplug (for cpu coldplug) */ + mc->get_hotplug_handler = microvm_get_hotplug_handler; + hc->pre_plug = microvm_device_pre_plug_cb; + hc->plug = microvm_device_plug_cb; + hc->unplug_request = microvm_device_unplug_request_cb; + hc->unplug = microvm_device_unplug_cb; + object_class_property_add(oc, MICROVM_MACHINE_PIC, "OnOffAuto", microvm_machine_get_pic, microvm_machine_set_pic, @@ -573,6 +614,7 @@ static const TypeInfo microvm_machine_info = { .class_size = sizeof(MicrovmMachineClass), .class_init = microvm_class_init, .interfaces = (InterfaceInfo[]) { + { TYPE_HOTPLUG_HANDLER }, { } }, }; -- 2.27.0