Received: by 2002:a17:906:ae84:b0:982:368b:d395 with SMTP id md4csp596105ejb; Tue, 13 Jun 2023 08:04:14 -0700 (PDT) X-Google-Smtp-Source: ACHHUZ5y9KssQkrbGBars8z+OzmH3hIHDYdLVuLeBqrVbTuFmXh854MZkPlV/HkGaro+8IB5h75V X-Received: by 2002:a05:6102:1359:b0:439:3c15:da5b with SMTP id j25-20020a056102135900b004393c15da5bmr5140982vsl.17.1686668654137; Tue, 13 Jun 2023 08:04:14 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1686668654; cv=none; d=google.com; s=arc-20160816; b=ZXNJRrHCTpaIROHWrsmZdHDE+ZSRTxA2DmfMI9sTywb5NtBwXEoXHPVV8mC/po+jtq OUWua+K4U35rjTtBqyYXsTmDdxC6rlwJTe6lu0yrouTQEy54ZCvW+DJPoJPB1IikPloE NvaLB9Hm8M6taOmN/hifBDkrOY07BEah6lDHuRMuS+6VHU7uYlHVqEQehPCaaMPHhH8X DZSMy6FmH6fa1cdZO7iYB6IckOtVgwQ3QkDmNcuuliA32JG5bu5ZgPJG3Pcwo9vvP2WN H5oH4wJG5l6+XOi3rLGkGVFXFbAW2bcOGWx9hec2fPET56ZAfNp7ml6l3QKHXpCrAbSj WA8A== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to: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:cc:to :from:dkim-signature; bh=SLByoKSRUNv3dV7dNizYLggVY51+m+xD/k+DONQgaeA=; b=Ljf9VgycPGE6sX0y6Pa58vzd1ThFJtDcHx8c6omAQalGvMlmN+RA+EycNyRyA5rvRJ u71rQL7Chfv/1Jc+YURXDoTevsmkr4O25lcJvzOZXq3IVC6+deDUjlOdlgsZTmE83HFx pKOuXjBWIqPrli1Gyq9VSp50M8orG56q3TdJtTfl6my7N58VrU2K/pvD32sZFGGMzQAK QhvrkE4uLfzxwwH6wHs2+J6i+iF12nf0TDCWWx0DX88mLJQ+kXeNT7BLJTFJN7sPZ5A+ 5pApG6+l5eGoO9cu6LPDOouWuubervAIwUcPWBYiRVxe3GpCiDOP5T0WllEmrvwukj2Z Bi0g== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@redhat.com header.s=mimecast20190719 header.b=L5cHo7Tf; 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=pass (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 b27-20020a05610222fb00b0042618e13c59si735564vsh.671.2023.06.13.08.04.13 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Tue, 13 Jun 2023 08:04:14 -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=pass header.i=@redhat.com header.s=mimecast20190719 header.b=L5cHo7Tf; 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=pass (p=NONE sp=NONE dis=NONE) header.from=redhat.com Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1q95YY-0004DP-PG; Tue, 13 Jun 2023 11:03:46 -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 1q95Y4-0003vE-1r for qemu-arm@nongnu.org; Tue, 13 Jun 2023 11:03: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 1q95XZ-00004v-1T for qemu-arm@nongnu.org; Tue, 13 Jun 2023 11:02:38 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1686668556; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=SLByoKSRUNv3dV7dNizYLggVY51+m+xD/k+DONQgaeA=; b=L5cHo7TfncGKqvAslk4dumA7ZPRjsK6aGnnn3Vul12nkwX6o/C8K5nXgoLAop75ekxuO3L tNC5VWmISOLwFpKBQ5Y75pk9qcNpZqR1iHG44KQZuqaHuAQwOSfH0KgPAzD43Jz1vIBNue JhFG/SIFQ38HYEc72i1WBD8NzU3Sbqk= Received: from mimecast-mx02.redhat.com (mx3-rdu2.redhat.com [66.187.233.73]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-261-9lta-VWbPByDon_FjtwYdA-1; Tue, 13 Jun 2023 11:02:32 -0400 X-MC-Unique: 9lta-VWbPByDon_FjtwYdA-1 Received: from smtp.corp.redhat.com (int-mx01.intmail.prod.int.rdu2.redhat.com [10.11.54.1]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id 2637E38117F8; Tue, 13 Jun 2023 15:02:22 +0000 (UTC) Received: from t480s.fritz.box (unknown [10.39.192.249]) by smtp.corp.redhat.com (Postfix) with ESMTP id 7BE9940B4CD6; Tue, 13 Jun 2023 15:02:20 +0000 (UTC) From: David Hildenbrand To: qemu-devel@nongnu.org Cc: David Hildenbrand , Peter Maydell , Paolo Bonzini , Richard Henderson , Eduardo Habkost , "Michael S. Tsirkin" , Marcel Apfelbaum , Igor Mammedov , qemu-arm@nongnu.org, Gavin Shan Subject: [PATCH v1 5/5] arm/virt: Support unplug of virtio-mem-pci devices Date: Tue, 13 Jun 2023 17:02:10 +0200 Message-Id: <20230613150210.449406-6-david@redhat.com> In-Reply-To: <20230613150210.449406-1-david@redhat.com> References: <20230613150210.449406-1-david@redhat.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Scanned-By: MIMEDefang 3.1 on 10.11.54.1 Received-SPF: pass client-ip=170.10.129.124; envelope-from=david@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.001, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001, T_SCC_BODY_TEXT_LINE=-0.01 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-arm@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-arm-bounces+alex.bennee=linaro.org@nongnu.org Sender: qemu-arm-bounces+alex.bennee=linaro.org@nongnu.org X-TUID: zBlWrpD1KRPK Let's support unplug of virtio-mem-pci devices by granting (forwarding) unplug requests if it's safe to unplug a virtio-mem device. Signed-off-by: David Hildenbrand --- hw/arm/virt.c | 34 +++++++++++++++++++++++++++++++--- 1 file changed, 31 insertions(+), 3 deletions(-) diff --git a/hw/arm/virt.c b/hw/arm/virt.c index ed5c3c8fc4..08d4eef4c1 100644 --- a/hw/arm/virt.c +++ b/hw/arm/virt.c @@ -2821,10 +2821,38 @@ static void virt_virtio_md_pci_unplug(HotplugHandler *hotplug_dev, static void virt_virtio_md_pci_unplug_request(HotplugHandler *hotplug_dev, DeviceState *dev, Error **errp) { - /* We don't support hot unplug of virtio based memory devices */ - error_setg(errp, "virtio based memory devices cannot be unplugged."); -} + HotplugHandler *hotplug_dev2 = qdev_get_bus_hotplug_handler(dev); + HotplugHandlerClass *hdc; + Error *local_err = NULL; + + if (!hotplug_dev2) { + error_setg(errp, "hotunplug of virtio based memory devices not" + "supported on this bus"); + return; + } + + /* Verify whether it is *currently* safe to unplug the virtio-mem device. */ + g_assert(object_dynamic_cast(OBJECT(dev), TYPE_VIRTIO_MEM_PCI)); + virtio_mem_pci_unplug_request_check(VIRTIO_MEM_PCI(dev), &local_err); + if (local_err) { + error_propagate(errp, local_err); + return; + } + /* + * Forward the async request or turn it into a sync request (handling it + * like qdev_unplug()). + */ + hdc = HOTPLUG_HANDLER_GET_CLASS(hotplug_dev2); + if (hdc->unplug_request) { + hotplug_handler_unplug_request(hotplug_dev2, dev, &local_err); + } else { + virt_virtio_md_pci_unplug(hotplug_dev, dev, &local_err); + if (!local_err) { + object_unparent(OBJECT(dev)); + } + } +} static void virt_machine_device_pre_plug_cb(HotplugHandler *hotplug_dev, DeviceState *dev, Error **errp) -- 2.40.1