From patchwork Fri May 10 17:30:41 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Richard Henderson X-Patchwork-Id: 163925 Delivered-To: patch@linaro.org Received: by 2002:a05:6e02:142:0:0:0:0 with SMTP id j2csp2681448ilr; Fri, 10 May 2019 10:45:49 -0700 (PDT) X-Google-Smtp-Source: APXvYqzLCPg2ggSRgD95A+1FxvuJ6wbTIyd9MYWpWZf5RZEgLoo5ly0WpO6DRGPApjQrzHKG9LAw X-Received: by 2002:a50:b3a6:: with SMTP id s35mr13091497edd.220.1557510348977; Fri, 10 May 2019 10:45:48 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1557510348; cv=none; d=google.com; s=arc-20160816; b=sZekGugXF7h5VbuCLf0VC0mrmlUXeqHjl9E3evxgfkTwvPhCEtKKmn9tnBiO/LAqpI UtAbNkHAELccxDsV5YJmCAAASGzeieyfllf5jUF5mM1uqF6BZm5dtj6ybIqhVei9Yluf 48cj639k3Ca1roT+5NK6pO9tFxABV9aiYofuLT5wXa3/mDhvnpHBsOwMvzTpaI0Abi/Q s07qC4UxrCcdjAN59CntcyfLymBzYdgf2splxTKGrmM/G1EL+qX6oC47VZaobTCpqDgk jvLIRQpHmZqpgNguR2Y1Y5UWNKKM84D5CMTg00sJquURZR8jXT4kK/VCFcaXhK7ouRu+ /miQ== 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 :content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:to:from:dkim-signature; bh=NqFQGLUWEK2q+OruuYLxByccY86fvPfXVx23TDmISjI=; b=G/ZnxO/BArzo8/l966715TSZ6k8J+3pqMBVKcZ/tv5eKIDM65PXxBxstvUW4ggxiuS PE92GwyILdCFmZnMzo37MvdSptYS/m/hwejGhR/SFaIIR6GnA1XgmeQHmvEOVEPFrT5s m+75TxykJeTFVwsPth8jvTqJE0/Ci8cgUAAUusn67FFtvCMBpgAcbCAFwNotONmWERwO YEjzkdebulo+MMI+O6yuUWOGK11x+cE2nuyGs03ZzBDqhNc32kDa8ZMiAHlIJ/LbW9X+ 3uGE8qHUmLSqozi/IVLmGdOtcHRFabqi4EYMDhJTnxohLoGewwd3JJ7uVLXvwARRxJRU 2UiA== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=Zu8XjrqU; 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"; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from lists.gnu.org (lists.gnu.org. [209.51.188.17]) by mx.google.com with ESMTPS id m47si3659432edd.311.2019.05.10.10.45.48 for (version=TLS1 cipher=AES128-SHA bits=128/128); Fri, 10 May 2019 10:45:48 -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; dkim=fail header.i=@linaro.org header.s=google header.b=Zu8XjrqU; 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"; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: from localhost ([127.0.0.1]:47704 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1hP9ae-0005FC-0C for patch@linaro.org; Fri, 10 May 2019 13:45:48 -0400 Received: from eggs.gnu.org ([209.51.188.92]:59188) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1hP9MY-0007Un-Ty for qemu-devel@nongnu.org; Fri, 10 May 2019 13:31:15 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1hP9MX-00069d-Q2 for qemu-devel@nongnu.org; Fri, 10 May 2019 13:31:14 -0400 Received: from mail-pg1-x544.google.com ([2607:f8b0:4864:20::544]:36068) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1hP9MX-00069D-Kk for qemu-devel@nongnu.org; Fri, 10 May 2019 13:31:13 -0400 Received: by mail-pg1-x544.google.com with SMTP id a3so3335124pgb.3 for ; Fri, 10 May 2019 10:31:13 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=NqFQGLUWEK2q+OruuYLxByccY86fvPfXVx23TDmISjI=; b=Zu8XjrqUMrWf6XQgZqoSlfd933QyJLsMUJQuNdp2L7GFynd9RDOEw1hWF8yxnOzvlw i8NC2LAfv2ISDvMhlXDqvvmU0yyNejuABQKu/L5M05RTWlIlo38v5VuKLPD1Pu/RCtBH c8dlidgMdExoOB95L+z/Yo/VhCdJBDf1HUUwfs1nk7FBtaqp5MVzgz6x4Yms4pd42Ry4 gd9bqMWeqHjidCpR3gO2ShzKlVYfr5Cg6IS2TAVFEtwPplwynNDJ4Lku7nltwjQivkUN qUaOPK4OXKwO3LMyBGDkF6Cr41X26Ya1fWH0nf++KBfnx5554yDEFiOn7ls3xwUHcPRu QFrg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=NqFQGLUWEK2q+OruuYLxByccY86fvPfXVx23TDmISjI=; b=FrJmfpIb7stKljxVT1lbZNxIQAH1aQcgoIUI6li/oK6JzECbkObRbAF90lx12IRG+1 LvfTutMO++dJ3BLEMXcV7KZ5PxBENMizUlw4m91iOmOOsUH+y/G/pLHsWpimXBwGPo6G ildeS4z13Xool6tJH34myS3yZPu+v6DN0B8grCMvrLB5suTYWSX2mw/FMTC6k84+8ZI/ 6WqKt0Vc6Md3g/6N6YjHkMzD7fRJvZ7WuXQeukHKDTVcuumbT+P3f/3Voy7Xzhh1XdWk aL5AUavmxBIH+8cUuON/Zaod/jKtlY2krfsIXIHg1jzqx7y9/iqq9oufRFdTQnbCmI0F j4Kw== X-Gm-Message-State: APjAAAW+437024M3rkhBF4ve6Zvu9XqNV4tmOgK8YlPR44lOJ16OS780 bbRMEsQObZW7idHbRuCKdKw6I2uUTb4= X-Received: by 2002:a62:4ece:: with SMTP id c197mr16128216pfb.139.1557509472366; Fri, 10 May 2019 10:31:12 -0700 (PDT) Received: from localhost.localdomain (97-113-13-231.tukw.qwest.net. [97.113.13.231]) by smtp.gmail.com with ESMTPSA id v64sm7936792pfv.106.2019.05.10.10.31.11 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Fri, 10 May 2019 10:31:11 -0700 (PDT) From: Richard Henderson To: qemu-devel@nongnu.org Date: Fri, 10 May 2019 10:30:41 -0700 Message-Id: <20190510173049.28171-18-richard.henderson@linaro.org> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20190510173049.28171-1-richard.henderson@linaro.org> References: <20190510173049.28171-1-richard.henderson@linaro.org> MIME-Version: 1.0 X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2607:f8b0:4864:20::544 Subject: [Qemu-devel] [PATCH v6 17/25] aspeed/scu: Use qemu_guest_getrandom_nofail X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Andrew Jeffery , qemu-arm@nongnu.org Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: "Qemu-devel" The random number is intended for use by the guest. As such, we should honor the -seed argument for reproducibility. Use the *_nofail routine instead of rolling our own error handling locally. Cc: qemu-arm@nongnu.org Cc: Andrew Jeffery Reviewed-by: Laurent Vivier Reviewed-by: Philippe Mathieu-Daudé Reviewed-by: Cédric Le Goater Reviewed-by: Joel Stanley Signed-off-by: Richard Henderson --- hw/misc/aspeed_scu.c | 10 ++-------- 1 file changed, 2 insertions(+), 8 deletions(-) -- 2.17.1 diff --git a/hw/misc/aspeed_scu.c b/hw/misc/aspeed_scu.c index c8217740ef..ab1e18ed4b 100644 --- a/hw/misc/aspeed_scu.c +++ b/hw/misc/aspeed_scu.c @@ -16,7 +16,7 @@ #include "qapi/visitor.h" #include "qemu/bitops.h" #include "qemu/log.h" -#include "crypto/random.h" +#include "qemu/guest-random.h" #include "trace.h" #define TO_REG(offset) ((offset) >> 2) @@ -157,14 +157,8 @@ static const uint32_t ast2500_a1_resets[ASPEED_SCU_NR_REGS] = { static uint32_t aspeed_scu_get_random(void) { - Error *err = NULL; uint32_t num; - - if (qcrypto_random_bytes((uint8_t *)&num, sizeof(num), &err)) { - error_report_err(err); - exit(1); - } - + qemu_guest_getrandom_nofail(&num, sizeof(num)); return num; }