From nobody Sat May 18 04:46:24 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of _spf.google.com designates 209.85.128.66 as permitted sender) client-ip=209.85.128.66; envelope-from=philippe.mathieu.daude@gmail.com; helo=mail-wm1-f66.google.com; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of _spf.google.com designates 209.85.128.66 as permitted sender) smtp.mailfrom=philippe.mathieu.daude@gmail.com ARC-Seal: i=1; a=rsa-sha256; t=1602518711; cv=none; d=zohomail.com; s=zohoarc; b=dGhh5HiJFGKKPlegyXB/xYav0j7elhulydnIW4+IiZnTz2nluOZk2SFsm2V2HGnaHljKcrK01RUES+SEr8jGzXpjAVPmig6HcClj8oKV+G8N2qrYwJGEs50o+hDUZhtSYo9PLF3hiyUrWJWqEkoEnTd3l3AjG1LRv67PfZvVm0A= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1602518711; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:MIME-Version:Message-ID:References:Sender:Subject:To; bh=JguspvpXF+DkogdsxEqfqlEtENU/Ft8xqLKiNF8xPdE=; b=CCf2AdO6gnzmYSBBbnc6dlPKEZDw8hWq9s6J93a/c5K3jlfFS2NCd+b/jSJdhdzMuICjgcfZ9i8RF8Vl25ntGnJliorrXBxdHuz23il2WaqdjUuWbkpXFkWVwbgms7SqbpJg5ey9h1dG9NIqYo4EpT69kTktSPZ4SOvnhcRbx3k= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of _spf.google.com designates 209.85.128.66 as permitted sender) smtp.mailfrom=philippe.mathieu.daude@gmail.com Received: from mail-wm1-f66.google.com (mail-wm1-f66.google.com [209.85.128.66]) by mx.zohomail.com with SMTPS id 1602518711791828.0847021028218; Mon, 12 Oct 2020 09:05:11 -0700 (PDT) Received: by mail-wm1-f66.google.com with SMTP id j136so18067682wmj.2 for ; Mon, 12 Oct 2020 09:05:11 -0700 (PDT) Return-Path: Return-Path: Received: from localhost.localdomain (106.red-83-59-162.dynamicip.rima-tde.net. [83.59.162.106]) by smtp.gmail.com with ESMTPSA id x6sm24900367wmb.17.2020.10.12.09.05.09 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 12 Oct 2020 09:05:09 -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=JguspvpXF+DkogdsxEqfqlEtENU/Ft8xqLKiNF8xPdE=; b=uAW3cETDNS3qxLNGv0tx24t6VweQw/2JORaAVPfL0OVtJAZYKDtlUJspcvD3U+z7hX l0SylycUTx9y2y+fmOjloxOhZnZ67oVoaO5PUmBPRpaxA/+JwPDitDaTlvSaaiGZtHwE Txe+Iyb/yog9g5HWGpHOMZtV21Q3nBqZv1RVyUIWANhArpHDURAYcA16BCC4AVjbXj8b LXKaiacLSxHPDWBbKWK81IE0WS0I7ZAd0xoI6/4KHOiFNIgk28VoGYTbvzyazmrdhumz vucV7vYb6MYrpMx/I7crqBpNqDjK+KN+dVxt2LUA6J6p/hy7XCDE2PTbBzQ+1GS/M1kX WO5A== 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=JguspvpXF+DkogdsxEqfqlEtENU/Ft8xqLKiNF8xPdE=; b=WQJ4DqVZYKLOltlfFWULTykSBvnJSafeyzkPeEcMND3IJN6jbBs2V5EBTEmkvygy5d F/sgbNYKDXfUZD827UEhwhC9r3ntH4L4OBNY34I6OceoD/isbyOJK057LRXXLJQtgjHP jrjaAeHnMpH1u4fUbdFn7hpQ3G75RS639Kuk8XtGXVQDmYwuSgq2nPAEY3elda37upUi vnIJ8eD5TUOBOw3Z4ZvcFgqu1o2lhxbfiZ6iyIJ1gHFJjA5EoKdjgrCDz+X+RB7c8zlt NnJVzKuawKZjLvu5iFI+H2YmWO+QbZVWJuseBVKiap7uISDDiOcWZU8Immh41G2yVVaa 7yVw== X-Gm-Message-State: AOAM531pPEG6DOII2KqHThSW2d6CA3UwQU1dmSKL9FoJtVjF6Cj2LtSF niEUyJfEvMmcu4DdaSSdNcg= X-Google-Smtp-Source: ABdhPJwXuJwWo5w/acriuuuMU7uOA/fQpSD2O4jYrpJuV5LctOcPVstl1pfIcFs4BMvbkfIiyPjUGw== X-Received: by 2002:a1c:2c0a:: with SMTP id s10mr11489684wms.103.1602518709972; Mon, 12 Oct 2020 09:05:09 -0700 (PDT) Sender: =?UTF-8?Q?Philippe_Mathieu=2DDaud=C3=A9?= From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: Aurelien Jarno , Jiaxun Yang , Aleksandar Rikalo , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Aleksandar Markovic Subject: [PATCH 1/2] hw/mips/malta: Move gt64120 related code together Date: Mon, 12 Oct 2020 18:05:02 +0200 Message-Id: <20201012160503.3472140-2-f4bug@amsat.org> X-Mailer: git-send-email 2.26.2 In-Reply-To: <20201012160503.3472140-1-f4bug@amsat.org> References: <20201012160503.3472140-1-f4bug@amsat.org> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @gmail.com) The 'empty_slot' region created is related to the gt64120. Move its creation close to the gt64120 instance creation. Signed-off-by: Philippe Mathieu-Daud=C3=A9 Reviewed-by: Richard Henderson --- hw/mips/malta.c | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) diff --git a/hw/mips/malta.c b/hw/mips/malta.c index 4019c9dc1a8..fe8f6f7ef51 100644 --- a/hw/mips/malta.c +++ b/hw/mips/malta.c @@ -1235,13 +1235,6 @@ void mips_malta_init(MachineState *machine) DeviceState *dev =3D qdev_new(TYPE_MIPS_MALTA); MaltaState *s =3D MIPS_MALTA(dev); =20 - /* - * The whole address space decoded by the GT-64120A doesn't generate - * exception when accessing invalid memory. Create an empty slot to - * emulate this feature. - */ - empty_slot_init("GT64120", 0, 0x20000000); - sysbus_realize_and_unref(SYS_BUS_DEVICE(dev), &error_fatal); =20 /* create CPU */ @@ -1395,6 +1388,12 @@ void mips_malta_init(MachineState *machine) =20 /* Northbridge */ pci_bus =3D gt64120_register(s->i8259); + /* + * The whole address space decoded by the GT-64120A doesn't generate + * exception when accessing invalid memory. Create an empty slot to + * emulate this feature. + */ + empty_slot_init("GT64120", 0, 0x20000000); =20 /* Southbridge */ dev =3D piix4_create(pci_bus, &isa_bus, &smbus); --=20 2.26.2 From nobody Sat May 18 04:46:24 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of _spf.google.com designates 209.85.221.68 as permitted sender) client-ip=209.85.221.68; envelope-from=philippe.mathieu.daude@gmail.com; helo=mail-wr1-f68.google.com; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of _spf.google.com designates 209.85.221.68 as permitted sender) smtp.mailfrom=philippe.mathieu.daude@gmail.com ARC-Seal: i=1; a=rsa-sha256; t=1602518716; cv=none; d=zohomail.com; s=zohoarc; b=HT+ptPrJPXu5o+vVoh9EKdnxY0YMAAjMqxpqD4P2Gb9/HxcgOR6yHPe1XIIQXXgcohL3OOIUa0FNUMjMIKrcyE8/+UqAqRZTEL8GkT27EtkOiMc1DscJ2hqsh0GnckL9aoMlPPx8kLKnGZlCDWgKafstk0HJWQrkAQUHc7FvxDI= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1602518716; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:MIME-Version:Message-ID:References:Sender:Subject:To; bh=uLGa7c8sQ4OAbnxSGPTof1KyN/ZmObCcCUQxZg5+wno=; b=fUg40BbzMJvbI1SZvZjb0MWWQ/F0vbWl12VkQgCaMXP4012WBcZOLjrug81MyRzcBO2dgQBPhZMWvYagHyOk8nXZ+5TrjeU5pXT0e9KtR51NlDTrjbWLihQchATEdnj/eA/mRxIQ/sqx45mgfLiDx6FO2c/gsRPFblAPtbWNB0k= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of _spf.google.com designates 209.85.221.68 as permitted sender) smtp.mailfrom=philippe.mathieu.daude@gmail.com Received: from mail-wr1-f68.google.com (mail-wr1-f68.google.com [209.85.221.68]) by mx.zohomail.com with SMTPS id 1602518716307742.0252537386691; Mon, 12 Oct 2020 09:05:16 -0700 (PDT) Received: by mail-wr1-f68.google.com with SMTP id i1so13678231wro.1 for ; Mon, 12 Oct 2020 09:05:15 -0700 (PDT) Return-Path: Return-Path: Received: from localhost.localdomain (106.red-83-59-162.dynamicip.rima-tde.net. [83.59.162.106]) by smtp.gmail.com with ESMTPSA id z17sm12422412wrr.93.2020.10.12.09.05.13 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 12 Oct 2020 09:05:13 -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=uLGa7c8sQ4OAbnxSGPTof1KyN/ZmObCcCUQxZg5+wno=; b=l07/psuPCjesdFBMYZT13MUgXL/3AjPetHlLap6dPGzgYcljjGBJMyEitsZcaMra+p xFu5IswDk8ET0rCkuEMHKrb5sd6y3Fg37DaOpAsRU3K4XaEdh4b1U2vCw+HtY9d8SmLL lIz8kOJw7iaZI4k9Y12zxGUFou12xpMZ1evSDexSH8a6PsOO3gQti68uOTP/3AvqZwj/ qFh/UErDCCJzxRxFe1pZ/JuvhDkqeaaoMatNGaMsbz8P3URl+Iwj8hpGlRNPNOX1LXTd 6tuNSb7CBaigDSPSJFBghaqBItUbPqocwY5AYRlhQeyU23vypsvpeLSjIkv1lDZ83W1w z5fw== 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=uLGa7c8sQ4OAbnxSGPTof1KyN/ZmObCcCUQxZg5+wno=; b=iJmEy+eBaJYkoQe0oI0fQPOp9SpIgkCzzhxjM8kalWPTpWq4H8y4MkoV0PKU3rdPJ+ KhjKnfm1aRV9YZOov+XRYdHUJUfvK98EpXn1Rbq4mOaBDvBkzefWtzlIhTsFcZADkdsr FZk3057YYbb/vw3NEEn+ehVpnSgASZBycIRDQearzuvqkSU+uHtzliYGnBP3YWJTDUgk XWFclarEF/8IKvl1hu733qnPG7PfSv5mGdn/iNSSullRmT1+bw6JIQQtuBIDLjAMeIaj 8q6+IL4GHw3F2YGlzAq/JhFIqaMeskPSVtCcegyR9TH0J3jgAYGq/pXAsAsoxifPTQPM +AOA== X-Gm-Message-State: AOAM533OtAYd7L503YTp5WcdgAw2zUUs3ID31hZkm+JfW8Z9necIPDAd kxHz2gVmuomqzGXvGApE6r0= X-Google-Smtp-Source: ABdhPJwXIK7uYJUEEOqAyh9n/API8eQbioMd3Sa0afblMRVgQtw2T3wa8FBse+CJOAfnxpp+ckTAMg== X-Received: by 2002:a5d:410a:: with SMTP id l10mr28117681wrp.274.1602518714466; Mon, 12 Oct 2020 09:05:14 -0700 (PDT) Sender: =?UTF-8?Q?Philippe_Mathieu=2DDaud=C3=A9?= From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: Aurelien Jarno , Jiaxun Yang , Aleksandar Rikalo , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Aleksandar Markovic Subject: [PATCH 2/2] hw/mips/malta: Use clearer qdev style Date: Mon, 12 Oct 2020 18:05:03 +0200 Message-Id: <20201012160503.3472140-3-f4bug@amsat.org> X-Mailer: git-send-email 2.26.2 In-Reply-To: <20201012160503.3472140-1-f4bug@amsat.org> References: <20201012160503.3472140-1-f4bug@amsat.org> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @gmail.com) In order to be consistent with the other code base uses, rewrite slightly how the MIPS_MALTA object is created. No logical change. Signed-off-by: Philippe Mathieu-Daud=C3=A9 Reviewed-by: Richard Henderson --- hw/mips/malta.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/hw/mips/malta.c b/hw/mips/malta.c index fe8f6f7ef51..6c447d159e3 100644 --- a/hw/mips/malta.c +++ b/hw/mips/malta.c @@ -1231,11 +1231,11 @@ void mips_malta_init(MachineState *machine) DriveInfo *dinfo; int fl_idx =3D 0; int be; + MaltaState *s; + DeviceState *dev; =20 - DeviceState *dev =3D qdev_new(TYPE_MIPS_MALTA); - MaltaState *s =3D MIPS_MALTA(dev); - - sysbus_realize_and_unref(SYS_BUS_DEVICE(dev), &error_fatal); + s =3D MIPS_MALTA(qdev_new(TYPE_MIPS_MALTA)); + sysbus_realize_and_unref(SYS_BUS_DEVICE(s), &error_fatal); =20 /* create CPU */ mips_create_cpu(machine, s, &cbus_irq, &i8259_irq); --=20 2.26.2