From nobody Mon Feb 9 14:50:40 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 (209.51.188.17 [209.51.188.17]) by mx.zohomail.com with SMTPS id 154930845007781.58992793109928; Mon, 4 Feb 2019 11:27:30 -0800 (PST) Received: from localhost ([127.0.0.1]:48027 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gqjtr-0005Xb-K9 for importer@patchew.org; Mon, 04 Feb 2019 14:27:23 -0500 Received: from eggs.gnu.org ([209.51.188.92]:60089) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gqj7w-000662-Lu for qemu-devel@nongnu.org; Mon, 04 Feb 2019 13:37:56 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1gqj7u-0004F8-Jw for qemu-devel@nongnu.org; Mon, 04 Feb 2019 13:37:52 -0500 Received: from mail-wr1-x42e.google.com ([2a00:1450:4864:20::42e]:46403) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1gqj7u-00045m-7j for qemu-devel@nongnu.org; Mon, 04 Feb 2019 13:37:50 -0500 Received: by mail-wr1-x42e.google.com with SMTP id l9so901934wrt.13 for ; Mon, 04 Feb 2019 10:37:34 -0800 (PST) Received: from 640k.lan ([93.56.166.5]) by smtp.gmail.com with ESMTPSA id s132sm8836236wmf.28.2019.02.04.10.37.32 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 04 Feb 2019 10:37:32 -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=opoVlWpnaA/NhnKxBLjW7cfkk6b9CvhO2eumskfnLm4ed1duoi/iivoJc7gWTIeAiT C9QHKL5OwVz8WNL2zzrgo+dzdVjlN6YM9efQdbO2ZLZkQZzdk8Kj4/xYx8crptT/+eSi c+5wMM6Fdi9WGRLTkJsf5vW8nXGxpRWPRcQS3gbp34DVdje+VaCJA6oYKAxoTi+fu0rj ldnFO9+SCtnFa/27Ru093tV+9tyqpRKW9bkmVkW/eXprSw9BAXkkp0802sMwPG0ZAYqw g8NS62QLyF6Q6BgiFG6yVqFCygHG/79SKVQy3IaFQA/IsqTOD4pNtWUWOsAmv0ifPVhD uXsg== 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=j6SkpNZkS51GJz2OnROo9lAhMSj7as47d86thYeih8irHmIoUG9GgWi2zKe/loyKRI LVJv8LN8zKO1lMNHNi0x8nIXbsRwHN0YuopYIkb/+7MYs8VOAZYwBgt9UnEPnHCedIUt J8MNmvV3uXgStryYePXxGAUwuSZcko4uNOF/xzv7pjOw1Bx4/6Nag/IgZ8n/ClkNunpN 9Cuk/zSs48kyC5SneAFpLhYubKiwBVsDMFatQojCGkzQzaseokf7ol+i9DtuA8ZVCb4H 9jvEwcLDyuJEmfCUDhtdVBDoUShe3IUg68mE+yqlykPmD3UIKGcONHhUICidc+naXFRF oY3Q== X-Gm-Message-State: AHQUAuY5ReSU8G2eComEayYhZXZY8/vVTH5yodfW2GXGS+4oUyBPsnGo nB4ONEIHl0CQjQ+4VdPwNjDKvdl8 X-Google-Smtp-Source: AHgI3IZYF/UgxPOV8adUDgTNEZZtNriRJfM4qj5XYkKH6hrVciKKpznSKm3WGOA7OcTA0UQz5UyxYw== X-Received: by 2002:a5d:4202:: with SMTP id n2mr584839wrq.260.1549305453429; Mon, 04 Feb 2019 10:37:33 -0800 (PST) From: Paolo Bonzini To: qemu-devel@nongnu.org Date: Mon, 4 Feb 2019 19:36:16 +0100 Message-Id: <1549305379-51117-75-git-send-email-pbonzini@redhat.com> X-Mailer: git-send-email 1.8.3.1 In-Reply-To: <1549305379-51117-1-git-send-email-pbonzini@redhat.com> References: <1549305379-51117-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::42e Subject: [Qemu-devel] [PULL 74/77] 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