From patchwork Mon Dec 19 04:18:52 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: 706915 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.ozlabs.org (lists.ozlabs.org [IPv6:2401:3900:2:1::3]) (using TLSv1.2 with cipher ADH-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 3thnl3102tz9s65 for ; Mon, 19 Dec 2016 15:20:15 +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="bwFAdkQH"; 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 3thnl2726czDwHV for ; Mon, 19 Dec 2016 15:20:14 +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="bwFAdkQH"; 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 3thnkP25pXzDw5h for ; Mon, 19 Dec 2016 15:19:41 +1100 (AEDT) Authentication-Results: lists.ozlabs.org; dkim=pass (1024-bit key; unprotected) header.d=mendozajonas.com header.i=@mendozajonas.com header.b="bwFAdkQH"; 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 82E17143F6E; Mon, 19 Dec 2016 12:19:37 +0800 (SGT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=mendozajonas.com; s=mail; t=1482121178; bh=cGRmGtfmELyEnAIn6c9Z4wNk/gahBRbHz2o8MK2xomk=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=bwFAdkQHniBkE0DeargILOLN7fQUMEb7ZAt9WugwMgsP8WuMSPFLjOO79x/Tsn33a YjGJY/zLClpN9Raykf2x951xn3pJKd+G3/HLqEbaHqx1AhSoc9/RtZuruq8aGCx8j/ k5XnldgILVLQmx06gTdd5gADXjJ9MSBp+DhW8/bY= From: Samuel Mendoza-Jonas To: petitboot@lists.ozlabs.org Subject: [PATCH 06/29] discover: Add helpers for status reporting Date: Mon, 19 Dec 2016 15:18:52 +1100 Message-Id: <20161219041915.30497-7-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 This change adds a couple of helpers for the status reporting API, allowing callers to provide just a set of printf-style arguments, rather than having to build up a struct status. Signed-off-by: Jeremy Kerr Signed-off-by: Samuel Mendoza-Jonas --- discover/device-handler.c | 33 +++++++++++++++++++++++++++++++++ discover/device-handler.h | 4 ++++ discover/pxe-parser.c | 5 +---- 3 files changed, 38 insertions(+), 4 deletions(-) diff --git a/discover/device-handler.c b/discover/device-handler.c index 81bdedb..b8825ce 100644 --- a/discover/device-handler.c +++ b/discover/device-handler.c @@ -416,6 +416,39 @@ void device_handler_status(struct device_handler *handler, discover_server_notify_boot_status(handler->server, status); } +static void _device_handler_vstatus(struct device_handler *handler, + enum status_type type, const char *fmt, va_list ap) +{ + struct status status; + + status.type = type; + status.message = talloc_vasprintf(handler, fmt, ap); + + device_handler_status(handler, &status); + + talloc_free(status.message); +} + +void device_handler_status_info(struct device_handler *handler, + const char *fmt, ...) +{ + va_list ap; + + va_start(ap, fmt); + _device_handler_vstatus(handler, STATUS_INFO, fmt, ap); + va_end(ap); +} + +void device_handler_status_err(struct device_handler *handler, + const char *fmt, ...) +{ + va_list ap; + + va_start(ap, fmt); + _device_handler_vstatus(handler, STATUS_ERROR, fmt, ap); + va_end(ap); +} + static void device_handler_boot_status_cb(void *arg, struct status *status) { device_handler_status(arg, status); diff --git a/discover/device-handler.h b/discover/device-handler.h index 89ca87a..f4022e7 100644 --- a/discover/device-handler.h +++ b/discover/device-handler.h @@ -98,6 +98,10 @@ void device_handler_remove(struct device_handler *handler, void device_handler_status(struct device_handler *handler, struct status *status); +void device_handler_status_info(struct device_handler *handler, + const char *fmt, ...); +void device_handler_status_err(struct device_handler *handler, + const char *fmt, ...); struct discover_context *device_handler_discover_context_create( struct device_handler *handler, diff --git a/discover/pxe-parser.c b/discover/pxe-parser.c index a044215..5ac6990 100644 --- a/discover/pxe-parser.c +++ b/discover/pxe-parser.c @@ -241,7 +241,6 @@ static void pxe_conf_parse_cb(struct load_url_result *result, void *data) { struct conf_context *conf = data; struct device_handler *handler; - struct status status = {0}; struct pxe_parser_info *info; char *buf = NULL; int len, rc = 0; @@ -279,14 +278,12 @@ static void pxe_conf_parse_cb(struct load_url_result *result, void *data) handler = talloc_parent(conf); device_handler_discover_context_commit(handler, conf->dc); - status.type = STATUS_INFO; /* * TRANSLATORS: the format specifier in this string in an IP address, * eg. 192.168.1.1 */ - status.message = talloc_asprintf(conf, _("pxe: parsed config for %s"), + device_handler_status_info(handler, _("pxe: parsed config for %s"), conf->dc->conf_url->host); - device_handler_status(handler, &status); talloc_free(buf); out_clean: