From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-6.5 required=3.0 tests=DKIM_INVALID,DKIM_SIGNED, HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY, SPF_HELO_NONE,SPF_PASS autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 87ECAC282DD for ; Wed, 8 Jan 2020 23:32:52 +0000 (UTC) Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 5198E2051A for ; Wed, 8 Jan 2020 23:32:52 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=fail reason="signature verification failed" (1024-bit key) header.d=redhat.com header.i=@redhat.com header.b="PGLa9x9V" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 5198E2051A Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=redhat.com Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Received: from localhost ([::1]:50472 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1ipKol-0006cX-BD for qemu-devel@archiver.kernel.org; Wed, 08 Jan 2020 18:32:51 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:44373) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1ipKns-00061m-Iv for qemu-devel@nongnu.org; Wed, 08 Jan 2020 18:31:57 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1ipKnq-0006Ej-5n for qemu-devel@nongnu.org; Wed, 08 Jan 2020 18:31:55 -0500 Received: from us-smtp-1.mimecast.com ([205.139.110.61]:49991 helo=us-smtp-delivery-1.mimecast.com) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1ipKnp-0006Bq-Ms for qemu-devel@nongnu.org; Wed, 08 Jan 2020 18:31:54 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1578526312; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=4TLV+2FjLc1eKhAICJTQWDBMbNh+X5s6qOSjOf6svOs=; b=PGLa9x9VNbb6gPAWjSoRKX7oN7d4KS9WcqIAKaamWj+7OQCmPTpu/IqM/R9WZBMg3dCHmi +YhqY6w+xColKHmoEgynQ/XG8wQgEQy1Yh4IjPXLb9dKqpFQIwF4MG9iI7Y/pZyOBnE9hD AHH3jT/8qvzyyImVkl2bUKQtR+U0SB0= Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-398-mdfTKEaYPp6A0R_eozedVw-1; Wed, 08 Jan 2020 18:31:49 -0500 Received: from smtp.corp.redhat.com (int-mx03.intmail.prod.int.phx2.redhat.com [10.5.11.13]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 5F49F1800D4E for ; Wed, 8 Jan 2020 23:31:48 +0000 (UTC) Received: from x1w.redhat.com (ovpn-204-35.brq.redhat.com [10.40.204.35]) by smtp.corp.redhat.com (Postfix) with ESMTPS id B53C37C82C; Wed, 8 Jan 2020 23:31:41 +0000 (UTC) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Subject: [PATCH] hw/smbios/smbios: Use MachineState::ram_size instead of global one Date: Thu, 9 Jan 2020 00:31:38 +0100 Message-Id: <20200108233138.20434-1-philmd@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.13 X-MC-Unique: mdfTKEaYPp6A0R_eozedVw-1 X-Mimecast-Spam-Score: 0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: quoted-printable X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] [fuzzy] X-Received-From: 205.139.110.61 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: Igor Mammedov , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , "Michael S. Tsirkin" Errors-To: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Sender: "Qemu-devel" The smbios_get_tables() function has access the a machine state. Use the field instead of accessing the global ram_size variable. Signed-off-by: Philippe Mathieu-Daud=C3=A9 --- hw/smbios/smbios.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/hw/smbios/smbios.c b/hw/smbios/smbios.c index 11d476c4a2..ded5f1f4e2 100644 --- a/hw/smbios/smbios.c +++ b/hw/smbios/smbios.c @@ -630,7 +630,7 @@ static void smbios_build_type_11_table(void) =20 #define MAX_T16_STD_SZ 0x80000000 /* 2T in Kilobytes */ =20 -static void smbios_build_type_16_table(unsigned dimm_cnt) +static void smbios_build_type_16_table(ram_addr_t ram_size, unsigned dimm_= cnt) { uint64_t size_kb; =20 @@ -847,6 +847,7 @@ void smbios_get_tables(MachineState *ms, uint8_t **anchor, size_t *anchor_len) { unsigned i, dimm_cnt; + ram_addr_t ram_size =3D ms->ram_size; =20 if (smbios_legacy) { *tables =3D *anchor =3D NULL; @@ -876,7 +877,7 @@ void smbios_get_tables(MachineState *ms, =20 dimm_cnt =3D QEMU_ALIGN_UP(ram_size, MAX_DIMM_SZ) / MAX_DIMM_SZ; =20 - smbios_build_type_16_table(dimm_cnt); + smbios_build_type_16_table(ram_size, dimm_cnt); =20 for (i =3D 0; i < dimm_cnt; i++) { smbios_build_type_17_table(i, GET_DIMM_SZ); --=20 2.21.1