From nobody Tue Feb 10 04:30:26 2026 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zoho.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=redhat.com Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 154939558011785.60812023382027; Tue, 5 Feb 2019 11:39:40 -0800 (PST) Received: from localhost ([127.0.0.1]:38930 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gr6ZE-0003HZ-8h for importer@patchew.org; Tue, 05 Feb 2019 14:39:36 -0500 Received: from eggs.gnu.org ([209.51.188.92]:36997) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gr5HA-0003CD-P1 for qemu-devel@nongnu.org; Tue, 05 Feb 2019 13:16:54 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1gr5H8-0004X4-J8 for qemu-devel@nongnu.org; Tue, 05 Feb 2019 13:16:52 -0500 Received: from mail-wm1-x334.google.com ([2a00:1450:4864:20::334]:54483) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1gr5H8-0004QX-7t for qemu-devel@nongnu.org; Tue, 05 Feb 2019 13:16:50 -0500 Received: by mail-wm1-x334.google.com with SMTP id a62so4681668wmh.4 for ; Tue, 05 Feb 2019 10:16:43 -0800 (PST) Received: from 640k.lan ([93.56.166.5]) by smtp.gmail.com with ESMTPSA id p5sm8931665wmh.16.2019.02.05.10.16.41 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 05 Feb 2019 10:16:41 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references; bh=PJbmIS++Y3QIqf+F8xxZd9EWuX09QCDoLPY6jRrSWak=; b=ofZeDaZ0Hxw5yO+k7I0px03De5qpTu/IN+GOx5/Fwt4VEjUMpOLGwJjDlFFIyLCBxv GIBtIkIIpzvdU69atzyG4qzUVQ3OKW8a6sJouM0xI28OuDAOH9MVrA063OOVVkF+f6O0 K3UheN51dNgZNujfd5ZrcO99Q+qVN1BaVbBQShuaK0Vuxb/Hor/CxJd/mowtkDFZZIiS 4nNT8PwR/ShsZf5uAvBLBF9jFa1zySjuIg34ZkDjeg+S3U4++1Add+mf+/igUypENQDa 2T+jgBPtncVd8uI5rMnHPkZFQX3caGozb0NCGDL0JgHPIPtlc2mwON+s+9AWX1fZK0kf unWw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :in-reply-to:references; bh=PJbmIS++Y3QIqf+F8xxZd9EWuX09QCDoLPY6jRrSWak=; b=eMrrUuIr6s8/LAM+5+CtY2hoL+lpUJymAgGK4bgdUHpV7p58w/cUSQ0dt1OPrGy8Mp CucGM+BInb7V9zgcFF5XStqDfA1cozuFqoQk51jUrQCKfWQyHo8DN+XXyDunUVsxpayk HXonFctcDm6OoVs5nr/13QrGnNL97XhJhFNIYxiLs39UqdQtxzh2TPtgVdbK7aSY6EGv yeXrGjKyu3G3HJAZorAahqgKVkcsEviehhRSaxEupqYOMbKXJBj2nshiG7TjuHPXYTc+ DW1RZT7FBvckg9k8cFsuejBQPpck/l+SnqGdjT2O4+JjjPXQGoVDFfzE1toMEEngmj5D JzsA== X-Gm-Message-State: AHQUAuY3MBN+9p+pwbwnrstjZmCv4gNAna+mAJUbRxnYiLDuLkfW0w7m NiNGN+cRYQn/GrLOjUKbdBRdQZFZ X-Google-Smtp-Source: AHgI3IaVmsOgcSjXGXz9YkZMK1qNmoHvvhMB4S7w14uJPhGEazRgm2TqoJNltrTlhPEGx01BZ/8Pzw== X-Received: by 2002:a1c:7dd6:: with SMTP id y205mr4452545wmc.121.1549390602492; Tue, 05 Feb 2019 10:16:42 -0800 (PST) From: Paolo Bonzini To: qemu-devel@nongnu.org Date: Tue, 5 Feb 2019 19:15:23 +0100 Message-Id: <1549390526-24246-74-git-send-email-pbonzini@redhat.com> X-Mailer: git-send-email 1.8.3.1 In-Reply-To: <1549390526-24246-1-git-send-email-pbonzini@redhat.com> References: <1549390526-24246-1-git-send-email-pbonzini@redhat.com> X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2a00:1450:4864:20::334 Subject: [Qemu-devel] [PULL 73/76] pc: Use hotplug_handler_(plug|unplug|unplug_request) X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: David Hildenbrand Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" From: David Hildenbrand Let's avoid manually looking up the hotplug handler class. Use the existing wrappers instead. Signed-off-by: David Hildenbrand Message-Id: <20181212095707.19358-1-david@redhat.com> Signed-off-by: Paolo Bonzini --- hw/i386/pc.c | 30 ++++++++---------------------- 1 file changed, 8 insertions(+), 22 deletions(-) diff --git a/hw/i386/pc.c b/hw/i386/pc.c index 7d8f351..3889ecc 100644 --- a/hw/i386/pc.c +++ b/hw/i386/pc.c @@ -2122,7 +2122,6 @@ static void pc_memory_pre_plug(HotplugHandler *hotplu= g_dev, DeviceState *dev, static void pc_memory_plug(HotplugHandler *hotplug_dev, DeviceState *dev, Error **errp) { - HotplugHandlerClass *hhc; Error *local_err =3D NULL; PCMachineState *pcms =3D PC_MACHINE(hotplug_dev); bool is_nvdimm =3D object_dynamic_cast(OBJECT(dev), TYPE_NVDIMM); @@ -2136,8 +2135,7 @@ static void pc_memory_plug(HotplugHandler *hotplug_de= v, nvdimm_plug(&pcms->acpi_nvdimm_state); } =20 - hhc =3D HOTPLUG_HANDLER_GET_CLASS(pcms->acpi_dev); - hhc->plug(HOTPLUG_HANDLER(pcms->acpi_dev), dev, &error_abort); + hotplug_handler_plug(HOTPLUG_HANDLER(pcms->acpi_dev), dev, &error_abor= t); out: error_propagate(errp, local_err); } @@ -2145,7 +2143,6 @@ out: static void pc_memory_unplug_request(HotplugHandler *hotplug_dev, DeviceState *dev, Error **errp) { - HotplugHandlerClass *hhc; Error *local_err =3D NULL; PCMachineState *pcms =3D PC_MACHINE(hotplug_dev); =20 @@ -2166,9 +2163,8 @@ static void pc_memory_unplug_request(HotplugHandler *= hotplug_dev, goto out; } =20 - hhc =3D HOTPLUG_HANDLER_GET_CLASS(pcms->acpi_dev); - hhc->unplug_request(HOTPLUG_HANDLER(pcms->acpi_dev), dev, &local_err); - + hotplug_handler_unplug_request(HOTPLUG_HANDLER(pcms->acpi_dev), dev, + &local_err); out: error_propagate(errp, local_err); } @@ -2177,12 +2173,9 @@ static void pc_memory_unplug(HotplugHandler *hotplug= _dev, DeviceState *dev, Error **errp) { PCMachineState *pcms =3D PC_MACHINE(hotplug_dev); - HotplugHandlerClass *hhc; Error *local_err =3D NULL; =20 - hhc =3D HOTPLUG_HANDLER_GET_CLASS(pcms->acpi_dev); - hhc->unplug(HOTPLUG_HANDLER(pcms->acpi_dev), dev, &local_err); - + hotplug_handler_unplug(HOTPLUG_HANDLER(pcms->acpi_dev), dev, &local_er= r); if (local_err) { goto out; } @@ -2224,14 +2217,12 @@ static void pc_cpu_plug(HotplugHandler *hotplug_dev, DeviceState *dev, Error **errp) { CPUArchId *found_cpu; - HotplugHandlerClass *hhc; Error *local_err =3D NULL; X86CPU *cpu =3D X86_CPU(dev); PCMachineState *pcms =3D PC_MACHINE(hotplug_dev); =20 if (pcms->acpi_dev) { - hhc =3D HOTPLUG_HANDLER_GET_CLASS(pcms->acpi_dev); - hhc->plug(HOTPLUG_HANDLER(pcms->acpi_dev), dev, &local_err); + hotplug_handler_plug(HOTPLUG_HANDLER(pcms->acpi_dev), dev, &local_= err); if (local_err) { goto out; } @@ -2255,7 +2246,6 @@ static void pc_cpu_unplug_request_cb(HotplugHandler *= hotplug_dev, DeviceState *dev, Error **errp) { int idx =3D -1; - HotplugHandlerClass *hhc; Error *local_err =3D NULL; X86CPU *cpu =3D X86_CPU(dev); PCMachineState *pcms =3D PC_MACHINE(hotplug_dev); @@ -2272,9 +2262,8 @@ static void pc_cpu_unplug_request_cb(HotplugHandler *= hotplug_dev, goto out; } =20 - hhc =3D HOTPLUG_HANDLER_GET_CLASS(pcms->acpi_dev); - hhc->unplug_request(HOTPLUG_HANDLER(pcms->acpi_dev), dev, &local_err); - + hotplug_handler_unplug_request(HOTPLUG_HANDLER(pcms->acpi_dev), dev, + &local_err); if (local_err) { goto out; } @@ -2288,14 +2277,11 @@ static void pc_cpu_unplug_cb(HotplugHandler *hotplu= g_dev, DeviceState *dev, Error **errp) { CPUArchId *found_cpu; - HotplugHandlerClass *hhc; Error *local_err =3D NULL; X86CPU *cpu =3D X86_CPU(dev); PCMachineState *pcms =3D PC_MACHINE(hotplug_dev); =20 - hhc =3D HOTPLUG_HANDLER_GET_CLASS(pcms->acpi_dev); - hhc->unplug(HOTPLUG_HANDLER(pcms->acpi_dev), dev, &local_err); - + hotplug_handler_unplug(HOTPLUG_HANDLER(pcms->acpi_dev), dev, &local_er= r); if (local_err) { goto out; } --=20 1.8.3.1