From patchwork Wed Sep 4 08:56:25 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Shameerali Kolothum Thodi X-Patchwork-Id: 172904 Delivered-To: patch@linaro.org Received: by 2002:a92:d204:0:0:0:0:0 with SMTP id y4csp963745ily; Wed, 4 Sep 2019 02:07:35 -0700 (PDT) X-Google-Smtp-Source: APXvYqw+KICsxM9H+yInC+92xcpWjGOZ0OYwVIeo2HvMsX6N/HSvHzYDjO5/beidQjRdGJgxTIb7 X-Received: by 2002:a17:906:4e8c:: with SMTP id v12mr13912893eju.96.1567588055196; Wed, 04 Sep 2019 02:07:35 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1567588055; cv=none; d=google.com; s=arc-20160816; b=a0B1ReKYCP68XFgmsLq2FEhmz8/fwjlqT81zciWxFb1QSWOEFuUEY8s+UPesYCif4e CIDU7JliidbEK0iSeEss5Y3duqOIZQlR2YyNEd1KznQb97t6rWPVJEVPBOA1JWTBjOvR UXPcCNVSpHyGWd4qAfAR653ec64C9CgBzYJYLzT4Vd7G6cgK+zggkTH3QpCum/9sfKQK nI+r1+3BOFccnViaLsICvWvo5ar9/o9rdoLlKsYfDMmlPkXfa5spWWSy01GxguDkOyAv dMypqLoTtLKxj9zZNNHxoakJ/wnmWuMb+qV2ONsekVOGMHG/n0IEpLS58/JBME8/ezwZ 8dzg== 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:subject:mime-version:references :in-reply-to:message-id:date:to:from; bh=d+Y28knmJAqtHdG2lLlZJCXNKp7pRY9ulmhT4Mwhfoc=; b=f8GyY9+htS1K2NPE5uP36qPqmJhBd4roLH4dnLQ4n2an5Xy/MV3Xfza+1ssjh1/cYd GF/ue3kE7LQAMR7T8bbJ8sxJSstYE8uMqLTUswfFpQ4ppeI27wJDGgOoUew8CbOqQ82D 7j5y5Kpulr3L/LpoQpjXeku7qBxjxa14Ur6fsW2mHNMs3XAY2/O/hQk3XBI3pPZ0iIjW 3Ydvr1lQtR/nmklJiMO4ksls3f+h3yR+UwHjmfnMY0SEc8G/FyoEQDmnPr1HLm5i360y 5gdBjK0YNbPstmgVBddEucyn7TEx6AELHk0sjpAvbLgol7ChTuwc2KoRq2MJlZf4aW5Z U5Mg== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org" Return-Path: Received: from lists.gnu.org (lists.gnu.org. [209.51.188.17]) by mx.google.com with ESMTPS id v39si474934edc.234.2019.09.04.02.07.35 for (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Wed, 04 Sep 2019 02:07:35 -0700 (PDT) Received-SPF: pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; Authentication-Results: mx.google.com; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org" Received: from localhost ([::1]:54808 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1i5RGI-00083x-2V for patch@linaro.org; Wed, 04 Sep 2019 05:07:34 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:38621) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1i5R76-0007P7-Qp for qemu-devel@nongnu.org; Wed, 04 Sep 2019 04:58:05 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1i5R75-0007FV-Ge for qemu-devel@nongnu.org; Wed, 04 Sep 2019 04:58:04 -0400 Received: from szxga05-in.huawei.com ([45.249.212.191]:2259 helo=huawei.com) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1i5R72-0007Dh-SF; Wed, 04 Sep 2019 04:58:01 -0400 Received: from DGGEMS411-HUB.china.huawei.com (unknown [172.30.72.60]) by Forcepoint Email with ESMTP id 00B234839B1CCFF82788; Wed, 4 Sep 2019 16:57:59 +0800 (CST) Received: from S00345302A-PC.china.huawei.com (10.202.227.237) by DGGEMS411-HUB.china.huawei.com (10.3.19.211) with Microsoft SMTP Server id 14.3.439.0; Wed, 4 Sep 2019 16:57:50 +0800 From: Shameer Kolothum To: , , , Date: Wed, 4 Sep 2019 09:56:25 +0100 Message-ID: <20190904085629.13872-8-shameerali.kolothum.thodi@huawei.com> X-Mailer: git-send-email 2.12.0.windows.1 In-Reply-To: <20190904085629.13872-1-shameerali.kolothum.thodi@huawei.com> References: <20190904085629.13872-1-shameerali.kolothum.thodi@huawei.com> MIME-Version: 1.0 X-Originating-IP: [10.202.227.237] X-CFilter-Loop: Reflected X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 45.249.212.191 Subject: [Qemu-devel] [PATCH-for-4.2 v10 07/11] hw/arm: Factor out powerdown notifier from GPIO X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: peter.maydell@linaro.org, sameo@linux.intel.com, ard.biesheuvel@linaro.org, linuxarm@huawei.com, xuwei5@hisilicon.com, shannon.zhaosl@gmail.com, sebastien.boeuf@intel.com, lersek@redhat.com Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: "Qemu-devel" This is in preparation of using GED device for system_powerdown event. Make the powerdown notifier registration independent of create_gpio() fn. Signed-off-by: Shameer Kolothum Reviewed-by: Eric Auger --- hw/arm/virt.c | 12 ++++-------- include/hw/arm/virt.h | 1 + 2 files changed, 5 insertions(+), 8 deletions(-) -- 2.17.1 Reviewed-by: Igor Mammedov diff --git a/hw/arm/virt.c b/hw/arm/virt.c index 95accc28f1..89ee37d7de 100644 --- a/hw/arm/virt.c +++ b/hw/arm/virt.c @@ -791,10 +791,6 @@ static void virt_powerdown_req(Notifier *n, void *opaque) qemu_set_irq(qdev_get_gpio_in(gpio_key_dev, 0), 1); } -static Notifier virt_system_powerdown_notifier = { - .notify = virt_powerdown_req -}; - static void create_gpio(const VirtMachineState *vms, qemu_irq *pic) { char *nodename; @@ -835,10 +831,6 @@ static void create_gpio(const VirtMachineState *vms, qemu_irq *pic) KEY_POWER); qemu_fdt_setprop_cells(vms->fdt, "/gpio-keys/poweroff", "gpios", phandle, 3, 0); - - /* connect powerdown request */ - qemu_register_powerdown_notifier(&virt_system_powerdown_notifier); - g_free(nodename); } @@ -1730,6 +1722,10 @@ static void machvirt_init(MachineState *machine) vms->acpi_dev = create_acpi_ged(vms, pic); } + /* connect powerdown request */ + vms->powerdown_notifier.notify = virt_powerdown_req; + qemu_register_powerdown_notifier(&vms->powerdown_notifier); + /* Create mmio transports, so the user can create virtio backends * (which will be automatically plugged in to the transports). If * no backend is created the transport will just sit harmlessly idle. diff --git a/include/hw/arm/virt.h b/include/hw/arm/virt.h index 577ee49b4b..0b41083e9d 100644 --- a/include/hw/arm/virt.h +++ b/include/hw/arm/virt.h @@ -137,6 +137,7 @@ typedef struct { int psci_conduit; hwaddr highest_gpa; DeviceState *acpi_dev; + Notifier powerdown_notifier; } VirtMachineState; #define VIRT_ECAM_ID(high) (high ? VIRT_HIGH_PCIE_ECAM : VIRT_PCIE_ECAM)