From nobody Mon Feb 9 08:57:07 2026 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.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 (zohomail.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=1579781620; cv=none; d=zohomail.com; s=zohoarc; b=PAyzNCLrATJmN4/xwW2jBBp5putlCi/13ej5dErSzbpCmElgAqVeM3NxFZ9VnoN4yt3GdmPzlgy767IieFyszKSuNIgciO8uHF+6nVBMYn38DzZkhSlBIa2AMWj1Rz5tcumx8owIC7ZF4dsAIHCG2Q6LTAEXuwg1LAodx8Ht6+U= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1579781620; 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; bh=Sqb06/u7/HlnqEYSOPG3/kB15+4rTfSQK/g9vVWJvFg=; b=bz/H9duJpgF6O24BsOctR1Jluh3KIggWaB/vrUdhSvxgPdOgzeA9r5yM/rTXMfhm/sSDY+q2R0wR6olJcelVxiVeixyJli/DNH6rvidGxc40ByDRApG713LIhfcq10jqz3HbrySXtpjbuoZye8yo3G4slcRWD8ABq+aaHB5iKfI= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=fail; spf=pass (zohomail.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 157978162061811.456085603610745; Thu, 23 Jan 2020 04:13:40 -0800 (PST) Received: from localhost ([::1]:55978 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1iubMh-0002Tq-3U for importer@patchew.org; Thu, 23 Jan 2020 07:13:39 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:35677) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1iuasU-0006Ml-29 for qemu-devel@nongnu.org; Thu, 23 Jan 2020 06:42:27 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1iuasS-0004YP-JT for qemu-devel@nongnu.org; Thu, 23 Jan 2020 06:42:25 -0500 Received: from us-smtp-delivery-1.mimecast.com ([207.211.31.120]:41242 helo=us-smtp-1.mimecast.com) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1iuasS-0004YC-GZ for qemu-devel@nongnu.org; Thu, 23 Jan 2020 06:42:24 -0500 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-369-o1Y0_9OrOvunA69xyiDwng-1; Thu, 23 Jan 2020 06:42:20 -0500 Received: from smtp.corp.redhat.com (int-mx07.intmail.prod.int.phx2.redhat.com [10.5.11.22]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 611E71005516; Thu, 23 Jan 2020 11:42:19 +0000 (UTC) Received: from dell-r430-03.lab.eng.brq.redhat.com (dell-r430-03.lab.eng.brq.redhat.com [10.37.153.18]) by smtp.corp.redhat.com (Postfix) with ESMTP id 8616B1001B05; Thu, 23 Jan 2020 11:42:15 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1579779744; 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: in-reply-to:in-reply-to:references:references; bh=Sqb06/u7/HlnqEYSOPG3/kB15+4rTfSQK/g9vVWJvFg=; b=hbtp9I2mp87VdujD4ZRUA1zLDSQg3AcQEpjMGgUckTI3ei7Lw4QxtpfpfwnO3n+6W7FZxl jECGMnCqivsPxVjVk5KIscMvSKsW5uX16Ncb085RmxYBZpADFfnHXfj49TgvFoTUQ72yUl 0Ar001/iQYWJHK2AhdSK5yejvYeHgLs= From: Igor Mammedov To: qemu-devel@nongnu.org Subject: [PATCH REPOST v3 36/80] s390x/s390-virtio-ccw: use memdev for RAM Date: Thu, 23 Jan 2020 12:38:01 +0100 Message-Id: <1579779525-20065-37-git-send-email-imammedo@redhat.com> In-Reply-To: <1579779525-20065-1-git-send-email-imammedo@redhat.com> References: <1579779525-20065-1-git-send-email-imammedo@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.84 on 10.5.11.22 X-MC-Unique: o1Y0_9OrOvunA69xyiDwng-1 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: quoted-printable X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 207.211.31.120 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: david@redhat.com, cohuck@redhat.com, pasic@linux.ibm.com, borntraeger@de.ibm.com, qemu-s390x@nongnu.org, rth@twiddle.net Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) Content-Type: text/plain; charset="utf-8" memory_region_allocate_system_memory() API is going away, so replace it with memdev allocated MemoryRegion. The later is initialized by generic code, so board only needs to opt in to memdev scheme by providing MachineClass::default_ram_id and using MachineState::ram instead of manually initializing RAM memory region. Signed-off-by: Igor Mammedov Reviewed-by: Philippe Mathieu-Daud=C3=A9 Reviewed-by: David Hildenbrand Acked-by: Cornelia Huck --- CC: rth@twiddle.net CC: david@redhat.com CC: cohuck@redhat.com CC: pasic@linux.ibm.com CC: borntraeger@de.ibm.com CC: qemu-s390x@nongnu.org --- hw/s390x/s390-virtio-ccw.c | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/hw/s390x/s390-virtio-ccw.c b/hw/s390x/s390-virtio-ccw.c index e0e2813..cbdd4ba 100644 --- a/hw/s390x/s390-virtio-ccw.c +++ b/hw/s390x/s390-virtio-ccw.c @@ -154,14 +154,12 @@ static void virtio_ccw_register_hcalls(void) virtio_ccw_hcall_early_printk); } =20 -static void s390_memory_init(ram_addr_t mem_size) +static void s390_memory_init(MemoryRegion *ram) { MemoryRegion *sysmem =3D get_system_memory(); - MemoryRegion *ram =3D g_new(MemoryRegion, 1); Error *local_err =3D NULL; =20 /* allocate RAM for core */ - memory_region_allocate_system_memory(ram, NULL, "s390.ram", mem_size); memory_region_add_subregion(sysmem, 0, ram); =20 /* @@ -245,7 +243,7 @@ static void ccw_init(MachineState *machine) =20 s390_sclp_init(); /* init memory + setup max page size. Required for the CPU model */ - s390_memory_init(machine->ram_size); + s390_memory_init(machine->ram); =20 /* init CPUs (incl. CPU model) early so s390_has_feature() works */ s390_init_cpus(machine); @@ -471,6 +469,7 @@ static void ccw_machine_class_init(ObjectClass *oc, voi= d *data) hc->plug =3D s390_machine_device_plug; hc->unplug_request =3D s390_machine_device_unplug_request; nc->nmi_monitor_handler =3D s390_nmi; + mc->default_ram_id =3D "s390.ram"; } =20 static inline bool machine_get_aes_key_wrap(Object *obj, Error **errp) --=20 2.7.4