From patchwork Thu Oct 18 20:31:54 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Paolo Bonzini X-Patchwork-Id: 986315 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (mailfrom) smtp.mailfrom=nongnu.org (client-ip=2001:4830:134:3::11; helo=lists.gnu.org; envelope-from=qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org; receiver=) Authentication-Results: ozlabs.org; dmarc=fail (p=none dis=none) header.from=redhat.com Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="r0xTxfSn"; dkim-atps=neutral Received: from lists.gnu.org (lists.gnu.org [IPv6:2001:4830:134:3::11]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 42bhhr3ZXFz9s5c for ; Fri, 19 Oct 2018 08:17:48 +1100 (AEDT) Received: from localhost ([::1]:44753 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gDFft-0003gS-Ur for incoming@patchwork.ozlabs.org; Thu, 18 Oct 2018 17:17:45 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:48312) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gDEyU-0007Y6-NN for qemu-devel@nongnu.org; Thu, 18 Oct 2018 16:32:56 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1gDEyP-0006TF-7Q for qemu-devel@nongnu.org; Thu, 18 Oct 2018 16:32:54 -0400 Received: from mail-wr1-x431.google.com ([2a00:1450:4864:20::431]:38253) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1gDEyO-0006Qn-VM for qemu-devel@nongnu.org; Thu, 18 Oct 2018 16:32:49 -0400 Received: by mail-wr1-x431.google.com with SMTP id a13-v6so35115883wrt.5 for ; Thu, 18 Oct 2018 13:32:48 -0700 (PDT) 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=BkystSI0CRGrpUqLwc5QS/9WLvo+X84cbqkvItspGKM=; b=r0xTxfSnUgHqGH1F+O8ARZXkf5ZxMPAHI3GfTZMXMUG2A17V4S1tfMRnw+LzE3MA7R tE6ijXBqL7Ho5pYEBIdpadvJHgAWjDSGU57Ls1Mu/0F9y0GjGBlpIvhj85fGkiV1i5Ci lhC80aAzXgxt95xTf4In1YG3xZ8EAQRrvnN+850/1Z3nnTaGh5OJC9pqjuNReBKM3iON RDh7nwps8Wri6IRGP13bTtTTKsFvWP/mZI4UvfiMGa83qD0vZ3wM4L8lp06azr51yRx2 5OcBFECN5UZvI857M6FjkONbuLn0SCU1qSFkUypMI9A5GEoZhVPqp3sVtb5rp+P9BFwQ plWQ== 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=BkystSI0CRGrpUqLwc5QS/9WLvo+X84cbqkvItspGKM=; b=tPmEkF6KGMnFmr8TcJvEvQ5H6lDrZUl4/mcDGRPPpIFHZkreH0OqtKtgAlelOURCvC 61Ar6FcSnBepTYpaXRbHpCf125hfR1GpxN/wzCXhBU0P6A9Eu1Z4TGGmgc0xSwTecR54 uvdSJIaVZjOpxvcgdOFDCgph19xw8BuF/IJXFlXDI/Io4DsCQYGJ6LIv6w8akDs1PlqN 7/KWtKLOlQ7cw9ThRvwyXdF6kYEMYDf+SdQQ5aPkgk9d28/Vx6FitqGh1m+immHWCUnG MxGDs4VzFKm+zmKP4fytUPlLDR9Laj2N443jA0lPZxDLKw1AJHPx+TBx2S1eHIlh6V7c sCHA== X-Gm-Message-State: ABuFfog1pOJq8sB0YSIED1+TmbWSFk0anV3I8s9ce24JI+EaIvyrJX68 4bh6MFogmg6ZNE6HUW9M1qsC+Uun X-Google-Smtp-Source: ACcGV63gKiOtzbEdiShZVgFc8F8HecVn6FSSX6Z8ZyWlj5E44q8/woI+iJd3Q0aYLWGgtmthPaRHoQ== X-Received: by 2002:adf:c793:: with SMTP id l19-v6mr30179506wrg.230.1539894767243; Thu, 18 Oct 2018 13:32:47 -0700 (PDT) Received: from 640k.lan (dynamic-adsl-78-12-231-174.clienti.tiscali.it. [78.12.231.174]) by smtp.gmail.com with ESMTPSA id a12-v6sm14270952wrr.71.2018.10.18.13.32.45 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 18 Oct 2018 13:32:46 -0700 (PDT) From: Paolo Bonzini To: qemu-devel@nongnu.org Date: Thu, 18 Oct 2018 22:31:54 +0200 Message-Id: <1539894735-14232-28-git-send-email-pbonzini@redhat.com> X-Mailer: git-send-email 1.8.3.1 In-Reply-To: <1539894735-14232-1-git-send-email-pbonzini@redhat.com> References: <1539894735-14232-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::431 Subject: [Qemu-devel] [PULL 27/48] hyperv: synic: only setup ack notifier if there's a callback 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: Roman Kagan Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: "Qemu-devel" From: Roman Kagan There's no point setting up an sint ack notifier if no callback is specified. Signed-off-by: Roman Kagan Message-Id: <20180921081836.29230-5-rkagan@virtuozzo.com> Signed-off-by: Paolo Bonzini --- target/i386/hyperv.c | 33 +++++++++++++++++++-------------- 1 file changed, 19 insertions(+), 14 deletions(-) diff --git a/target/i386/hyperv.c b/target/i386/hyperv.c index 47368b7..acdb0ca 100644 --- a/target/i386/hyperv.c +++ b/target/i386/hyperv.c @@ -77,15 +77,14 @@ static void kvm_hv_sint_ack_handler(EventNotifier *notifier) HvSintRoute *sint_route = container_of(notifier, HvSintRoute, sint_ack_notifier); event_notifier_test_and_clear(notifier); - if (sint_route->sint_ack_clb) { - sint_route->sint_ack_clb(sint_route); - } + sint_route->sint_ack_clb(sint_route); } HvSintRoute *kvm_hv_sint_route_create(uint32_t vp_index, uint32_t sint, HvSintAckClb sint_ack_clb) { HvSintRoute *sint_route; + EventNotifier *ack_notifier; int r, gsi; sint_route = g_new0(HvSintRoute, 1); @@ -94,13 +93,15 @@ HvSintRoute *kvm_hv_sint_route_create(uint32_t vp_index, uint32_t sint, goto err; } - r = event_notifier_init(&sint_route->sint_ack_notifier, false); - if (r) { - goto err_sint_set_notifier; - } + ack_notifier = sint_ack_clb ? &sint_route->sint_ack_notifier : NULL; + if (ack_notifier) { + r = event_notifier_init(ack_notifier, false); + if (r) { + goto err_sint_set_notifier; + } - event_notifier_set_handler(&sint_route->sint_ack_notifier, - kvm_hv_sint_ack_handler); + event_notifier_set_handler(ack_notifier, kvm_hv_sint_ack_handler); + } gsi = kvm_irqchip_add_hv_sint_route(kvm_state, vp_index, sint); if (gsi < 0) { @@ -109,7 +110,7 @@ HvSintRoute *kvm_hv_sint_route_create(uint32_t vp_index, uint32_t sint, r = kvm_irqchip_add_irqfd_notifier_gsi(kvm_state, &sint_route->sint_set_notifier, - &sint_route->sint_ack_notifier, gsi); + ack_notifier, gsi); if (r) { goto err_irqfd; } @@ -123,8 +124,10 @@ HvSintRoute *kvm_hv_sint_route_create(uint32_t vp_index, uint32_t sint, err_irqfd: kvm_irqchip_release_virq(kvm_state, gsi); err_gsi: - event_notifier_set_handler(&sint_route->sint_ack_notifier, NULL); - event_notifier_cleanup(&sint_route->sint_ack_notifier); + if (ack_notifier) { + event_notifier_set_handler(ack_notifier, NULL); + event_notifier_cleanup(ack_notifier); + } err_sint_set_notifier: event_notifier_cleanup(&sint_route->sint_set_notifier); err: @@ -139,8 +142,10 @@ void kvm_hv_sint_route_destroy(HvSintRoute *sint_route) &sint_route->sint_set_notifier, sint_route->gsi); kvm_irqchip_release_virq(kvm_state, sint_route->gsi); - event_notifier_set_handler(&sint_route->sint_ack_notifier, NULL); - event_notifier_cleanup(&sint_route->sint_ack_notifier); + if (sint_route->sint_ack_clb) { + event_notifier_set_handler(&sint_route->sint_ack_notifier, NULL); + event_notifier_cleanup(&sint_route->sint_ack_notifier); + } event_notifier_cleanup(&sint_route->sint_set_notifier); g_free(sint_route); }