From patchwork Fri Mar 15 03:26:18 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Richard Henderson X-Patchwork-Id: 160379 Delivered-To: patch@linaro.org Received: by 2002:a02:5cc1:0:0:0:0:0 with SMTP id w62csp16270255jad; Thu, 14 Mar 2019 20:45:07 -0700 (PDT) X-Google-Smtp-Source: APXvYqwznW85AWxnf1TM9Pl8mzLqWg1QDvVdRAjbIaCobUVnHIymBgiOWwJFl4ra6MeS/BABrDTu X-Received: by 2002:adf:ba84:: with SMTP id p4mr751557wrg.156.1552621507635; Thu, 14 Mar 2019 20:45:07 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1552621507; cv=none; d=google.com; s=arc-20160816; b=fd9GpPTN632v0107oiwCeIYXRCA9LqXufnYMHfvXqXtx9dyalVIFZsFD5VK4b0ttNd r7177bl6D24QGk1W/NM7J3BBpaOaXAT+P25UOMNzjWtN1P0p4vWqA/B8kLReKcO8a2q8 7enIRRsR2d2NCIqF7toIPvs8wuTv4EHhwjf8NI7tF5dUwUv6UMDPLH6K5B+Uwy6cuLZf pw8DqcQSLfEmyfpxhSOfUjRQV20LaphsGg2mTBfWMp5ESPCp2Fm655RkYZktoMEHFZUm lXzKVtHp0eXkY6/LTTTzRcFR02KeENQdwv8JOJBNrCC5/KKbKlscOtdjflNzZWfYnaND Lv+w== 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:references:in-reply-to :message-id:date:to:from:dkim-signature; bh=QIfc4JulLMpRI8ZlPuSOcyyKpv9m8t9iZ59mu5JmetE=; b=eBYikN4JhhgB/K4ycix4jlOe6Y5vcqB45o+jXF1o9HRrJplI3EQ8GH3lptg/b8QBcl i2lrkNbHGiqtVH5uC1GsE9sPqXfPPpPLvurIlz0aBsMJs+LKjIsmS4u55CetTVCVqbbH CmE0uCDx7RDmysVevICjFAoOqUladVfgm5m2WnbGVcxO0OZTV1gAveNXPmRSN9RO6T+k CCUwa9JW4sdZQWIW/VJ+76B0QNsELIL77ZUvijiUY9iY+ok+dk6/eS4ngvNmN/AD2ltV 9qzwlw5yqPd+qojHwZi/gZ4vhdqX2iZUIgzrn0CuKhsHOKZiH/EdcnGScLSVxImn9mOs LzhA== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b="cWo/ItSA"; 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 f2si728455wrg.180.2019.03.14.20.45.07 for (version=TLS1 cipher=AES128-SHA bits=128/128); Thu, 14 Mar 2019 20:45:07 -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="cWo/ItSA"; 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]:48830 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1h4dmM-0005Zp-Fn for patch@linaro.org; Thu, 14 Mar 2019 23:45:06 -0400 Received: from eggs.gnu.org ([209.51.188.92]:43825) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1h4dcK-0005BE-CB for qemu-devel@nongnu.org; Thu, 14 Mar 2019 23:34:45 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1h4dUf-0002wV-BM for qemu-devel@nongnu.org; Thu, 14 Mar 2019 23:26:50 -0400 Received: from mail-pg1-x535.google.com ([2607:f8b0:4864:20::535]:33157) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1h4dUf-0002vi-2M for qemu-devel@nongnu.org; Thu, 14 Mar 2019 23:26:49 -0400 Received: by mail-pg1-x535.google.com with SMTP id i7so2200787pgq.0 for ; Thu, 14 Mar 2019 20:26:48 -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; bh=QIfc4JulLMpRI8ZlPuSOcyyKpv9m8t9iZ59mu5JmetE=; b=cWo/ItSARXLp3RHm8KLtpECFBws+44Paaq8kOtUYKvWRhOY3j9g0i/tDgeyH32iFwb Swtf0sveMpN0/smRrO558SNVagg4qg0SCfclvmeNqBDv/ZTN0c84x4BYp1bVzzhbiJoq 6o9k7nfTYOj5lxRwNU/wbzwNrSCQ9M3uJVd6JaV9qHU3DcDeaaQoBZglqmBPue7p+E5Z BnytbYzBktZOl2j8ShBF9c/pV4NevgFvj3cxtmrQ6d5eh1+2Q779PDZVy3ef9nMa+8u1 eZu+ruld56hqzAlJC7G/vPvA3rWPHKjTVJYzLC99OH27JOcLcs0Mb0g8BnSYhT+rXHzX se3Q== 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; bh=QIfc4JulLMpRI8ZlPuSOcyyKpv9m8t9iZ59mu5JmetE=; b=Jri5Hy7H9L3yPGdhouu6g7aoXEjePCREwmc71SyOgW3P+VS4WfxpyiB3SWv2WU6toj qzWspzeyrlLv/0nEcHRDMZv9LkZhGJSYvXm7vv6Sh5WLoDXAAuF0136g8LcFfOXCenrt cr5O3Up54ROop9OmXtvykI7DKDEOuOyOmfSWaZ7gnpT4+1DIGea2t3czrJnmgO4PVtq7 xZr99Gs0a2dBmK0xCsBKNHgf5S2DSKZtPYn+C57J6lq/IgqslBTS4X+KvduO3SOGZDhi /NPUWbNZLbbca9mGFzZpFeSt35aSRUzkt0KAoKgUk0j+8O9zYbc4OnmtegKDc68ls+uD UCVg== X-Gm-Message-State: APjAAAUxlXYuMcA+HCkITdqSYacK8SSJZfQRX1q0Z76tXe61s00ZyYPj H66vhdGc85gbQCPUs4BroOL7GIroUVk= X-Received: by 2002:aa7:8a4c:: with SMTP id n12mr1701396pfa.127.1552620407711; Thu, 14 Mar 2019 20:26:47 -0700 (PDT) Received: from cloudburst.twiddle.net (97-113-188-82.tukw.qwest.net. [97.113.188.82]) by smtp.gmail.com with ESMTPSA id d26sm690816pfn.86.2019.03.14.20.26.46 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Thu, 14 Mar 2019 20:26:47 -0700 (PDT) From: Richard Henderson To: qemu-devel@nongnu.org Date: Thu, 14 Mar 2019 20:26:18 -0700 Message-Id: <20190315032629.21234-13-richard.henderson@linaro.org> X-Mailer: git-send-email 2.17.2 In-Reply-To: <20190315032629.21234-1-richard.henderson@linaro.org> References: <20190315032629.21234-1-richard.henderson@linaro.org> X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2607:f8b0:4864:20::535 Subject: [Qemu-devel] [PATCH v3 12/23] linux-user: Call qcrypto_init if not using -seed 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: Laurent Vivier Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: "Qemu-devel" Cc: Laurent Vivier Signed-off-by: Richard Henderson --- linux-user/main.c | 15 +++++++++++++-- 1 file changed, 13 insertions(+), 2 deletions(-) -- 2.17.2 Reviewed-by: Philippe Mathieu-Daudé diff --git a/linux-user/main.c b/linux-user/main.c index cf7095bdaf..8478306eef 100644 --- a/linux-user/main.c +++ b/linux-user/main.c @@ -38,6 +38,7 @@ #include "trace/control.h" #include "target_elf.h" #include "cpu_loop-common.h" +#include "crypto/init.h" char *exec_path; @@ -686,8 +687,18 @@ int main(int argc, char **argv, char **envp) if (seed_optarg == NULL) { seed_optarg = getenv("QEMU_RAND_SEED"); } - if (seed_optarg != NULL) { - qemu_guest_random_seed_main(seed_optarg, &error_fatal); + { + Error *err = NULL; + if (seed_optarg != NULL) { + qemu_guest_random_seed_main(seed_optarg, &err); + } else { + /* ??? Assumes qcrypto is only used by qemu_guest_getrandom. */ + qcrypto_init(&err); + } + if (err) { + error_reportf_err(err, "cannot initialize crypto: "); + exit(1); + } } target_environ = envlist_to_environ(envlist, NULL);