From patchwork Fri Dec 14 14:42:01 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Peter Maydell X-Patchwork-Id: 153870 Delivered-To: patch@linaro.org Received: by 2002:a2e:299d:0:0:0:0:0 with SMTP id p29-v6csp2164109ljp; Fri, 14 Dec 2018 06:54:37 -0800 (PST) X-Google-Smtp-Source: AFSGD/X4HXrWeNgzzYYzH6EGMudVSrRqVz/3X61dF2VsPnL5PufvysiueQfHJkMGPMa4D5U8vhRJ X-Received: by 2002:aed:20ca:: with SMTP id 68mr3113876qtb.296.1544799277104; Fri, 14 Dec 2018 06:54:37 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1544799277; cv=none; d=google.com; s=arc-20160816; b=BbeHi+QH5kU5uEF3wgqBnhmoduxIRGPIQjPqcfcXNrvZFc3F7uiTUi8KgvEpkneXAj Fs3VyZ74RaxTBuZQgBSUvpEQz8xlChATD3B6U9pkQCPr2sfu40DHxkheYHDQEQto/8py QYd9ZNQG4/7R1fs1Qipo27tPvWtesbRFms2I+2VyXi6qZTA6FIy6vthzgfSGT5DEsU4D V1giljVVkX4wKn/NDVy1W7NEZCNznOUKv1F+KrJgJ+Y5p4Y3QHYzZUcrrqcjmgtgJ5/F 189myiHTnARO2gJSUiZCd+TkuJn63CM3aSDTtMjbWdcTjuuqTJzU9t1gg8lmuaZKWDc1 6Zbw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to: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=MMtssPte+19TRFL5+NKOA3qaOUB4Kxoeb5HKsFBULaU=; b=eoDxeLx1UXdK7BYbUsI7j1V97RoBsDjf4xZzRZ+pL+g9guL9593/ErKaIchkQdRIua Bs+MgRTSKn8ZKzy2uwbCaVUl56AzMrvSoLuuRmcS8gh2X/opNN1xTzXP4/QLaDN2sJuY hhs55Yeauc6pOwN06h86kCkYUs6iow6AEsOKBK8uCtDAUnFJVVUijg/I7af/IrBQV26I FvpJDwNEDzzVMG0kLaoFQfE0MinnlpUr2u1sKYMgG9OREWo7IP6/ErE0uIdjp5kr4SmI BG2N3ohneiYYI8XNFuiWhrdp5K+dbe2KReyieipqQn9NsXCoGRjiFQ5RSCh1qhVx2tSZ gtdg== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=jrJ1LHzs; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 2001:4830:134:3::11 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. [2001:4830:134:3::11]) by mx.google.com with ESMTPS id e2si199082qto.135.2018.12.14.06.54.36 for (version=TLS1 cipher=AES128-SHA bits=128/128); Fri, 14 Dec 2018 06:54:37 -0800 (PST) Received-SPF: pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 2001:4830:134:3::11 as permitted sender) client-ip=2001:4830:134:3::11; Authentication-Results: mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=jrJ1LHzs; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 2001:4830:134:3::11 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 ([::1]:33930 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gXorM-0001wN-Ia for patch@linaro.org; Fri, 14 Dec 2018 09:54:36 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:38327) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gXofe-0008S0-8n for qemu-devel@nongnu.org; Fri, 14 Dec 2018 09:42:31 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1gXofc-0004Lk-UC for qemu-devel@nongnu.org; Fri, 14 Dec 2018 09:42:30 -0500 Received: from mail-wr1-x42b.google.com ([2a00:1450:4864:20::42b]:42656) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1gXofc-0004LS-Ns for qemu-devel@nongnu.org; Fri, 14 Dec 2018 09:42:28 -0500 Received: by mail-wr1-x42b.google.com with SMTP id q18so5665379wrx.9 for ; Fri, 14 Dec 2018 06:42:28 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:subject:date:message-id:in-reply-to:references:mime-version :content-transfer-encoding; bh=MMtssPte+19TRFL5+NKOA3qaOUB4Kxoeb5HKsFBULaU=; b=jrJ1LHzs78Y3QEFioDUlf2Mn/gn3ad8igjtxrUFRy379+NmJnNtocI38T/+b5iFIBQ JEN4KFjg6S7EEbk8djukwm/uOLAd11PTOFKEeWdoPZB6XKOPt9U5D+fhMDjwZIt91Sui 3rXod/DjmNF7GXfU7qMxwPGT+PX3fAU7mRjUg= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=MMtssPte+19TRFL5+NKOA3qaOUB4Kxoeb5HKsFBULaU=; b=LJkqZjGIauH3xm50aOtewmyQPxCL++gX+oJbeX7mbnsKH/PVOljuCBRs8R6NEofNOZ vWllpA410UVfgaA5eMyFk4x37Y3oggJKAm14P7jOVQup44ymaIvqWwCsk5cV/24OJHVQ i9BxqQOlI9nr+4590E7ZQ/Hfo99tmM6VpQ2cmeiwvV5bp+MJouv0pjCu0qu68aCxQ46S 0XaejRd3OvfnIJGrueRSIhJGABEPt/6MdmZ4oT8uRKDjf+VTmtNrNNXnjCzdDQWNXLKr mIdmD9E5GxhspOc8JtDvWT1Hs6mv03/gtTs1/OrfdC509UgogG7BleKPqUlPJSn0ZPwF aGQw== X-Gm-Message-State: AA+aEWaOWkFoUs9E8e23nU9ilAhsWG10CFw+C7imYw/dy5PQ7trktFcW t1Ddk2nRuWltyC3mKXhfGk+Z4kYlk6k= X-Received: by 2002:adf:9d85:: with SMTP id p5mr2725403wre.41.1544798547366; Fri, 14 Dec 2018 06:42:27 -0800 (PST) Received: from orth.archaic.org.uk (orth.archaic.org.uk. [81.2.115.148]) by smtp.gmail.com with ESMTPSA id m6sm3263204wrv.24.2018.12.14.06.42.26 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Fri, 14 Dec 2018 06:42:26 -0800 (PST) From: Peter Maydell To: qemu-devel@nongnu.org Date: Fri, 14 Dec 2018 14:42:01 +0000 Message-Id: <20181214144214.1260-10-peter.maydell@linaro.org> X-Mailer: git-send-email 2.19.2 In-Reply-To: <20181214144214.1260-1-peter.maydell@linaro.org> References: <20181214144214.1260-1-peter.maydell@linaro.org> MIME-Version: 1.0 X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2a00:1450:4864:20::42b Subject: [Qemu-devel] [PULL 09/22] hw/smbios/smbios.c: Don't use load_image() 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: , Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: "Qemu-devel" The load_image() function is deprecated, as it does not let the caller specify how large the buffer to read the file into is. Instead use load_image_size(). Signed-off-by: Peter Maydell Reviewed-by: Richard Henderson Reviewed-by: Stefan Hajnoczi Reviewed-by: Michael S. Tsirkin Reviewed-by: Eric Blake Message-id: 20181130151712.2312-4-peter.maydell@linaro.org --- hw/smbios/smbios.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -- 2.19.2 diff --git a/hw/smbios/smbios.c b/hw/smbios/smbios.c index 920939454e7..04811279a08 100644 --- a/hw/smbios/smbios.c +++ b/hw/smbios/smbios.c @@ -982,7 +982,7 @@ void smbios_entry_add(QemuOpts *opts, Error **errp) header = (struct smbios_structure_header *)(smbios_tables + smbios_tables_len); - if (load_image(val, (uint8_t *)header) != size) { + if (load_image_size(val, (uint8_t *)header, size) != size) { error_setg(errp, "Failed to load SMBIOS file %s", val); return; }