From nobody Wed Apr 24 23:18:16 2024 Delivered-To: importer@patchew.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=amsat.org ARC-Seal: i=1; a=rsa-sha256; t=1593504980; cv=none; d=zohomail.com; s=zohoarc; b=gfAt+p49hIRjfNIb5I1u7YBX3QB6Vm4ZG4mopcV3ad31mYZhCL69eo2Fun0NuGRpYr/Amrk0s01WZ+GrqDIhyCGVjOxOkERkk/SxjQNc+IFSWM/u7y7+VanSSnymNv4UI4xbXUAglY7hWoDgwrQnfQVKtNqaQkbbB1JepRGFZr8= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1593504980; 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=U3siTkfLjVJQEaCMkrInYfzFvhXImBmDXKhPhC0qsnI=; b=csPZtynrjB3TAspfFERWn1dXSsSDpKhrWyxUmYJj9kwcB07pj456L18CD38xa1AWE/sVhzUM5bxwww3MNjyVOGtUshnKexnm1aEhF/kS3Q34movhpGVmpc2ckeMQCBzKdPGjhV6VLlCPPZa8Tam84d6SMaLbvf34lpzkFef5i0Y= 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 1593504980791148.1482253021229; Tue, 30 Jun 2020 01:16:20 -0700 (PDT) Received: from localhost ([::1]:60236 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jqBRD-0005Il-Iu for importer@patchew.org; Tue, 30 Jun 2020 04:16:19 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:55730) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1jqBOW-0001NG-65; Tue, 30 Jun 2020 04:13:32 -0400 Received: from mail-ed1-x544.google.com ([2a00:1450:4864:20::544]:38310) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1jqBOU-0003BF-Py; Tue, 30 Jun 2020 04:13:31 -0400 Received: by mail-ed1-x544.google.com with SMTP id n2so6285008edr.5; Tue, 30 Jun 2020 01:13:27 -0700 (PDT) Received: from x1w.redhat.com (1.red-83-51-162.dynamicip.rima-tde.net. [83.51.162.1]) by smtp.gmail.com with ESMTPSA id z1sm1425948ejb.41.2020.06.30.01.13.24 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 30 Jun 2020 01:13:25 -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=U3siTkfLjVJQEaCMkrInYfzFvhXImBmDXKhPhC0qsnI=; b=m+1MJilz9DbWkTO/wHwclBjONPINORK+EgrYzLtZnj52Vd1sh1DptDFYfx8UsvacMV +s6mtDL833+mfqWno+VnZJksQZnxUsNrde+u2mEbxLkSwjK6bVqWp1CsbSsF+AcBvDKu 6NYoBie51jZW8cXfLUpBXCWGYEdqnlJTa2GE4DWqocSUBjtlWRN5sYhDRF/R/4FuFZdj nkijdZ/DIZUouw6NdylKy4nvevJ93Ocndz8aUrGCJq1VLcXE6IpVbTNxpB7g6yoNdCCH 67R/YlQ+tPV6iV+5IbLRc48htnGYF2hkMl/MEy6KknQdoNeQGLP5FKpvJEZCQyhp6Jcz 5iEw== 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=U3siTkfLjVJQEaCMkrInYfzFvhXImBmDXKhPhC0qsnI=; b=NXt7qnd5sj1SVUqp+rfe0WHotrFlDxuBgxmgp3QGk0DwfzzfuQ8e0Q6w9G1x7MA2Yq OzsiqgRi5LiR90ttgXYcakKR2Twn71RnmFhqBrsHZfqwbyZ0b6dloDSvVE99AvDH4seF L+6zVZ4XS4NxX3d8RYdBEl3G9gjJ2u4IgE8N6UxEuXriFoyl4qQC9pG2sT7KVxxRex5w CyDgyyvxkP2Q18IXDbImSjjRNMsmHF/3drWCx7TPuyOaiWSd9xmIEN9s8KDU22VxTvey ne8Ns/Tv2vEBN5fB+PjIVrngNuAhrJaMLHIKLUlEPdZHeeR9WcXC4vFZaKdvR118j+MM oifg== X-Gm-Message-State: AOAM533Yr1SfpkiYokJFmCdtzX7kXJmWCEo3hQWI+RcOUqr+FITIyEVm Fg80ynuw+AZL0hBxA9uA1xI= X-Google-Smtp-Source: ABdhPJzM7ppcEeKlZ9RjMLKultQPdB56lqYgjj0W+MxQwF8TV9IcEx/0Aen4hemdvQL/YCM4KD29Nw== X-Received: by 2002:a50:d753:: with SMTP id i19mr22507794edj.9.1593504805954; Tue, 30 Jun 2020 01:13:25 -0700 (PDT) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: Yunqiang Su , Aurelien Jarno , qemu-devel@nongnu.org Subject: [PATCH 1/7] hw/mips/malta: Trivial code movement Date: Tue, 30 Jun 2020 10:13:16 +0200 Message-Id: <20200630081322.19146-2-f4bug@amsat.org> X-Mailer: git-send-email 2.21.3 In-Reply-To: <20200630081322.19146-1-f4bug@amsat.org> References: <20200630081322.19146-1-f4bug@amsat.org> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable 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; Received-SPF: pass client-ip=2a00:1450:4864:20::544; envelope-from=philippe.mathieu.daude@gmail.com; helo=mail-ed1-x544.google.com X-detected-operating-system: by eggs.gnu.org: No matching host in p0f cache. That's all we know. X-Spam_score_int: 0 X-Spam_score: 0.0 X-Spam_bar: / X-Spam_report: (0.0 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_EF=-0.1, FREEMAIL_FORGED_FROMDOMAIN=1, FREEMAIL_FROM=0.001, HEADER_FROM_DIFFERENT_DOMAINS=1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=_AUTOLEARN X-Spam_action: no action 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: Aleksandar Rikalo , "open list:Trivial patches" , Michael Tokarev , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Jiaxun Yang , Laurent Vivier , Aleksandar Markovic , Igor Mammedov , =?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) Trivial code movement to make the next patch easier to review. Signed-off-by: Philippe Mathieu-Daud=C3=A9 --- hw/mips/malta.c | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/hw/mips/malta.c b/hw/mips/malta.c index d95926a89c..5b371c1e34 100644 --- a/hw/mips/malta.c +++ b/hw/mips/malta.c @@ -1426,6 +1426,13 @@ static const TypeInfo mips_malta_device =3D { .instance_size =3D sizeof(MaltaState), }; =20 +static void mips_malta_register_types(void) +{ + type_register_static(&mips_malta_device); +} + +type_init(mips_malta_register_types) + static void mips_malta_machine_init(MachineClass *mc) { mc->desc =3D "MIPS Malta Core LV"; @@ -1442,10 +1449,3 @@ static void mips_malta_machine_init(MachineClass *mc) } =20 DEFINE_MACHINE("malta", mips_malta_machine_init) - -static void mips_malta_register_types(void) -{ - type_register_static(&mips_malta_device); -} - -type_init(mips_malta_register_types) --=20 2.21.3 From nobody Wed Apr 24 23:18:16 2024 Delivered-To: importer@patchew.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 ARC-Seal: i=1; a=rsa-sha256; t=1593504876; cv=none; d=zohomail.com; s=zohoarc; b=UhOjvqgUf1641zpahTWW9L4zAbFHCcrqy2TXueb0aoL0YO50l30EQFgE13qoUZbfpjI9TNCfHkuLgfNEXeiEAXYJU7ElF2Gh0i2Vmnf7ieOCPthFwRnn64GisinG4VLZScLXeZUH9qaqGdazAyaAjJOQY5kKytLiTCuTICppmLE= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1593504876; 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=6TGC6x4rGeJCZbg2l3usQflOGN4Jj1erw/qpqdPPGOc=; b=nsdlM7KCZ7OHIaSRnLH5b8Hkrx5aCfrekQWOjHgWQiQiafmy4hHWAf1E2iDK5pbBT+kkegHjNKc0dPqyuSB5LYit/Lc5FfYRd6JhTfrtn5UCu/F7yBEuEuE9rfgE0ApZhw2bn9isspDlTjzf/aWDw06VsrQTss68gvc/r93MrZw= 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 Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1593504876736597.6571939760789; Tue, 30 Jun 2020 01:14:36 -0700 (PDT) Received: from localhost ([::1]:53924 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jqBPX-0002gD-GL for importer@patchew.org; Tue, 30 Jun 2020 04:14:35 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:55726) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1jqBOW-0001NA-4i for qemu-devel@nongnu.org; Tue, 30 Jun 2020 04:13:32 -0400 Received: from mail-ed1-x542.google.com ([2a00:1450:4864:20::542]:46229) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1jqBOU-0003BK-FH for qemu-devel@nongnu.org; Tue, 30 Jun 2020 04:13:31 -0400 Received: by mail-ed1-x542.google.com with SMTP id dm19so9048795edb.13 for ; Tue, 30 Jun 2020 01:13:28 -0700 (PDT) Received: from x1w.redhat.com (1.red-83-51-162.dynamicip.rima-tde.net. [83.51.162.1]) by smtp.gmail.com with ESMTPSA id z1sm1425948ejb.41.2020.06.30.01.13.26 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 30 Jun 2020 01:13: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=6TGC6x4rGeJCZbg2l3usQflOGN4Jj1erw/qpqdPPGOc=; b=Z7G0VGd3WnR82DHhhlog7nMomil0uuLUJ0hhT50uIi0JEtxliW/E3WW0VdXHc3uJRv qSCbVxtljkNnuk4bUUmCPd7hDxqiwxLok1L9U/YHGzAteUwoS9MfKeVEpzb9zsDxjS8F YIrS/X0B5RRwmNez5hxcR05BziuYTBhkIez+Yq1TQrEC8V9rDFiq1YSoZFOe+EdHNkG1 eHSv4426Q0UUJSOWLbL+e1ry2+RRMg2OH5w7RBgk6i8V202DH/575I4RqkcPIFQw/MQA wYVNfbR2H+V1iaEge5PAXvmIW9IQGWQSaihaSGXGupqphUGH8nqvBRZ8rT05g6xyvpAP fy7w== 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=6TGC6x4rGeJCZbg2l3usQflOGN4Jj1erw/qpqdPPGOc=; b=ZOxcNCISr8Z5RsO8c6lXElXn6MYMhYuU3sPs436OGuZafgSR9J/pS9Esarl5sJti1Y JdOB/qvpdD267jTEUMhddFPkZdhXfPSN5Z2F+tclQfoYkTpvXEqxpGvqMZAtlXTXDW+I wqQQIY6TrzK6PwNfjqO0/uGCyFXRsVXQEn5ECeTXstnZ+nvjav73FXXiQf2ZsKL3E/LM xzpcgHP/YncLcFEMI2kZWo9jL8qmsMFLIoIt+cSpx3QucNmRILY4vxoG+GH4fxpak7Jl y7nyDFXy7lWBQScZ2UgS36fsVJ2NTXKxuLxhg64Ob6PP2BO8AzcNgDUUGSLP1IWfL5SX F6yQ== X-Gm-Message-State: AOAM530lFnjNMF8ihHF9HoDFvDmHvuJa0UNpWupMqNsxrGTZnW2xzh+b kz30aM4hVKxYMYFIGCoS//U= X-Google-Smtp-Source: ABdhPJxomnc8SlCtZ0f6r73FRm9rLMimM7GAXPhKNn8F4nYBeQOZ/GmSUjseLMek251lXgjwTmd/Fg== X-Received: by 2002:a05:6402:228d:: with SMTP id cw13mr21949025edb.343.1593504807146; Tue, 30 Jun 2020 01:13:27 -0700 (PDT) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: Yunqiang Su , Aurelien Jarno , qemu-devel@nongnu.org Subject: [PATCH 2/7] hw/mips/malta: Register the machine as a TypeInfo Date: Tue, 30 Jun 2020 10:13:17 +0200 Message-Id: <20200630081322.19146-3-f4bug@amsat.org> X-Mailer: git-send-email 2.21.3 In-Reply-To: <20200630081322.19146-1-f4bug@amsat.org> References: <20200630081322.19146-1-f4bug@amsat.org> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable 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; Received-SPF: pass client-ip=2a00:1450:4864:20::542; envelope-from=philippe.mathieu.daude@gmail.com; helo=mail-ed1-x542.google.com X-detected-operating-system: by eggs.gnu.org: No matching host in p0f cache. That's all we know. X-Spam_score_int: 0 X-Spam_score: 0.0 X-Spam_bar: / X-Spam_report: (0.0 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_EF=-0.1, FREEMAIL_FORGED_FROMDOMAIN=1, FREEMAIL_FROM=0.001, HEADER_FROM_DIFFERENT_DOMAINS=1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=_AUTOLEARN X-Spam_action: no action 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: Aleksandar Rikalo , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Jiaxun Yang , Aleksandar Markovic , Igor Mammedov , =?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) We want to add more machines. First convert from the old DEFINE_MACHINE() API to the more recent DEFINE_TYPES(TypeInfo[]) one. Signed-off-by: Philippe Mathieu-Daud=C3=A9 --- hw/mips/malta.c | 20 ++++++++++++++++++-- 1 file changed, 18 insertions(+), 2 deletions(-) diff --git a/hw/mips/malta.c b/hw/mips/malta.c index 5b371c1e34..66172f0c82 100644 --- a/hw/mips/malta.c +++ b/hw/mips/malta.c @@ -70,6 +70,8 @@ =20 #define MAX_IDE_BUS 2 =20 +#define TYPE_MALTA_MACHINE MACHINE_TYPE_NAME("malta") + typedef struct { MemoryRegion iomem; MemoryRegion iomem_lo; /* 0 - 0x900 */ @@ -1433,8 +1435,10 @@ static void mips_malta_register_types(void) =20 type_init(mips_malta_register_types) =20 -static void mips_malta_machine_init(MachineClass *mc) +static void malta_machine_class_init(ObjectClass *oc, void *data) { + MachineClass *mc =3D MACHINE_CLASS(oc); + mc->desc =3D "MIPS Malta Core LV"; mc->init =3D mips_malta_init; mc->block_default_type =3D IF_IDE; @@ -1448,4 +1452,16 @@ static void mips_malta_machine_init(MachineClass *mc) mc->default_ram_id =3D "mips_malta.ram"; } =20 -DEFINE_MACHINE("malta", mips_malta_machine_init) +static const TypeInfo malta_machine_types[] =3D { + { + .name =3D MACHINE_TYPE_NAME("malta"), + .parent =3D TYPE_MALTA_MACHINE, + }, { + .name =3D TYPE_MALTA_MACHINE, + .parent =3D TYPE_MACHINE, + .class_init =3D malta_machine_class_init, + .abstract =3D true, + } +}; + +DEFINE_TYPES(malta_machine_types) --=20 2.21.3 From nobody Wed Apr 24 23:18:16 2024 Delivered-To: importer@patchew.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=amsat.org ARC-Seal: i=1; a=rsa-sha256; t=1593504960; cv=none; d=zohomail.com; s=zohoarc; b=ewAmD2ib/EEFWxREo52i4vYOeWXvTJ4tDkOMbl9hjBqX7RFsRIHmxmkZQp8AHmQmejEDfCiEwJXMumFeFLPHqt7Y6AymZHQb38gU7UOropFEJu+1Lm53UkdHvW6lb111SX/yBbMxreabEZWEp0UNRNSiEbpHxYyERYXcfuId66g= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1593504960; 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=OSSf9Gph0a3stYSRY1wq7h1jREXKNcDTLzkc58dT+HY=; b=S6oxVB1uxhJnSTJgBASTL4dbCTZjcFyvnw7ASbSWNjIbx4r5oTlESqj/uTCVgNpFu5egyAfoiRvdI1OT6d13VYhxvsfFOP4XsDAGMnlhv9lJPO0SmZbFQRpv+QvQJG10WOinu4CzFXiU+jO+6aNcPqyW2kaOwCLeef8LvN43I+I= 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 1593504960168130.99046715291945; Tue, 30 Jun 2020 01:16:00 -0700 (PDT) Received: from localhost ([::1]:59312 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jqBQs-0004tc-Qi for importer@patchew.org; Tue, 30 Jun 2020 04:15:58 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:55724) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1jqBOW-0001N8-2y for qemu-devel@nongnu.org; Tue, 30 Jun 2020 04:13:32 -0400 Received: from mail-ed1-x544.google.com ([2a00:1450:4864:20::544]:40992) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1jqBOU-0003BR-ET for qemu-devel@nongnu.org; Tue, 30 Jun 2020 04:13:31 -0400 Received: by mail-ed1-x544.google.com with SMTP id e22so15293430edq.8 for ; Tue, 30 Jun 2020 01:13:29 -0700 (PDT) Received: from x1w.redhat.com (1.red-83-51-162.dynamicip.rima-tde.net. [83.51.162.1]) by smtp.gmail.com with ESMTPSA id z1sm1425948ejb.41.2020.06.30.01.13.27 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 30 Jun 2020 01:13:27 -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=OSSf9Gph0a3stYSRY1wq7h1jREXKNcDTLzkc58dT+HY=; b=IWTNvzaeyoV6j/pIaU0mv+Bl2VjjDxQpM6ICioJ3/uMWAKNFTBi82Ykn6nWbmOB6eo wWydP3GhoTtTSWv92frGuWg9HdP+bgCjjY+YFmOngANqzmr9JEVgtD4IRaaq83TOsRKV Z6BRZppbOXlys7sM7jax1eCvRUbdcYiywu/JuWXCcUnia4SxKNQ6X9D+ICNIkmjJUBeq EzuUUF81JaBWCTmEjluLMyO4RrWR2w4A/p0yUCAHmbvC0jakzrssqd9sxMEVqjS7cx1F GfJ6ao8RxF4ISQ4QJVIuqfO8vjDZ6XUn4guu+x0LBawhwuQFx+qMbiKtr1/tDyzy0hBt YDIg== 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=OSSf9Gph0a3stYSRY1wq7h1jREXKNcDTLzkc58dT+HY=; b=ADxkh8yK3qbkPeF5cXJFsP4b3LoK+O/eqmfXZg8GI3QVleNwKhOpnhWbL2ieBWUZe7 07CxIF8H6CaatYulH4e8k4uHQYbTp1IBC6q7Rj3KWfthM6l5omhW3h7hIQ7gWKJqqRFL rjtBNpcATmhyaBBTu96NSJeHlxzrgHZsHXCFiXNSeEzt2xaS2MZQ1RsmHjNa+gBLzG1I u1Nnm4JQjVgUtYPBJXM5KmSZx7+149xk8pkg71qsH+go4X09qm5zOkj0Q9UE/UsL8TtO 5Nd7dVx7HRkTWGYoWprssu4Misl9IMZ9rNBZNdqE2eYS6Y5bnUTKeJjWC+ZMTk1XdLAf bBrQ== X-Gm-Message-State: AOAM5302BJLLTnc8FUqHeb6i/OyjVZTSsLdT5BSUAHtQ39M1qPF1xFMm vm6XTxrqHftH8VqJ1pcMWeE= X-Google-Smtp-Source: ABdhPJw7LsmEKggCoZZx9Chvkg6R1A46LnxwDTlsUlHFIAD7RV+WMm+mcziJqlLMFlTEJ1qp/yPxrA== X-Received: by 2002:a50:9e2e:: with SMTP id z43mr22171996ede.385.1593504808362; Tue, 30 Jun 2020 01:13:28 -0700 (PDT) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: Yunqiang Su , Aurelien Jarno , qemu-devel@nongnu.org Subject: [PATCH 3/7] hw/mips/malta: Rename 'malta' machine as 'malta-virt' Date: Tue, 30 Jun 2020 10:13:18 +0200 Message-Id: <20200630081322.19146-4-f4bug@amsat.org> X-Mailer: git-send-email 2.21.3 In-Reply-To: <20200630081322.19146-1-f4bug@amsat.org> References: <20200630081322.19146-1-f4bug@amsat.org> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable 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; Received-SPF: pass client-ip=2a00:1450:4864:20::544; envelope-from=philippe.mathieu.daude@gmail.com; helo=mail-ed1-x544.google.com X-detected-operating-system: by eggs.gnu.org: No matching host in p0f cache. That's all we know. X-Spam_score_int: 0 X-Spam_score: 0.0 X-Spam_bar: / X-Spam_report: (0.0 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_EF=-0.1, FREEMAIL_FORGED_FROMDOMAIN=1, FREEMAIL_FROM=0.001, HEADER_FROM_DIFFERENT_DOMAINS=1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=_AUTOLEARN X-Spam_action: no action 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: Aleksandar Rikalo , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Jiaxun Yang , Aleksandar Markovic , Igor Mammedov , =?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) We want to model the real physical Malta board. The current model does not have the physical restrictions real hardware have. Rename the current machine as 'malta-virt'. To not disrupt command line users, keep the 'malta' machine name as an alias. Signed-off-by: Philippe Mathieu-Daud=C3=A9 --- hw/mips/malta.c | 14 +++++++++++--- 1 file changed, 11 insertions(+), 3 deletions(-) diff --git a/hw/mips/malta.c b/hw/mips/malta.c index 66172f0c82..f8fc567532 100644 --- a/hw/mips/malta.c +++ b/hw/mips/malta.c @@ -1439,8 +1439,16 @@ static void malta_machine_class_init(ObjectClass *oc= , void *data) { MachineClass *mc =3D MACHINE_CLASS(oc); =20 - mc->desc =3D "MIPS Malta Core LV"; mc->init =3D mips_malta_init; + mc->default_ram_id =3D "mips_malta.ram"; +} + +static void malta_machine_virt_class_init(ObjectClass *oc, void *data) +{ + MachineClass *mc =3D MACHINE_CLASS(oc); + + mc->desc =3D "MIPS Malta Core LV (no physical limitations)"; + mc->alias =3D "malta"; mc->block_default_type =3D IF_IDE; mc->max_cpus =3D 16; mc->is_default =3D true; @@ -1449,13 +1457,13 @@ static void malta_machine_class_init(ObjectClass *o= c, void *data) #else mc->default_cpu_type =3D MIPS_CPU_TYPE_NAME("24Kf"); #endif - mc->default_ram_id =3D "mips_malta.ram"; } =20 static const TypeInfo malta_machine_types[] =3D { { - .name =3D MACHINE_TYPE_NAME("malta"), + .name =3D MACHINE_TYPE_NAME("malta-virt"), .parent =3D TYPE_MALTA_MACHINE, + .class_init =3D malta_machine_virt_class_init, }, { .name =3D TYPE_MALTA_MACHINE, .parent =3D TYPE_MACHINE, --=20 2.21.3 From nobody Wed Apr 24 23:18:16 2024 Delivered-To: importer@patchew.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 ARC-Seal: i=1; a=rsa-sha256; t=1593504981; cv=none; d=zohomail.com; s=zohoarc; b=jr7+ufdnY+d4gNdeUH68VULipOGu0KgUIq6xgxNzrY7ui/FwdBSaEd5Wg3zX3si8+Q7yvtr1PkAZKT34r8VvYGfM1JW8DjBa2737mBqJJ1WYh6F+8p3p6wJIOSSmTDxqlx958JBgmnislli+KV8BqAe0zPpsCAjaJGZVHZ0QIOU= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1593504981; 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=ezmv4JiTpP7X7OxAfnbPCLJGrwpvkIrxmTp8C42vD8c=; b=BETyEHA0BHwPmz7JISkSsKiEN56g2yW+sg51ZGUHdlft8g3bkY4QWHdrvkxm/tnLxSLLMKw3RPlPop4stzO8x81XcQS5KqRZm/eRCqp+Ez//oXeW6fepATCZM/vSKGJ1nsCpv1tAJFYcwmjv0EkKk3ZavtY8cnZHCtSRhYpeiPU= 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 Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 15935049815111016.6794920903424; Tue, 30 Jun 2020 01:16:21 -0700 (PDT) Received: from localhost ([::1]:60288 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jqBRE-0005Jz-6l for importer@patchew.org; Tue, 30 Jun 2020 04:16:20 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:55746) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1jqBOW-0001OT-Vd for qemu-devel@nongnu.org; Tue, 30 Jun 2020 04:13:32 -0400 Received: from mail-ed1-x544.google.com ([2a00:1450:4864:20::544]:44345) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1jqBOV-0003Ba-B3 for qemu-devel@nongnu.org; Tue, 30 Jun 2020 04:13:32 -0400 Received: by mail-ed1-x544.google.com with SMTP id by13so5435958edb.11 for ; Tue, 30 Jun 2020 01:13:30 -0700 (PDT) Received: from x1w.redhat.com (1.red-83-51-162.dynamicip.rima-tde.net. [83.51.162.1]) by smtp.gmail.com with ESMTPSA id z1sm1425948ejb.41.2020.06.30.01.13.28 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 30 Jun 2020 01:13:28 -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=ezmv4JiTpP7X7OxAfnbPCLJGrwpvkIrxmTp8C42vD8c=; b=E7sGX8hYaQWGWAbiiJHIameMhsNpWt4kQo4fWH9YLKfqwzat64USe8HUGabBeeKI0o TGpJuX6da+FVHYOrGoSUXlm81/0q1/EkhwXc2EhmIWGizoyVc4a3JqDh7tT5ckZ7eUZM hgTYNhwcR/EB4HCuLFpFn/oscKzlCWm0LKHJ3Yc+CWHIQIVUh0akyRrIW6PWlx5UdXmn B0ac6DTSKStrj40Fee6GNnn16XVfUV30SAf3GOkNl/SJWUwse/i1PtZKdKOP8l50khd7 bTeoYyFUtP034TbAHMBruhW349Fl/Vob9JFNyek9G5nfc99snVZksQ2abDsUbqbsQnPq kCSw== 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=ezmv4JiTpP7X7OxAfnbPCLJGrwpvkIrxmTp8C42vD8c=; b=BTqhUEgWd3Spfid1siWLmMVN7yhnQdxK+U0VAMP704mWzicKJbdCwxJqFEkDVnH4L/ ml3adPH1RveISiaF1E86PkptE/LKH4R9t6O7xvpvdWCBAEBaP1yeMi+10UMhLq0z3KVl VjL2NrrypGMncANODQU7mpNUrzConDjoCwgdUUi3Fr44gdKtwW5u/OVl5mVS4j5tozqz UJqlTjlgEFCnyFTSWnPeT9ByH8LBnw1xExxbJNPxPNKWuf1beP5+T1CyR0qIPg657f6A jfIrXgr6ecGPQtRXk+nKdu1MYgpHiGoH8wkjEFFSnLCc7AIbzo63EiVgj5WNxl9h9Ew1 4McA== X-Gm-Message-State: AOAM531BAiRNErlLwePiD70qOK741IkqMyLnV6b5FqJsn4VRHn1J/5Gw Bhf9x4N0+nCignvlBASYiZc= X-Google-Smtp-Source: ABdhPJyHW9qIoDvNlErfWDN4rFRmEyLXCvyHQ8SFGSPUdARbnJwgyXjNRaiI7VHvMVCxpAtNE8y2ag== X-Received: by 2002:a05:6402:3138:: with SMTP id dd24mr22094497edb.118.1593504809516; Tue, 30 Jun 2020 01:13:29 -0700 (PDT) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: Yunqiang Su , Aurelien Jarno , qemu-devel@nongnu.org Subject: [PATCH 4/7] hw/mips/malta: Introduce MaltaMachineClass::max_ramsize Date: Tue, 30 Jun 2020 10:13:19 +0200 Message-Id: <20200630081322.19146-5-f4bug@amsat.org> X-Mailer: git-send-email 2.21.3 In-Reply-To: <20200630081322.19146-1-f4bug@amsat.org> References: <20200630081322.19146-1-f4bug@amsat.org> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable 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; Received-SPF: pass client-ip=2a00:1450:4864:20::544; envelope-from=philippe.mathieu.daude@gmail.com; helo=mail-ed1-x544.google.com X-detected-operating-system: by eggs.gnu.org: No matching host in p0f cache. That's all we know. X-Spam_score_int: 0 X-Spam_score: 0.0 X-Spam_bar: / X-Spam_report: (0.0 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_EF=-0.1, FREEMAIL_FORGED_FROMDOMAIN=1, FREEMAIL_FROM=0.001, HEADER_FROM_DIFFERENT_DOMAINS=1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=_AUTOLEARN X-Spam_action: no action 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: Aleksandar Rikalo , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Jiaxun Yang , Aleksandar Markovic , Igor Mammedov , =?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) The maximum RAM size is tied to the machine. First add the MaltaMachineClass, and add 'max_ramsize' to it. Set it to the current value of 2 GB, and adapt the code checking for the requested RAM is usable by the machine. Signed-off-by: Philippe Mathieu-Daud=C3=A9 --- hw/mips/malta.c | 31 ++++++++++++++++++++++++++----- 1 file changed, 26 insertions(+), 5 deletions(-) diff --git a/hw/mips/malta.c b/hw/mips/malta.c index f8fc567532..1ca41b44db 100644 --- a/hw/mips/malta.c +++ b/hw/mips/malta.c @@ -56,6 +56,7 @@ #include "sysemu/kvm.h" #include "hw/semihosting/semihost.h" #include "hw/mips/cps.h" +#include "qemu/cutils.h" =20 #define ENVP_ADDR 0x80002000l #define ENVP_NB_ENTRIES 16 @@ -71,6 +72,17 @@ #define MAX_IDE_BUS 2 =20 #define TYPE_MALTA_MACHINE MACHINE_TYPE_NAME("malta") +#define MALTA_MACHINE_CLASS(klass) \ + OBJECT_CLASS_CHECK(MaltaMachineClass, (klass), TYPE_MALTA_MACHINE) +#define MALTA_MACHINE_GET_CLASS(obj) \ + OBJECT_GET_CLASS(MaltaMachineClass, (obj), TYPE_MALTA_MACHINE) + +typedef struct MaltaMachineClass { + /* Private */ + MachineClass parent_obj; + /* Public */ + ram_addr_t max_ramsize; +} MaltaMachineClass; =20 typedef struct { MemoryRegion iomem; @@ -1232,7 +1244,7 @@ void mips_malta_init(MachineState *machine) DriveInfo *dinfo; int fl_idx =3D 0; int be; - + MaltaMachineClass *mmc =3D MALTA_MACHINE_GET_CLASS(machine); DeviceState *dev =3D qdev_new(TYPE_MIPS_MALTA); MaltaState *s =3D MIPS_MALTA(dev); =20 @@ -1248,10 +1260,16 @@ void mips_malta_init(MachineState *machine) /* create CPU */ mips_create_cpu(machine, s, &cbus_irq, &i8259_irq); =20 - /* allocate RAM */ - if (ram_size > 2 * GiB) { - error_report("Too much memory for this machine: %" PRId64 "MB," - " maximum 2048MB", ram_size / MiB); + /* + * The GT-64120A north bridge accepts at most 256 MiB per SCS for + * address decoding, so we have a maximum of 1 GiB. We deliberately + * ignore this physical limitation. + */ + if (ram_size > mmc->max_ramsize) { + char *maxsize_str =3D size_to_str(mmc->max_ramsize); + error_report("Too much memory for this machine: %" PRId64 " MiB," + " maximum %s", ram_size / MiB, maxsize_str); + g_free(maxsize_str); exit(1); } =20 @@ -1446,6 +1464,7 @@ static void malta_machine_class_init(ObjectClass *oc,= void *data) static void malta_machine_virt_class_init(ObjectClass *oc, void *data) { MachineClass *mc =3D MACHINE_CLASS(oc); + MaltaMachineClass *mmc =3D MALTA_MACHINE_CLASS(oc); =20 mc->desc =3D "MIPS Malta Core LV (no physical limitations)"; mc->alias =3D "malta"; @@ -1457,6 +1476,7 @@ static void malta_machine_virt_class_init(ObjectClass= *oc, void *data) #else mc->default_cpu_type =3D MIPS_CPU_TYPE_NAME("24Kf"); #endif + mmc->max_ramsize =3D 2 * GiB; } =20 static const TypeInfo malta_machine_types[] =3D { @@ -1467,6 +1487,7 @@ static const TypeInfo malta_machine_types[] =3D { }, { .name =3D TYPE_MALTA_MACHINE, .parent =3D TYPE_MACHINE, + .class_size =3D sizeof(MaltaMachineClass), .class_init =3D malta_machine_class_init, .abstract =3D true, } --=20 2.21.3 From nobody Wed Apr 24 23:18:16 2024 Delivered-To: importer@patchew.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 ARC-Seal: i=1; a=rsa-sha256; t=1593505066; cv=none; d=zohomail.com; s=zohoarc; b=P/j7v3vBkUjKobXtMIWaBWtbCa5ttp9UpQj/6iXWYuqhJ0AFLyH0y7nUkY6Poh/bJxKRKAEdYFtDkdlMc6YlfHeOxsgz0BF2H8P7EU4uRIBU8j7DhAaFLKxKtlceA6l5QKAPyjHTM+15H2H+5vluRpjpthhdSzs52avD53AgDko= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1593505066; 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=o9MheSyfE8UMIhLbV+ncpbSwjga0svuWXC9D1+WgrXc=; b=FpbSPXtUIiN1N137gKyp+I37mM5Flc/OFkQ6jbVAWFNNrgtzOgX03HvRxfAc5KDPNIGXEow3NbjjdEvKvuk+GHMYgzNcFN7tmjk8WV2Ii9Gh11Cifa6Lqb9FdlbNa9XOfKk2pf9bz4pa6erZMr/nxnskM3LAu15sg/ebtHdd5co= 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 Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1593505066744860.5094228639816; Tue, 30 Jun 2020 01:17:46 -0700 (PDT) Received: from localhost ([::1]:37420 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jqBSb-0007Xd-DK for importer@patchew.org; Tue, 30 Jun 2020 04:17:45 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:55774) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1jqBOY-0001QK-3I for qemu-devel@nongnu.org; Tue, 30 Jun 2020 04:13:34 -0400 Received: from mail-ed1-x542.google.com ([2a00:1450:4864:20::542]:44344) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1jqBOW-0003Bv-L7 for qemu-devel@nongnu.org; Tue, 30 Jun 2020 04:13:33 -0400 Received: by mail-ed1-x542.google.com with SMTP id by13so5435989edb.11 for ; Tue, 30 Jun 2020 01:13:32 -0700 (PDT) Received: from x1w.redhat.com (1.red-83-51-162.dynamicip.rima-tde.net. [83.51.162.1]) by smtp.gmail.com with ESMTPSA id z1sm1425948ejb.41.2020.06.30.01.13.30 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 30 Jun 2020 01:13:30 -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=o9MheSyfE8UMIhLbV+ncpbSwjga0svuWXC9D1+WgrXc=; b=pe71eC0F2ALAT20eM/ZcZb6ej2fmvO0uDyHCOcF1yTet9KaZ44wtHBym4lYIBRC99r xLuwbH9x4ivc+sk/Z0RvTkE8QoplES18oXy5rKISQjT6sI2sgLoUdBeqaeeXuKXp/1JN vREMXkXSc2Oxqeqq09yjvC76xtL+FBAN5UNJtnMgJ3oowHbGGPAOucAEXtj5lMEyifUS mLnDDU98Or4k/q+CzjRgQgkEanNFmgBYig76DeQd+JeKJe5QUiS7AOAck1sxhAKmDL8B hl9rZTPTS8K8aucFQxfaD873U7rM1wgSPrl+ckhHs7K99y8cBUZQoKpsyN9rokXv4uXM ZNoQ== 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=o9MheSyfE8UMIhLbV+ncpbSwjga0svuWXC9D1+WgrXc=; b=qn9vH10YuXne1faodF3ACeZC0Ob5aiW4O3/gieDPSxdYR/GqrzRPOVQOuNjD0v6u1c 4Kx3pL7HUd6Rq9kbkV82mbge/lVqahEYD/+EPCFOV8UWT7yZ8P1wfjQixPRCxYiXTOP5 jpaYes0ti0KeO/7s4K4Nc3+BxLmJ6ZFCrQ7yJH70wfh6Kot6cE5RfcOSe7HWk9PmW5zN Nga/rFykgaWI3A0fwk5CMSsHu0Qz489OZvmTLxTdIrPpje7mEW8suqVSGEh38nJpeE/I ncNV6aYdrEvZ5uXj3OG0LRgRPdFugLYoj1jcwERm2UehOxhpcFgCZaO9boF+se9+/4el angg== X-Gm-Message-State: AOAM532D9HQ1qY3ejRSaLW3ZUOFxJFVRNat+Ghks6PQMfdkZ5Ir82vYl av/94WjQTTw+DliTzk9whNU= X-Google-Smtp-Source: ABdhPJx0HIyo14FvgFOEIRxpqWInW9YAFn7TMtZwSm/jrlRcEgZ13uv4/0lIkHrM2oQ4Jxl3/1uHwA== X-Received: by 2002:a05:6402:2212:: with SMTP id cq18mr22866189edb.173.1593504811362; Tue, 30 Jun 2020 01:13:31 -0700 (PDT) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: Yunqiang Su , Aurelien Jarno , qemu-devel@nongnu.org Subject: [PATCH 5/7] hw/mips/malta: Introduce the 'malta-phys' machine Date: Tue, 30 Jun 2020 10:13:20 +0200 Message-Id: <20200630081322.19146-6-f4bug@amsat.org> X-Mailer: git-send-email 2.21.3 In-Reply-To: <20200630081322.19146-1-f4bug@amsat.org> References: <20200630081322.19146-1-f4bug@amsat.org> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable 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; Received-SPF: pass client-ip=2a00:1450:4864:20::542; envelope-from=philippe.mathieu.daude@gmail.com; helo=mail-ed1-x542.google.com X-detected-operating-system: by eggs.gnu.org: No matching host in p0f cache. That's all we know. X-Spam_score_int: 0 X-Spam_score: 0.0 X-Spam_bar: / X-Spam_report: (0.0 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_EF=-0.1, FREEMAIL_FORGED_FROMDOMAIN=1, FREEMAIL_FROM=0.001, HEADER_FROM_DIFFERENT_DOMAINS=1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=_AUTOLEARN X-Spam_action: no action 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: Aleksandar Rikalo , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Jiaxun Yang , Aleksandar Markovic , Igor Mammedov , =?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) Introduce the 'malta-phys' machine, aiming to have the same limitations as real hardware. Start by restricting the RAM to 1GB, which is the maximum amount of memory the GT-64120A north bridge can address. Signed-off-by: Philippe Mathieu-Daud=C3=A9 --- hw/mips/malta.c | 21 +++++++++++++++++++++ 1 file changed, 21 insertions(+) diff --git a/hw/mips/malta.c b/hw/mips/malta.c index 1ca41b44db..013bf9272c 100644 --- a/hw/mips/malta.c +++ b/hw/mips/malta.c @@ -1479,11 +1479,32 @@ static void malta_machine_virt_class_init(ObjectCla= ss *oc, void *data) mmc->max_ramsize =3D 2 * GiB; } =20 +static void malta_machine_phys_class_init(ObjectClass *oc, void *data) +{ + MachineClass *mc =3D MACHINE_CLASS(oc); + MaltaMachineClass *mmc =3D MALTA_MACHINE_CLASS(oc); + + mc->desc =3D "MIPS Malta Core LV (physically limited as real hardware)= "; + mc->block_default_type =3D IF_PFLASH; + mc->max_cpus =3D 1; +#ifdef TARGET_MIPS64 + mc->default_cpu_type =3D MIPS_CPU_TYPE_NAME("5Kc"); +#else + mc->default_cpu_type =3D MIPS_CPU_TYPE_NAME("4Kc"); +#endif + mc->default_ram_size =3D 32 * MiB; + mmc->max_ramsize =3D 256 * MiB; /* 32 MByte PC100 SDRAM DIMMs x 4 slot= s */ +}; + static const TypeInfo malta_machine_types[] =3D { { .name =3D MACHINE_TYPE_NAME("malta-virt"), .parent =3D TYPE_MALTA_MACHINE, .class_init =3D malta_machine_virt_class_init, + }, { + .name =3D MACHINE_TYPE_NAME("malta-phys"), + .parent =3D TYPE_MALTA_MACHINE, + .class_init =3D malta_machine_phys_class_init, }, { .name =3D TYPE_MALTA_MACHINE, .parent =3D TYPE_MACHINE, --=20 2.21.3 From nobody Wed Apr 24 23:18:16 2024 Delivered-To: importer@patchew.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 ARC-Seal: i=1; a=rsa-sha256; t=1593505087; cv=none; d=zohomail.com; s=zohoarc; b=A/HbvQtf7AlPP8nZLAa83qviUBR8b5US1wza30Tl5J/3JtPXvvjp8ezGPJ6/WQJnA2k3cf5pYv6wyufwilCIn4/+zrcbKTtitItgS5KN2IaajW4O27WQgNZ6oyIMmkwlZZAuV7V8IvgOOA5d1CzsAN4ps19gRaqMBHZ4DV4eYyQ= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1593505087; 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=EGAPVCNqBfM+j6qn1eWFdt+mVuBKEEQjee2Ni0amWQk=; b=NjiRaGlW/huS01xuSctlUtLqGP7pgFKFlIjdTMn2mH0U60c1QxfBOemwM+KAxxoM/vQE3Nx+G8KFEDtfPBC/gMTlsjiH0MAoCDp/KlOxIuax3/kM7JVWFHAeDJ96r1OjXfE/yZ3Q4Xpiuwh7WUoftvjV854emGSZz1VGRDq/qTI= 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 Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1593505087739723.8966289221639; Tue, 30 Jun 2020 01:18:07 -0700 (PDT) Received: from localhost ([::1]:39102 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jqBSw-0008Ck-Gy for importer@patchew.org; Tue, 30 Jun 2020 04:18:06 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:55798) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1jqBOZ-0001Ti-Dz for qemu-devel@nongnu.org; Tue, 30 Jun 2020 04:13:35 -0400 Received: from mail-ed1-x541.google.com ([2a00:1450:4864:20::541]:39993) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1jqBOX-0003CM-U3 for qemu-devel@nongnu.org; Tue, 30 Jun 2020 04:13:35 -0400 Received: by mail-ed1-x541.google.com with SMTP id b15so15300707edy.7 for ; Tue, 30 Jun 2020 01:13:33 -0700 (PDT) Received: from x1w.redhat.com (1.red-83-51-162.dynamicip.rima-tde.net. [83.51.162.1]) by smtp.gmail.com with ESMTPSA id z1sm1425948ejb.41.2020.06.30.01.13.31 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 30 Jun 2020 01:13:32 -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=EGAPVCNqBfM+j6qn1eWFdt+mVuBKEEQjee2Ni0amWQk=; b=c+2MdmF3y4Drt8+7PrjwFanvG10QM1608Chgll3SignKIHVxh21qZ9TyYHLJ9/XOvl Kfzq4AVG+Z4HVCdRuzF20yntiMBP9BQeKzFRH+FL+52aaLCmc9Ri9ByrsSzGI1ePej89 phvkqhviMPwAPe3b4vfvOoBOqsX87oGqD7Ep/Lf9lPSMFwuhdPC7awQaba4/2zlIsApC P/2p2WchYVzSKqO5Xi6279BkW5jXUxqoI6OHmjx6rb2s0pWLluwIJCW5bN5cfcZbCaN3 3U9ujN8WyUEWKXgRWLapqPZgfZxkDBkX1u/rCaVc3SJj7P/lHvCFIm7QvlfXwyU+FfUK Fviw== 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=EGAPVCNqBfM+j6qn1eWFdt+mVuBKEEQjee2Ni0amWQk=; b=LVw43QObD9OJk6PU/XZJ0K4UL/6Od/3I+fYYCKuBgPi7m6bSilKgAnF3G/Vj6gltyI TSRB3+qsZAJUcCkTOtfkxBXY1OTccdzZhFLEhZH4ui7v/INlv+Ny8G7QeAZnFGNWbog+ wfRnVYA9ly8Qi7IcpjkD5QA9KXqFM9gXtNw2EXoMikDiAgcflrDHzHs0LHv9G0UtuvDl IlYfCyLonNG0fbLarCSpOZLicb4k2V0UHQ+1YwHSSjYKBrj2U2iKs5mylrY8A6W6xaII b/S7DOTobCiQCuf3rKrf+rdc0ln5NXVLxFThsirjP8tetnT1+0KLc/+5BD1bO6+c4YOY R+WQ== X-Gm-Message-State: AOAM530vMq8Dm4dA34X6u4vhorpGKXvmqvLQ32Sm6CYdCqUehxKF3lK8 l/4wrzyb4nxHsT5LK/g6MFE= X-Google-Smtp-Source: ABdhPJwHYfygBUcjXgwu6bStYkIMN5N3kFYIVkxqw8tZgz60tYlmxCnzTtgDO0G/kBcGjKq9JFd+KQ== X-Received: by 2002:aa7:d989:: with SMTP id u9mr3992723eds.85.1593504812625; Tue, 30 Jun 2020 01:13:32 -0700 (PDT) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: Yunqiang Su , Aurelien Jarno , qemu-devel@nongnu.org Subject: [PATCH 6/7] hw/mips/malta: Verify malta-phys machine uses correct DIMM sizes Date: Tue, 30 Jun 2020 10:13:21 +0200 Message-Id: <20200630081322.19146-7-f4bug@amsat.org> X-Mailer: git-send-email 2.21.3 In-Reply-To: <20200630081322.19146-1-f4bug@amsat.org> References: <20200630081322.19146-1-f4bug@amsat.org> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable 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; Received-SPF: pass client-ip=2a00:1450:4864:20::541; envelope-from=philippe.mathieu.daude@gmail.com; helo=mail-ed1-x541.google.com X-detected-operating-system: by eggs.gnu.org: No matching host in p0f cache. That's all we know. X-Spam_score_int: 0 X-Spam_score: 0.0 X-Spam_bar: / X-Spam_report: (0.0 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_EF=-0.1, FREEMAIL_FORGED_FROMDOMAIN=1, FREEMAIL_FROM=0.001, HEADER_FROM_DIFFERENT_DOMAINS=1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=_AUTOLEARN X-Spam_action: no action 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: Aleksandar Rikalo , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Jiaxun Yang , Aleksandar Markovic , Igor Mammedov , =?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) The machine has 4 DIMM slots. Each DIMM must be a power of 2. Add a check the total RAM is a good combination of DIMMs. Signed-off-by: Philippe Mathieu-Daud=C3=A9 --- hw/mips/malta.c | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/hw/mips/malta.c b/hw/mips/malta.c index 013bf9272c..5768b88183 100644 --- a/hw/mips/malta.c +++ b/hw/mips/malta.c @@ -71,6 +71,8 @@ =20 #define MAX_IDE_BUS 2 =20 +#define DIMM_SLOTS_COUNT 4 + #define TYPE_MALTA_MACHINE MACHINE_TYPE_NAME("malta") #define MALTA_MACHINE_CLASS(klass) \ OBJECT_CLASS_CHECK(MaltaMachineClass, (klass), TYPE_MALTA_MACHINE) @@ -82,6 +84,7 @@ typedef struct MaltaMachineClass { MachineClass parent_obj; /* Public */ ram_addr_t max_ramsize; + bool verify_dimm_sizes; } MaltaMachineClass; =20 typedef struct { @@ -1260,6 +1263,12 @@ void mips_malta_init(MachineState *machine) /* create CPU */ mips_create_cpu(machine, s, &cbus_irq, &i8259_irq); =20 + if (mmc->verify_dimm_sizes && ctpop64(ram_size) > DIMM_SLOTS_COUNT) { + error_report("RAM size must be the combination of %d powers of 2", + DIMM_SLOTS_COUNT); + exit(1); + } + /* * The GT-64120A north bridge accepts at most 256 MiB per SCS for * address decoding, so we have a maximum of 1 GiB. We deliberately @@ -1494,6 +1503,7 @@ static void malta_machine_phys_class_init(ObjectClass= *oc, void *data) #endif mc->default_ram_size =3D 32 * MiB; mmc->max_ramsize =3D 256 * MiB; /* 32 MByte PC100 SDRAM DIMMs x 4 slot= s */ + mmc->verify_dimm_sizes =3D true; }; =20 static const TypeInfo malta_machine_types[] =3D { --=20 2.21.3 From nobody Wed Apr 24 23:18:16 2024 Delivered-To: importer@patchew.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=amsat.org ARC-Seal: i=1; a=rsa-sha256; t=1593505155; cv=none; d=zohomail.com; s=zohoarc; b=gaNm+hWxYSpqkR+iRKr7+jw5SZqlfY5xZS5hagAsXKeFs4kAxAHymfAf4R5CUAd/pXvVIqOVaMDMjBUvvGNUq0U3hY6smoXjxIMYNUvsKV7bcFhPk8+N2BeEDY5FR+Kld2OEpWkRDeN3nvbFhkwiDzEzjm0D3JJ82SwoZOWPSJY= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1593505155; 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=SGZ0w3GX0Fw/UVCGFTciL1Am4/K0WbWSFkFzf/a5Yeg=; b=j0rf1Z3RG59K0iEIGWr8rwM17uMa9D8S33XuSIHRFiIfVlH2dhiV37z8/JYqlP06QtpOVagyAM7MomznkZ0Tb3vekrmZ0kZCKw0ddV/c+VY9Gu5a7gvxiVc5Wu/K4Vvpkw6qOnYEnKHLzJyPBbeZCKiNnXnNUIpV1xNwXyC4v4Q= 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 1593505155036371.88293883686447; Tue, 30 Jun 2020 01:19:15 -0700 (PDT) Received: from localhost ([::1]:43064 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jqBU1-0001OP-Tn for importer@patchew.org; Tue, 30 Jun 2020 04:19:13 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:55814) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1jqBOa-0001WG-Gf for qemu-devel@nongnu.org; Tue, 30 Jun 2020 04:13:36 -0400 Received: from mail-ed1-x543.google.com ([2a00:1450:4864:20::543]:33008) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1jqBOZ-0003Ce-4y for qemu-devel@nongnu.org; Tue, 30 Jun 2020 04:13:36 -0400 Received: by mail-ed1-x543.google.com with SMTP id h28so15330989edz.0 for ; Tue, 30 Jun 2020 01:13:34 -0700 (PDT) Received: from x1w.redhat.com (1.red-83-51-162.dynamicip.rima-tde.net. [83.51.162.1]) by smtp.gmail.com with ESMTPSA id z1sm1425948ejb.41.2020.06.30.01.13.32 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 30 Jun 2020 01:13:33 -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=SGZ0w3GX0Fw/UVCGFTciL1Am4/K0WbWSFkFzf/a5Yeg=; b=IejZtuCP8CBNQ7wNJEVzMD8vn1uEh1LCzfmTf9kxt02JkzXHnUaxxrm+Pw6bIys1pF 4YB9Fk7Nl5++TiyQDzXJcG/xHADMf3+t2bvROAxnNlRQDO638q9nZrB7R1h5jH9R5u/J vm7OhiwD+LPQfG7kKw5t0IfAnefG/aBceTyzHfjGnCj83cNAOLedfWclIHjUuaoL54Qc 2Au6HwrOePFkFSXwyDKGznRbwFDttKvhidQUC2iqbhbwbF6PZSUylSH8LBCpjX2IdgCn Y6M0j9MiBbDNS9/eq1RvEGlerIj/wwZSfO+lOR62bz51cMpPUUeMAvFlBIJ/McXDYX+8 gUHQ== 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=SGZ0w3GX0Fw/UVCGFTciL1Am4/K0WbWSFkFzf/a5Yeg=; b=fURXUFgEenwbNDQVHl/yBhqjSY7yejRVK3L9pkiHBSUNqIsNu3gMs3RqvKHe5CxpyP bQGd3CeWSUdIH22y1qHSZ9b8CZjhfx4kpKKhkCMkGEz8lEXY3EGSd7LPU/iC+8zt2UNs zSiilw7SgZCiUCft/SkZjIxw9MR3bfh05mbLjMQ0I0GHIGxB1T1lyWrAxUDXbGJsW227 eAgFR0A3DowlHeiawoAAUts/Q40mwMIvJRgiGYbAso8Myj5u/o2y+FMVM14wWrqp8tmk 8mnLY2J8AY58AmIFTn0RADWwqEPhs/zC411ME7/SoQTMWXIpA7xDO1ZF+D9CD6wAtHkc F0dQ== X-Gm-Message-State: AOAM530mI4iTIJX1L0kLwPUjL+oZcgXDFb2uYD7HsFfW4qvvXMjkVPC+ iXau96KCJFLB27zszjWRf7U= X-Google-Smtp-Source: ABdhPJwFqCJKU5niLQVN0c7TBAtNOKfShqVHK68LWoGS0k6IOSwRVGQBfd/K8pFvZfsIt+P9eRhFYw== X-Received: by 2002:a05:6402:17f6:: with SMTP id t22mr22447564edy.141.1593504813883; Tue, 30 Jun 2020 01:13:33 -0700 (PDT) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: Yunqiang Su , Aurelien Jarno , qemu-devel@nongnu.org Subject: [PATCH 7/7] hw/mips/malta: Allow more than 2GB on 64-bit malta-virt Date: Tue, 30 Jun 2020 10:13:22 +0200 Message-Id: <20200630081322.19146-8-f4bug@amsat.org> X-Mailer: git-send-email 2.21.3 In-Reply-To: <20200630081322.19146-1-f4bug@amsat.org> References: <20200630081322.19146-1-f4bug@amsat.org> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable 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; Received-SPF: pass client-ip=2a00:1450:4864:20::543; envelope-from=philippe.mathieu.daude@gmail.com; helo=mail-ed1-x543.google.com X-detected-operating-system: by eggs.gnu.org: No matching host in p0f cache. That's all we know. X-Spam_score_int: 0 X-Spam_score: 0.0 X-Spam_bar: / X-Spam_report: (0.0 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_EF=-0.1, FREEMAIL_FORGED_FROMDOMAIN=1, FREEMAIL_FROM=0.001, HEADER_FROM_DIFFERENT_DOMAINS=1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=_AUTOLEARN X-Spam_action: no action 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: Aleksandar Rikalo , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Jiaxun Yang , Aleksandar Markovic , Igor Mammedov , =?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) Since we don't respect the hardware restrictions, there is no good reason to limit the maximum amount of RAM to 2GB. Suggested-by: Yunqiang Su Signed-off-by: Philippe Mathieu-Daud=C3=A9 --- hw/mips/malta.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/hw/mips/malta.c b/hw/mips/malta.c index 5768b88183..277cbc0303 100644 --- a/hw/mips/malta.c +++ b/hw/mips/malta.c @@ -1482,10 +1482,11 @@ static void malta_machine_virt_class_init(ObjectCla= ss *oc, void *data) mc->is_default =3D true; #ifdef TARGET_MIPS64 mc->default_cpu_type =3D MIPS_CPU_TYPE_NAME("20Kc"); + mmc->max_ramsize =3D 3 * GiB; #else mc->default_cpu_type =3D MIPS_CPU_TYPE_NAME("24Kf"); -#endif mmc->max_ramsize =3D 2 * GiB; +#endif } =20 static void malta_machine_phys_class_init(ObjectClass *oc, void *data) --=20 2.21.3