From patchwork Tue Apr 28 16:51:10 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Auger Eric X-Patchwork-Id: 47694 Return-Path: X-Original-To: linaro@patches.linaro.org Delivered-To: linaro@patches.linaro.org Received: from mail-lb0-f199.google.com (mail-lb0-f199.google.com [209.85.217.199]) by ip-10-151-82-157.ec2.internal (Postfix) with ESMTPS id E037320553 for ; Tue, 28 Apr 2015 16:51:45 +0000 (UTC) Received: by lbbqq2 with SMTP id qq2sf242757lbb.0 for ; Tue, 28 Apr 2015 09:51:44 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:mime-version:delivered-to:from:to:cc:subject :date:message-id:in-reply-to:references:x-original-sender :x-original-authentication-results:precedence:mailing-list:list-id :list-post:list-help:list-archive:list-unsubscribe; bh=LjLLj0SVXcgMbDfZse22zpUxQ8NhbWjBuzr0/zW0h7s=; b=N+Vm3IIMeQdfBUCpVjefj3kWIErniEvcooL+LCtLe+mCf4wSjCv590PjAezSrxYgr+ zEhWXKYbx+6qzPDkKSbwCVXGqL58SM0KRZKfwjxoScSMq1vzv2DrwLUqGbbpyI5ZDv59 W7xTeQQBqN/sL1YPFym39Nf+aT/Afd8wM1F0+ZDtwknw4gD+5wSOsFpYmtLGveSjBtaK 1xGpAzVK4WZ5gSAr7acGgOODJ2VOYfkBVWmBn38aqqAr+TIZ0ZyydYL7fMTcmgTkeUE1 1JHpxF95SNYHOpAhJzAhltYQzBCbQkkxL+TEP0RmhwChLREpc30CzKXnvM6CR6dFbX9k C5/w== X-Gm-Message-State: ALoCoQlaM8YbZ4R9CB6uy8Wi8c/ZhBqqCMJyGpRBjsJSX7kc/yQjMcnzeNta3CLFY3gnlTBtSL0p X-Received: by 10.180.160.197 with SMTP id xm5mr253122wib.1.1430239904836; Tue, 28 Apr 2015 09:51:44 -0700 (PDT) MIME-Version: 1.0 X-BeenThere: patchwork-forward@linaro.org Received: by 10.152.7.72 with SMTP id h8ls106855laa.71.gmail; Tue, 28 Apr 2015 09:51:44 -0700 (PDT) X-Received: by 10.112.42.16 with SMTP id j16mr14984615lbl.98.1430239904678; Tue, 28 Apr 2015 09:51:44 -0700 (PDT) Received: from mail-la0-f53.google.com (mail-la0-f53.google.com. [209.85.215.53]) by mx.google.com with ESMTPS id y8si15723591laj.161.2015.04.28.09.51.44 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 28 Apr 2015 09:51:44 -0700 (PDT) Received-SPF: pass (google.com: domain of patch+caf_=patchwork-forward=linaro.org@linaro.org designates 209.85.215.53 as permitted sender) client-ip=209.85.215.53; Received: by labbd9 with SMTP id bd9so545771lab.2 for ; Tue, 28 Apr 2015 09:51:44 -0700 (PDT) X-Received: by 10.152.4.72 with SMTP id i8mr4087565lai.32.1430239904576; Tue, 28 Apr 2015 09:51:44 -0700 (PDT) X-Forwarded-To: patchwork-forward@linaro.org X-Forwarded-For: patch@linaro.org patchwork-forward@linaro.org Delivered-To: patches@linaro.org Received: by 10.112.67.65 with SMTP id l1csp2002313lbt; Tue, 28 Apr 2015 09:51:44 -0700 (PDT) X-Received: by 10.194.22.40 with SMTP id a8mr34764303wjf.134.1430239893422; Tue, 28 Apr 2015 09:51:33 -0700 (PDT) Received: from mail-wi0-f173.google.com (mail-wi0-f173.google.com. [209.85.212.173]) by mx.google.com with ESMTPS id t5si28676411wjy.122.2015.04.28.09.51.33 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 28 Apr 2015 09:51:33 -0700 (PDT) Received-SPF: pass (google.com: domain of eric.auger@linaro.org designates 209.85.212.173 as permitted sender) client-ip=209.85.212.173; Received: by wizk4 with SMTP id k4so148290256wiz.1 for ; Tue, 28 Apr 2015 09:51:33 -0700 (PDT) X-Received: by 10.180.88.72 with SMTP id be8mr31789742wib.42.1430239893185; Tue, 28 Apr 2015 09:51:33 -0700 (PDT) Received: from midway01-04-00.lavalab ([81.128.185.50]) by mx.google.com with ESMTPSA id gs7sm17255958wib.10.2015.04.28.09.51.31 (version=TLSv1.1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Tue, 28 Apr 2015 09:51:32 -0700 (PDT) From: Eric Auger To: eric.auger@st.com, eric.auger@linaro.org, qemu-devel@nongnu.org, alex.williamson@redhat.com, agraf@suse.de, pbonzini@redhat.com, peter.crosthwaite@xilinx.com Cc: christoffer.dall@linaro.org, kvmarm@lists.cs.columbia.edu, patches@linaro.org, peter.maydell@linaro.org, alex.bennee@linaro.org, kim.phillips@freescale.com, b.reynal@virtualopensystems.com, Bharat.Bhushan@freescale.com, vikrams@codeaurora.org Subject: [PATCH v13 09/12] qdev: pass the check callback to qdev_init_gpio_out_named Date: Tue, 28 Apr 2015 17:51:10 +0100 Message-Id: <1430239873-31950-10-git-send-email-eric.auger@linaro.org> X-Mailer: git-send-email 1.8.3.2 In-Reply-To: <1430239873-31950-1-git-send-email-eric.auger@linaro.org> References: <1430239873-31950-1-git-send-email-eric.auger@linaro.org> X-Removed-Original-Auth: Dkim didn't pass. X-Original-Sender: eric.auger@linaro.org X-Original-Authentication-Results: mx.google.com; spf=pass (google.com: domain of patch+caf_=patchwork-forward=linaro.org@linaro.org designates 209.85.215.53 as permitted sender) smtp.mail=patch+caf_=patchwork-forward=linaro.org@linaro.org Precedence: list Mailing-list: list patchwork-forward@linaro.org; contact patchwork-forward+owners@linaro.org List-ID: X-Google-Group-Id: 836684582541 List-Post: , List-Help: , List-Archive: List-Unsubscribe: , qdev_init_gpio_out_named takes a new argument corresponding to the check callback passed to object_property_add_link. In qdev_init_gpio_out and sysbus_init_irq, this callback is currently set to the dummy object_property_allow_set_link. This will allow qdev_init_gpio_out_named callers to specialize this callback. A subsequent patch will implement that for sysbus. Signed-off-by: Eric Auger --- v1 -> v2: - fix qdev_init_gpio_out_named call in sysbus_init_irq - rewording of commit message --- hw/core/qdev.c | 8 +++++--- hw/core/sysbus.c | 3 ++- include/hw/qdev-core.h | 3 ++- include/qom/object.h | 6 ++++-- 4 files changed, 13 insertions(+), 7 deletions(-) diff --git a/hw/core/qdev.c b/hw/core/qdev.c index 6e6a65d..857217d 100644 --- a/hw/core/qdev.c +++ b/hw/core/qdev.c @@ -452,7 +452,8 @@ void qdev_init_gpio_in(DeviceState *dev, qemu_irq_handler handler, int n) } void qdev_init_gpio_out_named(DeviceState *dev, qemu_irq *pins, - const char *name, int n) + const char *name, int n, + LinkPropertySetter check_cb) { int i; NamedGPIOList *gpio_list = qdev_get_named_gpio_list(dev, name); @@ -465,7 +466,7 @@ void qdev_init_gpio_out_named(DeviceState *dev, qemu_irq *pins, memset(&pins[i], 0, sizeof(*pins)); object_property_add_link(OBJECT(dev), propname, TYPE_IRQ, (Object **)&pins[i], - object_property_allow_set_link, + check_cb, OBJ_PROP_LINK_UNREF_ON_RELEASE, &error_abort); } @@ -474,7 +475,8 @@ void qdev_init_gpio_out_named(DeviceState *dev, qemu_irq *pins, void qdev_init_gpio_out(DeviceState *dev, qemu_irq *pins, int n) { - qdev_init_gpio_out_named(dev, pins, NULL, n); + qdev_init_gpio_out_named(dev, pins, NULL, n, + object_property_allow_set_link); } qemu_irq qdev_get_gpio_in_named(DeviceState *dev, const char *name, int n) diff --git a/hw/core/sysbus.c b/hw/core/sysbus.c index b53c351..1bcb64d 100644 --- a/hw/core/sysbus.c +++ b/hw/core/sysbus.c @@ -159,7 +159,8 @@ void sysbus_mmio_map_overlap(SysBusDevice *dev, int n, hwaddr addr, /* Request an IRQ source. The actual IRQ object may be populated later. */ void sysbus_init_irq(SysBusDevice *dev, qemu_irq *p) { - qdev_init_gpio_out_named(DEVICE(dev), p, SYSBUS_DEVICE_GPIO_IRQ, 1); + qdev_init_gpio_out_named(DEVICE(dev), p, SYSBUS_DEVICE_GPIO_IRQ, 1, + object_property_allow_set_link); } /* Pass IRQs from a target device. */ diff --git a/include/hw/qdev-core.h b/include/hw/qdev-core.h index 4e673f9..0885f39 100644 --- a/include/hw/qdev-core.h +++ b/include/hw/qdev-core.h @@ -293,7 +293,8 @@ void qdev_init_gpio_out(DeviceState *dev, qemu_irq *pins, int n); void qdev_init_gpio_in_named(DeviceState *dev, qemu_irq_handler handler, const char *name, int n); void qdev_init_gpio_out_named(DeviceState *dev, qemu_irq *pins, - const char *name, int n); + const char *name, int n, + LinkPropertySetter fn); void qdev_pass_gpios(DeviceState *dev, DeviceState *container, const char *name); diff --git a/include/qom/object.h b/include/qom/object.h index d2d7748..95d1a1d 100644 --- a/include/qom/object.h +++ b/include/qom/object.h @@ -33,6 +33,9 @@ typedef struct TypeInfo TypeInfo; typedef struct InterfaceClass InterfaceClass; typedef struct InterfaceInfo InterfaceInfo; +typedef void (*LinkPropertySetter)(Object *, const char *, + Object *, Error **); + #define TYPE_OBJECT "object" /** @@ -1165,8 +1168,7 @@ void object_property_allow_set_link(Object *, const char *, */ void object_property_add_link(Object *obj, const char *name, const char *type, Object **child, - void (*check)(Object *obj, const char *name, - Object *val, Error **errp), + LinkPropertySetter check, ObjectPropertyLinkFlags flags, Error **errp);