From patchwork Wed Sep 18 13:06:29 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: 173972 Delivered-To: patch@linaro.org Received: by 2002:a92:7e96:0:0:0:0:0 with SMTP id q22csp2452672ill; Wed, 18 Sep 2019 06:18:37 -0700 (PDT) X-Google-Smtp-Source: APXvYqw3ZbH8F9H/XEN2t9LI53BYzfL+EODqd1I2dv516COxMbv1Ygvr9v2yZ/72LclCr+/zuE+0 X-Received: by 2002:ac8:6047:: with SMTP id k7mr337096qtm.238.1568812717028; Wed, 18 Sep 2019 06:18:37 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1568812717; cv=none; d=google.com; s=arc-20160816; b=bk2bWhiWntZHgSA+6UVfO0TtcHk2aRPXLmdVAqVa3XwEqUrmML9HPrVL0yHfTxX3Fp vZn6MM3AlOYeW/QeASNe/nUpMAQr8RCaJTOl9kg0POCuYxpnx1M4WLXprNb8vX6n5L7X diWsF8BNU/6wuYNiuqCvU9qvSkGTGwx1rBNI6Ca3yjtDyBnGnQBF5fluNBij4Mslwsdh Bd91DsLkbmKcd7YZ5MtHEOVTmv7En0LbYDkZcFoPbNUTD6pNUolh4RvRr3PvWxMtCIr/ zn7NWkG1J464L5kEKdP2S+B0tlvIzSkFOSTqXngqij7432do0YvrAPNZvqkEWRCcAR1w KpOg== 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=Bw5PURF4xRHGJe+HhTPvWyXy6aeb9/AXe7qpT1iBlw4=; b=QRl+B/xlTY+oqvuKQLs663qxB8IDLWHxLIUDhJKVLhP3N4FD0QCiUj4Jel5h+/KaJv cNtQMR/rZCVodHbRtwHuwxqne/pYYepNeCJZcr+h4mrsVsn+J9Vn8U1lk1Gwz2FojJly oCUAGxbkYuUuRcyQQ+Gjje/jjy1Lrmo28eTB87ye56GvjjrEdembKVjc/4uR8bnCXkiH 24O8oz/PZDPJSbz4NnwLa4bIVAfI4+Uoh/sckEZOsKt9yAdhIJmepjhOJtJfsp4JcafD k7tZXe9GrKRxSB6fv3YdU2jr2fwKVM4nep17vg2g/6tEe4WffGfee8qvjJDvzDXKr0cF 19+w== 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 q23si3809362qvh.175.2019.09.18.06.18.36 for (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Wed, 18 Sep 2019 06:18:37 -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]:58938 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1iAZqt-00052k-Ea for patch@linaro.org; Wed, 18 Sep 2019 09:18:35 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:58766) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1iAZhC-0004Vk-4r for qemu-devel@nongnu.org; Wed, 18 Sep 2019 09:08:35 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1iAZhA-0003TY-Rc for qemu-devel@nongnu.org; Wed, 18 Sep 2019 09:08:33 -0400 Received: from szxga04-in.huawei.com ([45.249.212.190]:2174 helo=huawei.com) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1iAZh8-0003Ql-0Y; Wed, 18 Sep 2019 09:08:30 -0400 Received: from DGGEMS409-HUB.china.huawei.com (unknown [172.30.72.58]) by Forcepoint Email with ESMTP id 090A599A5E7BA1C8636A; Wed, 18 Sep 2019 21:08:28 +0800 (CST) Received: from S00345302A-PC.china.huawei.com (10.202.227.237) by DGGEMS409-HUB.china.huawei.com (10.3.19.209) with Microsoft SMTP Server id 14.3.439.0; Wed, 18 Sep 2019 21:08:16 +0800 From: Shameer Kolothum To: , , , Date: Wed, 18 Sep 2019 14:06:29 +0100 Message-ID: <20190918130633.4872-8-shameerali.kolothum.thodi@huawei.com> X-Mailer: git-send-email 2.12.0.windows.1 In-Reply-To: <20190918130633.4872-1-shameerali.kolothum.thodi@huawei.com> References: <20190918130633.4872-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.190 Subject: [Qemu-devel] [PATCH-for-4.2 v11 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, mst@redhat.com, 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 Reviewed-by: Igor Mammedov --- hw/arm/virt.c | 12 ++++-------- include/hw/arm/virt.h | 1 + 2 files changed, 5 insertions(+), 8 deletions(-) -- 2.17.1 diff --git a/hw/arm/virt.c b/hw/arm/virt.c index d221841c42..dbd8c18f36 100644 --- a/hw/arm/virt.c +++ b/hw/arm/virt.c @@ -797,10 +797,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; @@ -841,10 +837,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); } @@ -1737,6 +1729,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)