From patchwork Tue Apr 28 09:18:01 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Auger Eric X-Patchwork-Id: 47655 Return-Path: X-Original-To: linaro@patches.linaro.org Delivered-To: linaro@patches.linaro.org Received: from mail-la0-f69.google.com (mail-la0-f69.google.com [209.85.215.69]) by ip-10-151-82-157.ec2.internal (Postfix) with ESMTPS id ACAA820553 for ; Tue, 28 Apr 2015 09:18:12 +0000 (UTC) Received: by layy10 with SMTP id y10sf32751080lay.0 for ; Tue, 28 Apr 2015 02:18:11 -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=r+KcrBtLEwIi52YHXw7vQxlLYUTtffHH0wGYbzE2Kxk=; b=TLa38IKfq0EqFrZDuq6ligiLTkTysLjU4UNJrdUFTnH1e8DF5YLk+3WVlOcEhSsxgb Hbq/SUYa0GsqGNLvJtz/RIvklQv+Fys/A8O068uNvTCrOxBia1Z6/Nv2Bt7+eXpX0GpN M0w+7ec5L6VuyaLe3OY0dIdjsx9r2X6pY3duJKlKgRtIUvdJGDcd0X1SeXB2eZXz76qg 0W0JzKdBTYNku4hLVFUS1JoPxeV15vYaX07PkT0bzxHWQ/0jOuXukz59ds6yxrEWLH9K MWTzfHXKwE2iJO+UL4570ypdxGPzCimXbqiwrWhKkKWuOnnSWlEv4at8S/jBvZC8MxDg MWOg== X-Gm-Message-State: ALoCoQkmFGWxHsKNMxKrdn3zG/6F+fpNOUM6YpvkS4sU9LbQqg+I9ljMPtNOYA1Re/UFiJQxcmvM X-Received: by 10.152.37.101 with SMTP id x5mr9751590laj.5.1430212691564; Tue, 28 Apr 2015 02:18:11 -0700 (PDT) MIME-Version: 1.0 X-BeenThere: patchwork-forward@linaro.org Received: by 10.152.25.132 with SMTP id c4ls44067lag.75.gmail; Tue, 28 Apr 2015 02:18:11 -0700 (PDT) X-Received: by 10.152.234.139 with SMTP id ue11mr13737159lac.28.1430212691425; Tue, 28 Apr 2015 02:18:11 -0700 (PDT) Received: from mail-la0-f49.google.com (mail-la0-f49.google.com. [209.85.215.49]) by mx.google.com with ESMTPS id q8si16634679lal.71.2015.04.28.02.18.11 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 28 Apr 2015 02:18:11 -0700 (PDT) Received-SPF: pass (google.com: domain of patch+caf_=patchwork-forward=linaro.org@linaro.org designates 209.85.215.49 as permitted sender) client-ip=209.85.215.49; Received: by lagv1 with SMTP id v1so99499581lag.3 for ; Tue, 28 Apr 2015 02:18:11 -0700 (PDT) X-Received: by 10.152.4.72 with SMTP id i8mr2421272lai.32.1430212691316; Tue, 28 Apr 2015 02:18:11 -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 l1csp1764884lbt; Tue, 28 Apr 2015 02:18:10 -0700 (PDT) X-Received: by 10.194.77.7 with SMTP id o7mr29944036wjw.95.1430212690524; Tue, 28 Apr 2015 02:18:10 -0700 (PDT) Received: from mail-wi0-f170.google.com (mail-wi0-f170.google.com. [209.85.212.170]) by mx.google.com with ESMTPS id dm9si37473987wjb.138.2015.04.28.02.18.10 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 28 Apr 2015 02:18:10 -0700 (PDT) Received-SPF: pass (google.com: domain of eric.auger@linaro.org designates 209.85.212.170 as permitted sender) client-ip=209.85.212.170; Received: by wizk4 with SMTP id k4so131995531wiz.1 for ; Tue, 28 Apr 2015 02:18:10 -0700 (PDT) X-Received: by 10.194.62.167 with SMTP id z7mr29783846wjr.62.1430212690221; Tue, 28 Apr 2015 02:18:10 -0700 (PDT) Received: from midway01-04-00.lavalab ([81.128.185.50]) by mx.google.com with ESMTPSA id em18sm9518708wjd.19.2015.04.28.02.18.09 (version=TLSv1.1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Tue, 28 Apr 2015 02:18:09 -0700 (PDT) From: Eric Auger To: eric.auger@st.com, eric.auger@linaro.org, qemu-devel@nongnu.org, pbonzini@redhat.com, peter.crosthwaite@xilinx.com Cc: christoffer.dall@linaro.org, kvmarm@lists.cs.columbia.edu, patches@linaro.org, alex.williamson@redhat.com Subject: [PATCH 1/3] qdev: pass the check callback to qdev_init_gpio_out_named Date: Tue, 28 Apr 2015 10:18:01 +0100 Message-Id: <1430212683-10984-2-git-send-email-eric.auger@linaro.org> X-Mailer: git-send-email 1.8.3.2 In-Reply-To: <1430212683-10984-1-git-send-email-eric.auger@linaro.org> References: <1430212683-10984-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.49 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 this callback is set to the dummy object_property_allow_set_link. This will allow qdev_init_gpio_out_named callers to specialize this callback, typically sysbus. Signed-off-by: Eric Auger --- hw/core/qdev.c | 8 +++++--- include/hw/qdev-core.h | 3 ++- include/qom/object.h | 3 +++ 3 files changed, 10 insertions(+), 4 deletions(-) diff --git a/hw/core/qdev.c b/hw/core/qdev.c index 7fa58be..dc82df4 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, + object_property_set_link_t 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/include/hw/qdev-core.h b/include/hw/qdev-core.h index 24c973d..9d500a3 100644 --- a/include/hw/qdev-core.h +++ b/include/hw/qdev-core.h @@ -294,7 +294,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, + object_property_set_link_t 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..4687fa1 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 (*object_property_set_link_t)(Object *, const char *, + Object *, Error **); + #define TYPE_OBJECT "object" /**