From patchwork Mon Dec 19 04:18:54 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sam Mendoza-Jonas X-Patchwork-Id: 706917 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.ozlabs.org (lists.ozlabs.org [103.22.144.68]) (using TLSv1.2 with cipher ADH-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 3thnlC0Vvpz9t0v for ; Mon, 19 Dec 2016 15:20:23 +1100 (AEDT) Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (1024-bit key; unprotected) header.d=mendozajonas.com header.i=@mendozajonas.com header.b="Jv9gbQwG"; dkim-atps=neutral Received: from lists.ozlabs.org (lists.ozlabs.org [IPv6:2401:3900:2:1::3]) by lists.ozlabs.org (Postfix) with ESMTP id 3thnlB6XwPzDwHh for ; Mon, 19 Dec 2016 15:20:22 +1100 (AEDT) Authentication-Results: lists.ozlabs.org; dkim=fail reason="signature verification failed" (1024-bit key; unprotected) header.d=mendozajonas.com header.i=@mendozajonas.com header.b="Jv9gbQwG"; dkim-atps=neutral X-Original-To: petitboot@lists.ozlabs.org Delivered-To: petitboot@lists.ozlabs.org Received: from mendozajonas.com (mendozajonas.com [188.166.185.233]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by lists.ozlabs.org (Postfix) with ESMTPS id 3thnkS0D5wzDwHM for ; Mon, 19 Dec 2016 15:19:44 +1100 (AEDT) Authentication-Results: lists.ozlabs.org; dkim=pass (1024-bit key; unprotected) header.d=mendozajonas.com header.i=@mendozajonas.com header.b="Jv9gbQwG"; dkim-atps=neutral Received: from skellige.ozlabs.ibm.com (unknown [122.99.82.10]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (Client did not present a certificate) (Authenticated sender: sam@mendozajonas.com) by mendozajonas.com (Postfix) with ESMTPSA id 66B7F143FB0; Mon, 19 Dec 2016 12:19:40 +0800 (SGT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=mendozajonas.com; s=mail; t=1482121181; bh=6rm/ZAzp4F+Hn8Pow45gMF5ziQ0443PZvbYeQudsXRc=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=Jv9gbQwGNr90VyMySgeBIQiAHLB8qw3SDA3nvuTbnZ6x/AFhhIu3zmDWwpMV4TEKV 2kA94oy2rmslJ4psTHB0ipV4fJAK0h+j9d1XyqjbvHUxTSDIX/r7gUJPBV1mrtPx5X Xbwh4q2cbg7q0liMxnlqUuTwJQuRQuTI/9nILUGA= From: Samuel Mendoza-Jonas To: petitboot@lists.ozlabs.org Subject: [PATCH 08/29] discover: Add device-specific status reporting functions Date: Mon, 19 Dec 2016 15:18:54 +1100 Message-Id: <20161219041915.30497-9-sam@mendozajonas.com> X-Mailer: git-send-email 2.10.2 In-Reply-To: <20161219041915.30497-1-sam@mendozajonas.com> References: <20161219041915.30497-1-sam@mendozajonas.com> X-BeenThere: petitboot@lists.ozlabs.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: Petitboot bootloader development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Samuel Mendoza-Jonas MIME-Version: 1.0 Errors-To: petitboot-bounces+incoming=patchwork.ozlabs.org@lists.ozlabs.org Sender: "Petitboot" From: Jeremy Kerr Most of our status reporting is against a specific device, so add status reporting functions that take a struct discover_device and use a stnadard prefix. Signed-off-by: Jeremy Kerr Signed-off-by: Samuel Mendoza-Jonas --- discover/device-handler.c | 31 +++++++++++++++++++++++++++++++ discover/device-handler.h | 4 ++++ 2 files changed, 35 insertions(+) diff --git a/discover/device-handler.c b/discover/device-handler.c index 281a3c4..aa693e4 100644 --- a/discover/device-handler.c +++ b/discover/device-handler.c @@ -429,6 +429,37 @@ static void _device_handler_vstatus(struct device_handler *handler, talloc_free(status.message); } +static void _device_handler_vdevstatus(struct device_handler *handler, + struct discover_device *device, enum status_type type, + const char *fmt, va_list ap) +{ + char *msg; + + msg = talloc_asprintf(handler, "(%s): %s", device->device->id, fmt); + _device_handler_vstatus(handler, type, msg, ap); + talloc_free(msg); +} + +void device_handler_status_dev_info(struct device_handler *handler, + struct discover_device *dev, const char *fmt, ...) +{ + va_list ap; + + va_start(ap, fmt); + _device_handler_vdevstatus(handler, dev, STATUS_INFO, fmt, ap); + va_end(ap); +} + +void device_handler_status_dev_err(struct device_handler *handler, + struct discover_device *dev, const char *fmt, ...) +{ + va_list ap; + + va_start(ap, fmt); + _device_handler_vdevstatus(handler, dev, STATUS_ERROR, fmt, ap); + va_end(ap); +} + void device_handler_status_info(struct device_handler *handler, const char *fmt, ...) { diff --git a/discover/device-handler.h b/discover/device-handler.h index f4022e7..fe8a3b0 100644 --- a/discover/device-handler.h +++ b/discover/device-handler.h @@ -102,6 +102,10 @@ void device_handler_status_info(struct device_handler *handler, const char *fmt, ...); void device_handler_status_err(struct device_handler *handler, const char *fmt, ...); +void device_handler_status_dev_info(struct device_handler *handler, + struct discover_device *dev, const char *fmt, ...); +void device_handler_status_dev_err(struct device_handler *handler, + struct discover_device *dev, const char *fmt, ...); struct discover_context *device_handler_discover_context_create( struct device_handler *handler,