From nobody Wed Nov 12 07:03:43 2025 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zoho.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1568648718; cv=none; d=zoho.com; s=zohoarc; b=eKphIG712nF656KjzkYzcWJIcB22R/LRDUjGJW5d35XrRIkerYI25Row17htFxzC2pr4wUK2s8nmOthkO60SMf8lILun1xmLizMqFR6hqKcQTvBo58ctN8z2pHwhMDTaF27TgcZQCxLBg3KMZV+7tGu2wdKk3E3ip/dMuFZ2LSQ= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zoho.com; s=zohoarc; t=1568648718; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To:ARC-Authentication-Results; bh=N0oh/2xJJWk1j4doZ9EhbFAH+Bw5VBTm7B5dvFyJxMo=; b=aNRS/sDY66puBMWdIq9m93T6ZEaPchzFGjKiPIPPRoNBWexMB1eaXtx5m9+jz6sFaywqXiDa0d0qmE5LGH7Ko6CEtyyxehaFjxLQTfMR4V8weZtIZaQUBdR+mKIbKcq4ZzxbypyRHNypzIuP2mDZ7JwWO+u62SolTHMbs2aST54= ARC-Authentication-Results: i=1; mx.zoho.com; dkim=fail; spf=pass (zoho.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail header.from= (p=none dis=none) header.from= Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1568648718970505.52279164409856; Mon, 16 Sep 2019 08:45:18 -0700 (PDT) Received: from localhost ([::1]:36086 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1i9tBk-0003Hr-NJ for importer@patchew.org; Mon, 16 Sep 2019 11:45:16 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:53752) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1i9sD1-0006aI-Jf for qemu-devel@nongnu.org; Mon, 16 Sep 2019 10:42:32 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1i9sCz-0007Vh-Qr for qemu-devel@nongnu.org; Mon, 16 Sep 2019 10:42:31 -0400 Received: from mail-wr1-x42b.google.com ([2a00:1450:4864:20::42b]:34909) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1i9sCz-0007VP-Ec for qemu-devel@nongnu.org; Mon, 16 Sep 2019 10:42:29 -0400 Received: by mail-wr1-x42b.google.com with SMTP id v8so3820469wrt.2 for ; Mon, 16 Sep 2019 07:42:29 -0700 (PDT) Received: from 640k.lan ([93.56.166.5]) by smtp.gmail.com with ESMTPSA id i14sm17024298wra.78.2019.09.16.07.42.26 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 16 Sep 2019 07:42:26 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=N0oh/2xJJWk1j4doZ9EhbFAH+Bw5VBTm7B5dvFyJxMo=; b=u7NIO+XVj3ccpipmfYTQfbR+8BRbI7a/u5aUDIvMiF+EyKgi1A+IH7Afa6svOk4Amv uuGHgIiybSfV7sVVD8kPUSO/ZrZ+WFAnwIXITRi6PGl7DqlrY1TROq0trF5e/sHnf5Db wwaYRnorvn0OYDvtLMKuuwrRwMzV379t7b6lPHKC8uSbtKxBB2OzyM1xAZZRMuGWzrFT E4d+TX2Ye8J2Nxx2TwG1Mg6NZeKA4WmwsluIRY01yuMOro5gbbviPhOnHHSnk6eIsorP 6kjIQhqBsYzbXv0A/5RKDl8K8GdxR88ffN2+3DMhQ8Tmow5wHP1EUJpk5ivYevmZtglk XxUw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :in-reply-to:references:mime-version:content-transfer-encoding; bh=N0oh/2xJJWk1j4doZ9EhbFAH+Bw5VBTm7B5dvFyJxMo=; b=gcIMOYTzD4HJ0+RlWJu54jYT5YlY7ZGa+0zxoBYv1Wkvd6a6b9fRqhpHQQXTskrgFR XiIWmEDB3CPPUKnOgtDWyWUtUuEyHm7dIJ6IjO61vSfZOCjE3gKI94jfoN90p2x0JMgv iUKPt9PnDApd98PmenkHNZR1kuQJwpoP0yq4BNDtWUQUZoo568QxCSBZca7qi3TBuhtj WPXuR3CWuDlqoBZDRGld/miaRDbWFm/q0zX5HMg6xg97+kULcDpMgYEBKd3OhpPVarQw +kwdgvAfSfx8kbr6mFT54TKqzpU5W3E2Z1+WUDZ/R99iX5pCuT6Hpso5n+/ptFwnF/2w 6VKQ== X-Gm-Message-State: APjAAAW3F5+MpANyG3kWSWyHE3dCE+c5ignr3hLsJzARl1XAuM7m32MP qS4w53iXWL0gRx38/v7kKdRO08MZ X-Google-Smtp-Source: APXvYqxrb6gZxLpOdwr98FsFqFBV16qQXwNqVU1sOSTgsEk39cGHAQJ9xMHRmcgd/sa6cq9YZB+J4Q== X-Received: by 2002:adf:f112:: with SMTP id r18mr140843wro.88.1568644947938; Mon, 16 Sep 2019 07:42:27 -0700 (PDT) From: Paolo Bonzini To: qemu-devel@nongnu.org Date: Mon, 16 Sep 2019 16:41:55 +0200 Message-Id: <1568644929-9124-16-git-send-email-pbonzini@redhat.com> X-Mailer: git-send-email 1.8.3.1 In-Reply-To: <1568644929-9124-1-git-send-email-pbonzini@redhat.com> References: <1568644929-9124-1-git-send-email-pbonzini@redhat.com> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable 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 15/29] hw/i386/pc: Use e820_get_num_entries() to access e820_entries X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) From: Philippe Mathieu-Daud=C3=A9 To be able to extract the e820* code out of this file (in the next patch), access e820_entries with its correct helper. Reviewed-by: Li Qiang Signed-off-by: Philippe Mathieu-Daud=C3=A9 Message-Id: <20190818225414.22590-2-philmd@redhat.com> --- hw/i386/pc.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/hw/i386/pc.c b/hw/i386/pc.c index bad866f..31e9c1f 100644 --- a/hw/i386/pc.c +++ b/hw/i386/pc.c @@ -1029,7 +1029,7 @@ static FWCfgState *bochs_bios_init(AddressSpace *as, = PCMachineState *pcms) fw_cfg_add_bytes(fw_cfg, FW_CFG_E820_TABLE, &e820_reserve, sizeof(e820_reserve)); fw_cfg_add_file(fw_cfg, "etc/e820", e820_table, - sizeof(struct e820_entry) * e820_entries); + sizeof(struct e820_entry) * e820_get_num_entries()); =20 fw_cfg_add_bytes(fw_cfg, FW_CFG_HPET, &hpet_cfg, sizeof(hpet_cfg)); /* allocate memory for the NUMA channel: one (64bit) word for the numb= er --=20 1.8.3.1