From nobody Sun May 19 21:02:46 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=1589124607; cv=none; d=zohomail.com; s=zohoarc; b=mWXGxKcmlONFCXpc9mGXsUG/CGXz/0I71hgCQ2aOAvlLcRmJkGlKe4ZISJkavdKRE60F1l+1B1f9C31pKV8Map33X4g4YbW5bo8ts0pWnTJp8sng5jD4Yy2KLRD6/87ujE0duWdzsyXASFvYPHODu+zTe/HuURiEUa0r0J7Vua4= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1589124607; 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=FTIVyDAEBMzFrxhPmJ8SqTBQ9LJJn+QNrQQoHkrH+DU=; b=R2Q3fbtFkY4XcLtqjSZ5Vu9DwvQSQOgciZkfiYxspq5KuEhfJfzf6xDG2PGerAukPK+2fL7lsnuDyhtR/i/2omkaIYNWXsB/ZnmGcJ9/f1sNr6FcIgLstw6iTxVeyf8kKszZ1t2HZdTNdFCpVtRfzLVc5WlmtbON8R0TVcpcoME= 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 1589124607497385.99675620271216; Sun, 10 May 2020 08:30:07 -0700 (PDT) Received: from localhost ([::1]:42936 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jXnu2-0007Zy-3k for importer@patchew.org; Sun, 10 May 2020 11:30:06 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:52522) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1jXnsl-00068X-UW for qemu-devel@nongnu.org; Sun, 10 May 2020 11:28:47 -0400 Received: from mail-wr1-x442.google.com ([2a00:1450:4864:20::442]:36499) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1jXnsl-0000yV-5J for qemu-devel@nongnu.org; Sun, 10 May 2020 11:28:47 -0400 Received: by mail-wr1-x442.google.com with SMTP id y16so552166wrs.3 for ; Sun, 10 May 2020 08:28:46 -0700 (PDT) Received: from localhost.localdomain (17.red-88-21-202.staticip.rima-tde.net. [88.21.202.17]) by smtp.gmail.com with ESMTPSA id a67sm24186702wmc.30.2020.05.10.08.28.44 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 10 May 2020 08:28:45 -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=FTIVyDAEBMzFrxhPmJ8SqTBQ9LJJn+QNrQQoHkrH+DU=; b=msAsWSOdS3qpXwtqo0IYXM3g7YUfgKFsiIUQKUYL2NWy5aA3/NQSuBnOTcAlH9p33a UZSmuWWJerlcAIEcnDQW45V46Noe3XfBbpJwG0gYSVPsWP3gjGLX/zAsKrwNPf6s5OUC miLsWb9nqjX/ASTB6O2MtORqm907xacoV9LCVTAdB9ZLYfLpg4rKNRCFTJ9aDFuop0rx h//PB7STDUUx1KUbmi0eciZr9DcDQcMlKCOT+6wcFA4cFs4jH43n6qA8JlkbhJreiExo Nv/Il7+jf+f3AvzW48OyVzNmnK7JeUP3987SNoYatKR4H/iyrhOiZCIAywuYTfSuHp7s Q3jQ== 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=FTIVyDAEBMzFrxhPmJ8SqTBQ9LJJn+QNrQQoHkrH+DU=; b=L3HDSX2f3OTIj2XMsYSNAki37WBZTUxcKqP5CImApX0KQ9O3iBy5oEWU1NlAMsqM4u aQeTO3IUWj3G0CKv+vw1KFChGmQ24GchT4irF3FAQ0mimfvvYb4Dp64XDhyVft5xJg1C JwVojK+7mFIFStWo3QTMnGjYeYoM1a7W3kXzRzvZejBNCDlbC7UFUPRf3+f79LWtV/oF NX5culJA0/2oVQeP2gBCU0BAmFdwNi89x+MvutSQz7vS17giThG+4U0vnXyUa2eur3OS yB/ipIJ5NNJf+LJfyjYtoQPT0Ok3ZH78F2BKi7rFu/3L7xCD70J+INhMx5ZjcU8ZSu+v 1t7g== X-Gm-Message-State: AGi0PubAhcQmEWEKchdKDkoGjUHjE5yu04+2uSPTCOeKPd7+l2SHo8YQ h23iFeiO+nsYL7tWleSPOkwWCQgxc4c= X-Google-Smtp-Source: APiQypI678r+4XFWrK/Ku+Vu7xlEl2s034DWyKkhgo6vH7aCtp/LpNJiDsZREj0SgAkWekN2tsbkrg== X-Received: by 2002:a5d:5189:: with SMTP id k9mr13755787wrv.3.1589124525626; Sun, 10 May 2020 08:28:45 -0700 (PDT) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Subject: [PATCH 1/7] hw/sparc/sun4m: Use UnimplementedDevice for I/O devices Date: Sun, 10 May 2020 17:28:34 +0200 Message-Id: <20200510152840.13558-2-f4bug@amsat.org> X-Mailer: git-send-email 2.21.3 In-Reply-To: <20200510152840.13558-1-f4bug@amsat.org> References: <20200510152840.13558-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::442; envelope-from=philippe.mathieu.daude@gmail.com; helo=mail-wr1-x442.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: -16 X-Spam_score: -1.7 X-Spam_bar: - X-Spam_report: (-1.7 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_EF=-0.1, FREEMAIL_FORGED_FROMDOMAIN=0.001, FREEMAIL_FROM=0.001, HEADER_FROM_DIFFERENT_DOMAINS=0.249, RCVD_IN_DNSWL_NONE=-0.0001, SPF_PASS=-0.001, URIBL_BLOCKED=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: Peter Maydell , Mark Cave-Ayland , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Aleksandar Markovic , Artyom Tarasenko , Aleksandar Rikalo , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Aurelien Jarno Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) These devices are not slots on a bus, but real I/O devices that we do not implement. As the ISDN ROM would be a ROMD device, also model it as UnimplementedDevice. Reviewed-by: Artyom Tarasenko Signed-off-by: Philippe Mathieu-Daud=C3=A9 Acked-by: Artyom Tarasenko --- hw/sparc/sun4m.c | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/hw/sparc/sun4m.c b/hw/sparc/sun4m.c index 9838c5a183..f1494907b0 100644 --- a/hw/sparc/sun4m.c +++ b/hw/sparc/sun4m.c @@ -47,6 +47,7 @@ #include "hw/nvram/fw_cfg.h" #include "hw/char/escc.h" #include "hw/empty_slot.h" +#include "hw/misc/unimp.h" #include "hw/irq.h" #include "hw/loader.h" #include "elf.h" @@ -920,7 +921,7 @@ static void sun4m_hw_init(const struct sun4m_hwdef *hwd= ef, } =20 if (hwdef->sx_base) { - empty_slot_init(hwdef->sx_base, 0x2000); + create_unimplemented_device("SUNW,sx", hwdef->sx_base, 0x2000); } =20 nvram =3D m48t59_init(slavio_irq[0], hwdef->nvram_base, 0, 0x2000, 196= 8, 8); @@ -983,14 +984,16 @@ static void sun4m_hw_init(const struct sun4m_hwdef *h= wdef, if (hwdef->dbri_base) { /* ISDN chip with attached CS4215 audio codec */ /* prom space */ - empty_slot_init(hwdef->dbri_base+0x1000, 0x30); + create_unimplemented_device("SUNW,DBRI.prom", + hwdef->dbri_base + 0x1000, 0x30); /* reg space */ - empty_slot_init(hwdef->dbri_base+0x10000, 0x100); + create_unimplemented_device("SUNW,DBRI", + hwdef->dbri_base + 0x10000, 0x100); } =20 if (hwdef->bpp_base) { /* parallel port */ - empty_slot_init(hwdef->bpp_base, 0x20); + create_unimplemented_device("SUNW,bpp", hwdef->bpp_base, 0x20); } =20 initrd_size =3D 0; --=20 2.21.3 From nobody Sun May 19 21:02:46 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=1589124748; cv=none; d=zohomail.com; s=zohoarc; b=mlw+vVVt3Uz+4A3x2WkPKa1pmBjUf2TT8oNVbMCBnAL7v2uFD/8iCO5TWL7ipDw9T/EKbwvF9Ni3w+m7TAPUcNkUFpUCLfK3VpwA8nsMgfyEuxzT3IXPiNff8U+V9dXJuQ0vfHtbfFYWmI4tkBsGbjKz08kXkT++f++HcncU5rI= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1589124748; 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=3fNdIn+8vkXom2UjSJnuRhcE6SsVXVyDMS2MettPTi8=; b=j9MSXKOVmx3U/73mImzWUi2cNpf1ANT0WVXsTLZOoU0DHlgiknRn7+i/ZiqBwsf02uRHkqo4uyVuxok6oCsly2+6ZFQsGDZImaeJZfyxvVd/sdqKf1Gw/UtB/BkXcq3g0Hkzt0uIaFTX4WZGODIF3XVR6i0+5WDzJjOT0O/Pgcc= 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 1589124748538509.1354270337762; Sun, 10 May 2020 08:32:28 -0700 (PDT) Received: from localhost ([::1]:49184 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jXnwI-0002aS-95 for importer@patchew.org; Sun, 10 May 2020 11:32:26 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:52526) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1jXnsn-00069d-Go for qemu-devel@nongnu.org; Sun, 10 May 2020 11:28:49 -0400 Received: from mail-wr1-x444.google.com ([2a00:1450:4864:20::444]:36923) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1jXnsm-0000yi-TY for qemu-devel@nongnu.org; Sun, 10 May 2020 11:28:49 -0400 Received: by mail-wr1-x444.google.com with SMTP id k1so7744795wrx.4 for ; Sun, 10 May 2020 08:28:48 -0700 (PDT) Received: from localhost.localdomain (17.red-88-21-202.staticip.rima-tde.net. [88.21.202.17]) by smtp.gmail.com with ESMTPSA id a67sm24186702wmc.30.2020.05.10.08.28.45 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 10 May 2020 08:28:46 -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=3fNdIn+8vkXom2UjSJnuRhcE6SsVXVyDMS2MettPTi8=; b=h51MAUZX9uFzwwAF1hhLyLpmXvJO1sTnOKllqyl7pw4p53EfCzvRHO9Uc8MOC7arfv iZguT9JjUziMGHuU8ErE6katwJlgSAVYU42wGxY2x98pZHd9WktcgyEXGlAgQAX2uQ1T QYT611ZUzjw2jta6c2nd0ulwMcxz0hX7o+ETLOZfBkcyl9+KetloMEMG/4pGe417e0EP Y89nHmAYK5zGsn8HLzghXnCjH4qMYhksZ3lTfUYcuidORiinIdmV5SKxfsS+cbApzeWb FjZFV+EGv2Kt3F6U/DEil3aj/+ofDTa8g84RdU39rWcjvtzgtZ4EWeHxCHrx8KLMAcms 723w== 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=3fNdIn+8vkXom2UjSJnuRhcE6SsVXVyDMS2MettPTi8=; b=qGzw1WxZij+z2PoS1gkAFDb+bHH2bnl+1P7UTPnNnPOCOUokd6/rSHAuXAGpFisDTG lJOnK1IvLIMFdIq0A4n1RwIm2/DR0y+wDeZ6G5g/t6EbqZK17xhFClUuCryB3Oob1jCr U/iVglTPAUeRsjsiYpMLd88cN1PFAisJt71qxploVvtoo5pppchsQIN4EAQGzXtc5WOa T4qhNh0Q8qLHDjonA+LTESVY+W2vgJbsxqowhsEJnGmRC9MaYiZ25yRGbEow7a86qBV6 c8FSqCHSHupgmjBAFKmaWleLj+cRMzDXqMpLIxXAv6+2Rlo2xRI4Z4yOaeXzMkOEo36+ uZlg== X-Gm-Message-State: AGi0PuaKxLUPeJKzYQyZbDjiJ69/fMOCjknswNk4NEYFqoE20fcRmfPM q+6T1sR6UobUJZnEQrD4JkcUGzpkaRA= X-Google-Smtp-Source: APiQypJCyPF63FjgsoVgU66F4M6tfVUV/O0MYDveuraEQAuLLaQ+Es5MikjgA/XjpqQw7+yB932Lvg== X-Received: by 2002:a05:6000:12c2:: with SMTP id l2mr2279794wrx.133.1589124527291; Sun, 10 May 2020 08:28:47 -0700 (PDT) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Subject: [PATCH 2/7] hw/misc/empty_slot: Lower address space priority Date: Sun, 10 May 2020 17:28:35 +0200 Message-Id: <20200510152840.13558-3-f4bug@amsat.org> X-Mailer: git-send-email 2.21.3 In-Reply-To: <20200510152840.13558-1-f4bug@amsat.org> References: <20200510152840.13558-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::444; envelope-from=philippe.mathieu.daude@gmail.com; helo=mail-wr1-x444.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: -16 X-Spam_score: -1.7 X-Spam_bar: - X-Spam_report: (-1.7 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_EF=-0.1, FREEMAIL_FORGED_FROMDOMAIN=0.001, FREEMAIL_FROM=0.001, HEADER_FROM_DIFFERENT_DOMAINS=0.249, RCVD_IN_DNSWL_NONE=-0.0001, SPF_PASS=-0.001, URIBL_BLOCKED=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: Peter Maydell , Mark Cave-Ayland , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Aleksandar Markovic , Artyom Tarasenko , Aleksandar Rikalo , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Aurelien Jarno Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) Empty slots model RAZ/WI access on a bus. Since we can still (hot) plug devices on the bus, lower the slot priority, so device added later is accessed first. Signed-off-by: Philippe Mathieu-Daud=C3=A9 Acked-by: Artyom Tarasenko --- hw/core/empty_slot.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/hw/core/empty_slot.c b/hw/core/empty_slot.c index 3ba450e1ca..5ab426e965 100644 --- a/hw/core/empty_slot.c +++ b/hw/core/empty_slot.c @@ -67,7 +67,7 @@ void empty_slot_init(hwaddr addr, uint64_t slot_size) =20 qdev_init_nofail(dev); =20 - sysbus_mmio_map(s, 0, addr); + sysbus_mmio_map_overlap(s, 0, addr, -10000); } } =20 --=20 2.21.3 From nobody Sun May 19 21:02:46 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=1589124888; cv=none; d=zohomail.com; s=zohoarc; b=OWz3jQHv5uReP91ZpYnmuspQ3aJeuhPZvpqB3TcldRmI6uyDge6pgQiJNPpEgZYLz7j1tM3RVRsOft9EoqKvpNnsG5B7Qba6vrszq7vOSPDgLKVXO8KpIpM4WtQ0K5pOYLMLsD/XytmztTHB21DDgLU9rjgCh70Ia9t4NOAPRyQ= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1589124888; 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=Nhtj1jAF4qT4dfDuiPhnBSJih8Wb/3HVDfEqyCaACoc=; b=Wn46PxZLP5JiVuqAAGFW4svKnyaPQGH9gKvRE0+qIH3irT+G3F0NWM5bBGby54hwWcgHws6x9T1zyLrAsznVYUc8zhprDRB8vW4MaRtz8VbUZcRtxDnou1DFKnLU4V2Q5eWll17wTQwJNg5+Hoih3T4adZAu+Zfypfa66DPwvrE= 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 1589124888542996.4935824319653; Sun, 10 May 2020 08:34:48 -0700 (PDT) Received: from localhost ([::1]:54072 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jXnyZ-0005av-By for importer@patchew.org; Sun, 10 May 2020 11:34:47 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:52530) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1jXnsp-0006Bp-5P for qemu-devel@nongnu.org; Sun, 10 May 2020 11:28:51 -0400 Received: from mail-wr1-x444.google.com ([2a00:1450:4864:20::444]:41921) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1jXnso-0000yr-H1 for qemu-devel@nongnu.org; Sun, 10 May 2020 11:28:50 -0400 Received: by mail-wr1-x444.google.com with SMTP id g13so7719580wrb.8 for ; Sun, 10 May 2020 08:28:50 -0700 (PDT) Received: from localhost.localdomain (17.red-88-21-202.staticip.rima-tde.net. [88.21.202.17]) by smtp.gmail.com with ESMTPSA id a67sm24186702wmc.30.2020.05.10.08.28.47 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 10 May 2020 08:28:48 -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=Nhtj1jAF4qT4dfDuiPhnBSJih8Wb/3HVDfEqyCaACoc=; b=LKDZqnAw1B5EhxraXCFJv0s3xYPDrGFHCFwuF8LWC3zSrviQFQvc+S3mm4S+WdZjsa 0U2+UTywrOLHA0dSEAHQvdwilMrUYFVhk/j5/nobwNv6hI2SK6UQ75Op0ktX8B7pWIlM ZSznCdty6cNdSDBIfyPT+VhcF5PM0s6PAnTFUKuY+l310xVQjWJqWEy2X6++8P+oAB0r o1jXQ1BqKrPGy3+y4XkH0yNTin1Az9s0uI1x3AwLm++pKe7OiK1A/UA9veUmlkWFu3Wu Z9NkSR4TwiE3lde/V2ZHfkfEqtroM7q7trCqpMfBKVCAqx61S/b/Xt8yKHBLoBCgndc0 IX4g== 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=Nhtj1jAF4qT4dfDuiPhnBSJih8Wb/3HVDfEqyCaACoc=; b=rM+c1eG8E21jFhxCm28YZ8HEx0Nyz18KbZj9PJE4urx7yunMUusAfFIiw3L1uFoJE4 GN28h9hOyUbo21DPtyYx3Yiv1bUHL27ENYMJo4sBlNb4+SExxYydPNWJk5UaMsnCCuM3 KRlyYu80sBfgvpR4CfTGVLBVi0lHtZrcb2V8pZ+sTo0BlOYikKDlsb9sQ7Kt/sSEh4r+ 8ZZcsTnUPKQyk4sbGQkv4HB9gQvoTel6sHZBxpImHi2LnE2xr0NMi23c/L4viomyizOh yiSMT+r8uSneHJoBKQhrHfZ6isJe5yZC+zdL2mJGwl0sG4qmLj4kKhuHlvYZbbY8X5c8 XNgA== X-Gm-Message-State: AGi0PuaO5095NNpOcU6PC+GhIVSS+Gq/Qr1NErTqaREzfcDW5WMaqXSd CC2PmVzuF1LaUET/1+BOUhYxf9hDWLw= X-Google-Smtp-Source: APiQypK6xaZiFtQl72J2Rnx7ZWzfryDLEgDNcykWQDkjbHyeP9WanegBpZPqasopUlGsMEERBL6QTQ== X-Received: by 2002:adf:9447:: with SMTP id 65mr13973249wrq.331.1589124529112; Sun, 10 May 2020 08:28:49 -0700 (PDT) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Subject: [PATCH 3/7] hw/misc/empty_slot: Convert 'size' field as qdev property Date: Sun, 10 May 2020 17:28:36 +0200 Message-Id: <20200510152840.13558-4-f4bug@amsat.org> X-Mailer: git-send-email 2.21.3 In-Reply-To: <20200510152840.13558-1-f4bug@amsat.org> References: <20200510152840.13558-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::444; envelope-from=philippe.mathieu.daude@gmail.com; helo=mail-wr1-x444.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: -16 X-Spam_score: -1.7 X-Spam_bar: - X-Spam_report: (-1.7 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_EF=-0.1, FREEMAIL_FORGED_FROMDOMAIN=0.001, FREEMAIL_FROM=0.001, HEADER_FROM_DIFFERENT_DOMAINS=0.249, RCVD_IN_DNSWL_NONE=-0.0001, SPF_PASS=-0.001, URIBL_BLOCKED=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: Peter Maydell , Mark Cave-Ayland , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Aleksandar Markovic , Artyom Tarasenko , Aleksandar Rikalo , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Aurelien Jarno Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) Signed-off-by: Philippe Mathieu-Daud=C3=A9 Acked-by: Artyom Tarasenko --- hw/core/empty_slot.c | 15 +++++++++------ 1 file changed, 9 insertions(+), 6 deletions(-) diff --git a/hw/core/empty_slot.c b/hw/core/empty_slot.c index 5ab426e965..0df086fe98 100644 --- a/hw/core/empty_slot.c +++ b/hw/core/empty_slot.c @@ -12,6 +12,7 @@ #include "qemu/osdep.h" #include "hw/sysbus.h" #include "qemu/module.h" +#include "hw/qdev-properties.h" #include "hw/empty_slot.h" =20 //#define DEBUG_EMPTY_SLOT @@ -57,17 +58,13 @@ void empty_slot_init(hwaddr addr, uint64_t slot_size) if (slot_size > 0) { /* Only empty slots larger than 0 byte need handling. */ DeviceState *dev; - SysBusDevice *s; - EmptySlot *e; =20 dev =3D qdev_create(NULL, TYPE_EMPTY_SLOT); - s =3D SYS_BUS_DEVICE(dev); - e =3D EMPTY_SLOT(dev); - e->size =3D slot_size; =20 + qdev_prop_set_uint64(dev, "size", slot_size); qdev_init_nofail(dev); =20 - sysbus_mmio_map_overlap(s, 0, addr, -10000); + sysbus_mmio_map_overlap(SYS_BUS_DEVICE(dev), 0, addr, -10000); } } =20 @@ -80,11 +77,17 @@ static void empty_slot_realize(DeviceState *dev, Error = **errp) sysbus_init_mmio(SYS_BUS_DEVICE(dev), &s->iomem); } =20 +static Property empty_slot_properties[] =3D { + DEFINE_PROP_UINT64("size", EmptySlot, size, 0), + DEFINE_PROP_END_OF_LIST(), +}; + static void empty_slot_class_init(ObjectClass *klass, void *data) { DeviceClass *dc =3D DEVICE_CLASS(klass); =20 dc->realize =3D empty_slot_realize; + device_class_set_props(dc, empty_slot_properties); } =20 static const TypeInfo empty_slot_info =3D { --=20 2.21.3 From nobody Sun May 19 21:02:46 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=1589125017; cv=none; d=zohomail.com; s=zohoarc; b=VmqT2cCa0cG1NBXxqu0OOLV/mcZyQ/RCwq6M+PuUOA0fR3Tk1l0KDBSz4Liis9YMQzt3OitXpYv58x//NPnDPk/vQtkhlXsPR3SElPtiC36ptjXUo2ZwXhuDc5itOMnuMEDdHR2UJ67pf4dUmGVaQGaMqPsgmn0OWD07SzDb3ME= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1589125017; 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=Px9WR0XkE8GuycVpdZd0K01muDBPGEtID7KYWMZhl04=; b=IBQcK0GhNeIB0nXxYYHRWxU+d5DnorZYbM4Q9H0AkjC9XuGRcNevGnf0TH+FNPFNBoof/qIf7Z//sPVWxI5XfOVXZ90YP13f+wjb62BmjAZKws1kCcNDqT+TcA2dPVoykNUrRuvCkbwKXMCUcW8V8SGEvqmmemOMr9/ZO4KHJiA= 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 1589125017201266.404360527271; Sun, 10 May 2020 08:36:57 -0700 (PDT) Received: from localhost ([::1]:56704 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jXo0d-0006w6-Gq for importer@patchew.org; Sun, 10 May 2020 11:36:55 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:52534) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1jXnsr-0006GI-5L for qemu-devel@nongnu.org; Sun, 10 May 2020 11:28:53 -0400 Received: from mail-wr1-x443.google.com ([2a00:1450:4864:20::443]:41921) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1jXnsq-0000yz-Go for qemu-devel@nongnu.org; Sun, 10 May 2020 11:28:52 -0400 Received: by mail-wr1-x443.google.com with SMTP id g13so7719641wrb.8 for ; Sun, 10 May 2020 08:28:52 -0700 (PDT) Received: from localhost.localdomain (17.red-88-21-202.staticip.rima-tde.net. [88.21.202.17]) by smtp.gmail.com with ESMTPSA id a67sm24186702wmc.30.2020.05.10.08.28.49 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 10 May 2020 08:28:50 -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=Px9WR0XkE8GuycVpdZd0K01muDBPGEtID7KYWMZhl04=; b=Y1zj040dxOQID0WLZ0m8woVy/TYdTCDtIYrQxUxxWnGCYrKmdzVNM6+kPlv1DILaXW 2m6SPPO6V9JxqNKf7P4Xo+VsWMYUTC3fpFSHxHLUoF0+BV5ITXncxcohz6BMta4t/i87 Cpni2UjGou5VvRXgSRgbCSFiE6iiIXb2m8YUj4kab6p1rINwq5Aam3DeR/XAM6xwHOgi 2Hvsz2RAsTLlYrbH1+3fYRzhO5lvmkZ0BCbP0+elVWlsJig/MpsnSt16rTaVRktlRD1Q aajxQsRb/ef4X4uaCy07aQ0GKSD6s2DAnglLB51RFvkiov34oucCazGUT/yjt/I2lhCJ 6gew== 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=Px9WR0XkE8GuycVpdZd0K01muDBPGEtID7KYWMZhl04=; b=VAhZzJq5fLZVUW6XDQpkGSMSmXEL4T//UdQxU87lTR6W62PvC8bsIdGNuX7gp74cZv CCM0/1/x+ZSJ+x1jPMJulOGymkMKmDAKH3+WZ6K5/drTYu/t3187NE1B6VbJr9jPjO/j fjoRVjYECUTxMB+gHFh36XAA/Af3uZ5mOHgL4AXdVr3VFBmZhog0gULGg191JhxsrGMc 9IfBNvKcuLZXnhJ31KV3oonk+K1KFLf6bmNlBJ/SNFt0myiArYm/CJU+ON2/ciqqgqsI bvZPiCR8BM07oR7hsAClMaGAPfFsklPl7nnT3p3JEgu0Rlpde56Czl4vMdsAfQaApkxT fQDg== X-Gm-Message-State: AGi0PuZBBuIDj8JMVQCA0cG9cVI1r7NwtSlQQCsTbCW+UfCXG9g2KU4b zuBXWXVYntWs/842HPeS69t9z7C9l6A= X-Google-Smtp-Source: APiQypLefDygx0GN6RWBKoRnU+dqf8+G8L0kOvyE6mAKHW1LjZgq6MmF0yZdO9DDuXDqmykUm2p41w== X-Received: by 2002:adf:ec09:: with SMTP id x9mr13920736wrn.21.1589124530927; Sun, 10 May 2020 08:28:50 -0700 (PDT) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Subject: [PATCH 4/7] hw/misc/empty_slot: Add a 'name' qdev property Date: Sun, 10 May 2020 17:28:37 +0200 Message-Id: <20200510152840.13558-5-f4bug@amsat.org> X-Mailer: git-send-email 2.21.3 In-Reply-To: <20200510152840.13558-1-f4bug@amsat.org> References: <20200510152840.13558-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::443; envelope-from=philippe.mathieu.daude@gmail.com; helo=mail-wr1-x443.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: -16 X-Spam_score: -1.7 X-Spam_bar: - X-Spam_report: (-1.7 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_EF=-0.1, FREEMAIL_FORGED_FROMDOMAIN=0.001, FREEMAIL_FROM=0.001, HEADER_FROM_DIFFERENT_DOMAINS=0.249, RCVD_IN_DNSWL_NONE=-0.0001, SPF_PASS=-0.001, URIBL_BLOCKED=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: Peter Maydell , Mark Cave-Ayland , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Aleksandar Markovic , Artyom Tarasenko , Aleksandar Rikalo , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Aurelien Jarno Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) Add a 'name' qdev property so when multiple slots are accessed, we can notice which one is accessed. Signed-off-by: Philippe Mathieu-Daud=C3=A9 Acked-by: Artyom Tarasenko --- hw/core/empty_slot.c | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/hw/core/empty_slot.c b/hw/core/empty_slot.c index 0df086fe98..576b276c4b 100644 --- a/hw/core/empty_slot.c +++ b/hw/core/empty_slot.c @@ -31,6 +31,7 @@ typedef struct EmptySlot { SysBusDevice parent_obj; =20 MemoryRegion iomem; + char *name; uint64_t size; } EmptySlot; =20 @@ -72,13 +73,17 @@ static void empty_slot_realize(DeviceState *dev, Error = **errp) { EmptySlot *s =3D EMPTY_SLOT(dev); =20 + if (s->name =3D=3D NULL) { + s->name =3D g_strdup("empty-slot"); + } memory_region_init_io(&s->iomem, OBJECT(s), &empty_slot_ops, s, - "empty-slot", s->size); + s->name, s->size); sysbus_init_mmio(SYS_BUS_DEVICE(dev), &s->iomem); } =20 static Property empty_slot_properties[] =3D { DEFINE_PROP_UINT64("size", EmptySlot, size, 0), + DEFINE_PROP_STRING("name", EmptySlot, name), DEFINE_PROP_END_OF_LIST(), }; =20 --=20 2.21.3 From nobody Sun May 19 21:02:46 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=1589125082; cv=none; d=zohomail.com; s=zohoarc; b=PNoakd6LKVEWeGWGF02mCVVXSc3wGC8tTmhFqweJU3P+URIIPxj1usMoG/4q9PMOiKrU0o74vOOZss1vxTmSxTsWZ6OlS8FKkwMmpmvpvNWNr6qexGzjh84VgxTFCyCR15Gpg7ZbbA0u4mp4BJYTETeacUbKXuipleny0vcullY= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1589125082; 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=JZAHSZ9/RMyf7zmTq4LzX8Lv/0TSeN7lgrmPTggBXqs=; b=d3d0HsU6C65XQVdKUYNpsR+y69WA/d6XeEF1hyw2hdIDt7I9ugB62SwErUHJQca89PIr4URRzwBDli/8W6hQX2KBbI4hfyjkad3zQAcLdgopQaI6inokXT9uBsDvKCnaWu9niJVFj0NLc9POmJjlT20Rxxv44PwBIpBWgPMBiqY= 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 1589125082522771.2244707774069; Sun, 10 May 2020 08:38:02 -0700 (PDT) Received: from localhost ([::1]:59476 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jXo1h-0008Td-7J for importer@patchew.org; Sun, 10 May 2020 11:38:01 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:52538) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1jXnss-0006JH-Um for qemu-devel@nongnu.org; Sun, 10 May 2020 11:28:54 -0400 Received: from mail-wm1-x333.google.com ([2a00:1450:4864:20::333]:35465) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1jXnss-0000zF-9b for qemu-devel@nongnu.org; Sun, 10 May 2020 11:28:54 -0400 Received: by mail-wm1-x333.google.com with SMTP id n5so1171643wmd.0 for ; Sun, 10 May 2020 08:28:53 -0700 (PDT) Received: from localhost.localdomain (17.red-88-21-202.staticip.rima-tde.net. [88.21.202.17]) by smtp.gmail.com with ESMTPSA id a67sm24186702wmc.30.2020.05.10.08.28.51 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 10 May 2020 08:28:51 -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=JZAHSZ9/RMyf7zmTq4LzX8Lv/0TSeN7lgrmPTggBXqs=; b=NRL5funxvIR+mwEtIZiowPP+soIu5SGLOtHPcDKMfHP70XokVySO9O2gQh1m/39F17 yN4lI8wJMSwxt30AVojmpTrz2RusfVLHlYSCW1c+d2CkoadbcYMbGO/QI+9OlZ3Q7Gvn jjJ9NfTkOD6IMKtkUAQvWKwZXNd7gCSjkYC1VdUxPQ7i5nDwRXYq+GLVEbw6QvOCxjOR 1B60bHhKpfLOjjiER54NBvrtgUBCkiur2edYM+VHluxIBItiGkAH3fXKBES6MkPUIjqN RqXlSmmaP59BxPpmWp4eojlVat3vTbF3DKTmn//N2oVTUdH5mZkXnBBikyFQ85P8vxnQ 3pnA== 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=JZAHSZ9/RMyf7zmTq4LzX8Lv/0TSeN7lgrmPTggBXqs=; b=OhxTFV7uiklfQKDAKF7Nxfkc4Rrx0rgRXFMvu5btnvan1Rw64PLA6tuwMYW1r2ua09 HRuR+Hx8oVzcTWIyFJAprWE9XVslvyPDJtsSxe9MCJeh7xxvrWogkTYiUUqUr6k3D565 6G4SXWi/+d1Wl5BGY4FxWIp9UxybFRE0BefBHRf0mLepI3+posJGboso5XizdJTVjMuw FgyqAe5JcGj1MK+Jt+gRK0JIzSa3J1d+lM8lSYiNMPOiU30Ux1ggiXIJwpNkWeJBNNXo 1Pk8x36ILcTf4nIiORxnS9G4ff4tFej0gNkKCJaBry1BFRlV7y2jnPIt3v6JE1y401rr +GAQ== X-Gm-Message-State: AGi0PuZ5eLJsQNNf/ubNAw9cThZ1n5Bs5f9m5CgMIBpATfXHo7KNq8X2 +6cyh1RfgjCGRSh7mkiYLI6IhTGrwMo= X-Google-Smtp-Source: APiQypIl/8NFotEUeOhN7zQSLmjcsU2xY2JrpUpw6dFhOp8vuiNFPoN38lGFtfb3kxj76GWHuSOwuw== X-Received: by 2002:a05:600c:22d1:: with SMTP id 17mr25486101wmg.167.1589124532669; Sun, 10 May 2020 08:28:52 -0700 (PDT) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Subject: [PATCH 5/7] hw/misc/empty_slot: Convert debug printf() to trace event Date: Sun, 10 May 2020 17:28:38 +0200 Message-Id: <20200510152840.13558-6-f4bug@amsat.org> X-Mailer: git-send-email 2.21.3 In-Reply-To: <20200510152840.13558-1-f4bug@amsat.org> References: <20200510152840.13558-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::333; envelope-from=philippe.mathieu.daude@gmail.com; helo=mail-wm1-x333.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: -16 X-Spam_score: -1.7 X-Spam_bar: - X-Spam_report: (-1.7 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_EF=-0.1, FREEMAIL_FORGED_FROMDOMAIN=0.001, FREEMAIL_FROM=0.001, HEADER_FROM_DIFFERENT_DOMAINS=0.249, RCVD_IN_DNSWL_NONE=-0.0001, SPF_PASS=-0.001, URIBL_BLOCKED=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: Peter Maydell , Mark Cave-Ayland , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Aleksandar Markovic , Artyom Tarasenko , Aleksandar Rikalo , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Aurelien Jarno Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) Signed-off-by: Philippe Mathieu-Daud=C3=A9 Acked-by: Artyom Tarasenko --- hw/core/empty_slot.c | 19 ++++++++----------- hw/core/trace-events | 4 ++++ 2 files changed, 12 insertions(+), 11 deletions(-) diff --git a/hw/core/empty_slot.c b/hw/core/empty_slot.c index 576b276c4b..d28f7f99c9 100644 --- a/hw/core/empty_slot.c +++ b/hw/core/empty_slot.c @@ -14,15 +14,7 @@ #include "qemu/module.h" #include "hw/qdev-properties.h" #include "hw/empty_slot.h" - -//#define DEBUG_EMPTY_SLOT - -#ifdef DEBUG_EMPTY_SLOT -#define DPRINTF(fmt, ...) \ - do { printf("empty_slot: " fmt , ## __VA_ARGS__); } while (0) -#else -#define DPRINTF(fmt, ...) do {} while (0) -#endif +#include "trace.h" =20 #define TYPE_EMPTY_SLOT "empty_slot" #define EMPTY_SLOT(obj) OBJECT_CHECK(EmptySlot, (obj), TYPE_EMPTY_SLOT) @@ -38,14 +30,19 @@ typedef struct EmptySlot { static uint64_t empty_slot_read(void *opaque, hwaddr addr, unsigned size) { - DPRINTF("read from " TARGET_FMT_plx "\n", addr); + EmptySlot *s =3D EMPTY_SLOT(opaque); + + trace_empty_slot_write(addr, size << 1, 0, size, s->name); + return 0; } =20 static void empty_slot_write(void *opaque, hwaddr addr, uint64_t val, unsigned size) { - DPRINTF("write 0x%x to " TARGET_FMT_plx "\n", (unsigned)val, addr); + EmptySlot *s =3D EMPTY_SLOT(opaque); + + trace_empty_slot_write(addr, size << 1, val, size, s->name); } =20 static const MemoryRegionOps empty_slot_ops =3D { diff --git a/hw/core/trace-events b/hw/core/trace-events index 1ac60ede6b..bbb68fb6f0 100644 --- a/hw/core/trace-events +++ b/hw/core/trace-events @@ -34,3 +34,7 @@ clock_disconnect(const char *clk) "'%s'" clock_set(const char *clk, uint64_t old, uint64_t new) "'%s', ns=3D%"PRIu6= 4"->%"PRIu64 clock_propagate(const char *clk) "'%s'" clock_update(const char *clk, const char *src, uint64_t val, int cb) "'%s'= , src=3D'%s', ns=3D%"PRIu64", cb=3D%d" + +# empty_slot.c +empty_slot_read(uint64_t addr, unsigned width, uint64_t value, unsigned si= ze, const char *name) "rd addr:0x%04"PRIx64" data:0x%0*"PRIx64" size %u [%s= ]" +empty_slot_write(uint64_t addr, unsigned width, uint64_t value, unsigned s= ize, const char *name) "wr addr:0x%04"PRIx64" data:0x%0*"PRIx64" size %u [%= s]" --=20 2.21.3 From nobody Sun May 19 21:02:46 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=1589124754; cv=none; d=zohomail.com; s=zohoarc; b=gVtr3lHnviAzmzbVkb7cx+YjP6r1soi5/lRj9roQKrlVkGAnNed+PjZ6pLmNgsl/4k9w9cpSxSufJnEDJ42Q5X8a/E0izr87Te/oXAjJ7G4rykghOYACa/W5MYJPYEoUPBCl9nDXJT5vlc7ZfY4B+OIQcoJZIwR/COFjAc+qb+M= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1589124754; 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=82V5GgTEA4sxu6tyoxHnsvtnkbf5Xt52I34BpoyJ+2A=; b=QANHdFTfw2DD5thb1Kb3P8mMhXVngnMmFfDDC679f7C7xdX4M2B0vUzamzd2Rb99xReocFIR7FXNNkBgG8zg5A7B97iZzU5lyTpjAIm7OHCwJH8jvabt+j1uFw6TAFCS0VUnkBxmqmCdpmHG5JccowWj0vbpNoC1G4NDvV91IKE= 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 1589124754430247.19907753119367; Sun, 10 May 2020 08:32:34 -0700 (PDT) Received: from localhost ([::1]:49484 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jXnwO-0002ij-S3 for importer@patchew.org; Sun, 10 May 2020 11:32:33 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:52544) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1jXnsu-0006MS-Qx for qemu-devel@nongnu.org; Sun, 10 May 2020 11:28:56 -0400 Received: from mail-wr1-x442.google.com ([2a00:1450:4864:20::442]:44554) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1jXnst-0000zQ-Ts for qemu-devel@nongnu.org; Sun, 10 May 2020 11:28:56 -0400 Received: by mail-wr1-x442.google.com with SMTP id 50so7200036wrc.11 for ; Sun, 10 May 2020 08:28:55 -0700 (PDT) Received: from localhost.localdomain (17.red-88-21-202.staticip.rima-tde.net. [88.21.202.17]) by smtp.gmail.com with ESMTPSA id a67sm24186702wmc.30.2020.05.10.08.28.52 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 10 May 2020 08:28:53 -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=82V5GgTEA4sxu6tyoxHnsvtnkbf5Xt52I34BpoyJ+2A=; b=s8/t+AXDzFapMBJaejE4iS/+aa9AUbDl/Kv5o7QC57UgNNFx7NOGe+t7slzhXNXaaR +pEkseERB9TJ5R0qHYOWuSPqOrgbm0tPirxXxagTgPzbnqACNKo63iW4aufJjv0LfdKh 0J3mqTzNTkj6fU2n+aslI9InJZ2o8NlH4Oq+p7mGFTmRdFFo7RLGkw1VrArpMrCsR/B3 Gr0dRjjSiCm089qKpTfIteMuD7X0lf+/YRELI9aPYhcsPoDPjNy9h6iwEUXiXx6iH1BS aGciz3J96IJQe5HEbmOlXttULKR+BUkxwf3jDxpIwE0lKj7aWMhAowHRi4pB17Y+WyIf 8LNw== 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=82V5GgTEA4sxu6tyoxHnsvtnkbf5Xt52I34BpoyJ+2A=; b=iLD1QGrSkBDKGVdl0+AgtydB1C7xgcQnptOO+6SOfE7jWvjP1Mu6PaRD9ggHIrVUnc GX9s/KaNPHHOaAPba1yDLuS7eOSbc4R3wDxcpp7yIyUUWw1KyFlepwtANESVZLhLKRiR yDCy6Z3z7Wuwcc7c76lC1p2MPjcIkSk39Mjwfynw86TVNCstqQk7R9XjM1A359aBa2KG UT9dEnrXIE0xeLIZ7LzCfenm6Wm9YNtpZTelABVzlds8ON5HoeODxRKmfABbFo42aPfO 3dncGhUvA1+EnLVAui4PyG5vH1qo7Wq2yy0K734/zMCEDSi6k8QekGExwPgfI6FOZQft UYlQ== X-Gm-Message-State: AGi0PuZZY8LVOr+BZmZlwQ6gl0DprmXE3mto/VsJONq+YYgJ6XFD5pf8 x4T+k1aRBVjJGZaL++gC0VDpIiQG9j4= X-Google-Smtp-Source: APiQypIsczIcP/H/5AiuZU7eoBu3/brk1uLl/8diOImqPIOpoS0cExtEnrCCYMp+TCBILR8JsOcdVA== X-Received: by 2002:adf:e388:: with SMTP id e8mr13716723wrm.174.1589124534279; Sun, 10 May 2020 08:28:54 -0700 (PDT) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Subject: [PATCH 6/7] hw/misc/empty_slot: Move the 'hw/misc' and cover in MAINTAINERS Date: Sun, 10 May 2020 17:28:39 +0200 Message-Id: <20200510152840.13558-7-f4bug@amsat.org> X-Mailer: git-send-email 2.21.3 In-Reply-To: <20200510152840.13558-1-f4bug@amsat.org> References: <20200510152840.13558-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::442; envelope-from=philippe.mathieu.daude@gmail.com; helo=mail-wr1-x442.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: -16 X-Spam_score: -1.7 X-Spam_bar: - X-Spam_report: (-1.7 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_EF=-0.1, FREEMAIL_FORGED_FROMDOMAIN=0.001, FREEMAIL_FROM=0.001, HEADER_FROM_DIFFERENT_DOMAINS=0.249, RCVD_IN_DNSWL_NONE=-0.0001, SPF_PASS=-0.001, URIBL_BLOCKED=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: Peter Maydell , Mark Cave-Ayland , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Aleksandar Markovic , Artyom Tarasenko , Aleksandar Rikalo , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Aurelien Jarno Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) As this device model is very similar to the UnimplementedDevice, maintain them altogether. Signed-off-by: Philippe Mathieu-Daud=C3=A9 Acked-by: Artyom Tarasenko --- include/hw/empty_slot.h | 9 --------- include/hw/misc/empty_slot.h | 19 +++++++++++++++++++ hw/mips/mips_malta.c | 2 +- hw/{core =3D> misc}/empty_slot.c | 4 ++-- hw/sparc/sun4m.c | 2 +- MAINTAINERS | 4 +++- hw/core/Makefile.objs | 1 - hw/core/trace-events | 4 ---- hw/misc/Makefile.objs | 1 + hw/misc/trace-events | 4 ++++ 10 files changed, 31 insertions(+), 19 deletions(-) delete mode 100644 include/hw/empty_slot.h create mode 100644 include/hw/misc/empty_slot.h rename hw/{core =3D> misc}/empty_slot.c (96%) diff --git a/include/hw/empty_slot.h b/include/hw/empty_slot.h deleted file mode 100644 index cb9a221aa6..0000000000 --- a/include/hw/empty_slot.h +++ /dev/null @@ -1,9 +0,0 @@ -#ifndef HW_EMPTY_SLOT_H -#define HW_EMPTY_SLOT_H - -#include "exec/hwaddr.h" - -/* empty_slot.c */ -void empty_slot_init(hwaddr addr, uint64_t slot_size); - -#endif diff --git a/include/hw/misc/empty_slot.h b/include/hw/misc/empty_slot.h new file mode 100644 index 0000000000..b023bc2d91 --- /dev/null +++ b/include/hw/misc/empty_slot.h @@ -0,0 +1,19 @@ +/* + * QEMU Empty Slot + * + * The empty_slot device emulates known to a bus but not connected devices. + * + * Copyright (c) 2010 Artyom Tarasenko + * + * This code is licensed under the GNU GPL v2 or (at your option) any later + * version. + */ + +#ifndef HW_EMPTY_SLOT_H +#define HW_EMPTY_SLOT_H + +#include "exec/hwaddr.h" + +void empty_slot_init(hwaddr addr, uint64_t slot_size); + +#endif diff --git a/hw/mips/mips_malta.c b/hw/mips/mips_malta.c index e4c4de1b4e..30ed3c1538 100644 --- a/hw/mips/mips_malta.c +++ b/hw/mips/mips_malta.c @@ -52,7 +52,7 @@ #include "sysemu/runstate.h" #include "qapi/error.h" #include "qemu/error-report.h" -#include "hw/empty_slot.h" +#include "hw/misc/empty_slot.h" #include "sysemu/kvm.h" #include "hw/semihosting/semihost.h" #include "hw/mips/cps.h" diff --git a/hw/core/empty_slot.c b/hw/misc/empty_slot.c similarity index 96% rename from hw/core/empty_slot.c rename to hw/misc/empty_slot.c index d28f7f99c9..54be085189 100644 --- a/hw/core/empty_slot.c +++ b/hw/misc/empty_slot.c @@ -11,9 +11,8 @@ =20 #include "qemu/osdep.h" #include "hw/sysbus.h" -#include "qemu/module.h" #include "hw/qdev-properties.h" -#include "hw/empty_slot.h" +#include "hw/misc/empty_slot.h" #include "trace.h" =20 #define TYPE_EMPTY_SLOT "empty_slot" @@ -90,6 +89,7 @@ static void empty_slot_class_init(ObjectClass *klass, voi= d *data) =20 dc->realize =3D empty_slot_realize; device_class_set_props(dc, empty_slot_properties); + set_bit(DEVICE_CATEGORY_MISC, dc->categories); } =20 static const TypeInfo empty_slot_info =3D { diff --git a/hw/sparc/sun4m.c b/hw/sparc/sun4m.c index f1494907b0..6030900124 100644 --- a/hw/sparc/sun4m.c +++ b/hw/sparc/sun4m.c @@ -46,7 +46,7 @@ #include "hw/nvram/chrp_nvram.h" #include "hw/nvram/fw_cfg.h" #include "hw/char/escc.h" -#include "hw/empty_slot.h" +#include "hw/misc/empty_slot.h" #include "hw/misc/unimp.h" #include "hw/irq.h" #include "hw/loader.h" diff --git a/MAINTAINERS b/MAINTAINERS index 1f84e3ae2c..3e0c2089f1 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -1829,11 +1829,13 @@ F: docs/specs/vmgenid.txt F: tests/qtest/vmgenid-test.c F: stubs/vmgenid.c =20 -Unimplemented device +Unimplemented device and empty slot M: Peter Maydell R: Philippe Mathieu-Daud=C3=A9 S: Maintained +F: include/hw/misc/empty_slot.h F: include/hw/misc/unimp.h +F: hw/misc/empty_slot.c F: hw/misc/unimp.c =20 Standard VGA diff --git a/hw/core/Makefile.objs b/hw/core/Makefile.objs index 1d540ed6e7..d8fee8effe 100644 --- a/hw/core/Makefile.objs +++ b/hw/core/Makefile.objs @@ -24,7 +24,6 @@ common-obj-$(CONFIG_SOFTMMU) +=3D numa.o common-obj-$(CONFIG_SOFTMMU) +=3D clock-vmstate.o obj-$(CONFIG_SOFTMMU) +=3D machine-qmp-cmds.o =20 -common-obj-$(CONFIG_EMPTY_SLOT) +=3D empty_slot.o common-obj-$(CONFIG_XILINX_AXI) +=3D stream.o common-obj-$(CONFIG_PTIMER) +=3D ptimer.o common-obj-$(CONFIG_FITLOADER) +=3D loader-fit.o diff --git a/hw/core/trace-events b/hw/core/trace-events index bbb68fb6f0..1ac60ede6b 100644 --- a/hw/core/trace-events +++ b/hw/core/trace-events @@ -34,7 +34,3 @@ clock_disconnect(const char *clk) "'%s'" clock_set(const char *clk, uint64_t old, uint64_t new) "'%s', ns=3D%"PRIu6= 4"->%"PRIu64 clock_propagate(const char *clk) "'%s'" clock_update(const char *clk, const char *src, uint64_t val, int cb) "'%s'= , src=3D'%s', ns=3D%"PRIu64", cb=3D%d" - -# empty_slot.c -empty_slot_read(uint64_t addr, unsigned width, uint64_t value, unsigned si= ze, const char *name) "rd addr:0x%04"PRIx64" data:0x%0*"PRIx64" size %u [%s= ]" -empty_slot_write(uint64_t addr, unsigned width, uint64_t value, unsigned s= ize, const char *name) "wr addr:0x%04"PRIx64" data:0x%0*"PRIx64" size %u [%= s]" diff --git a/hw/misc/Makefile.objs b/hw/misc/Makefile.objs index 68aae2eabb..e377842920 100644 --- a/hw/misc/Makefile.objs +++ b/hw/misc/Makefile.objs @@ -10,6 +10,7 @@ common-obj-$(CONFIG_EDU) +=3D edu.o common-obj-$(CONFIG_PCA9552) +=3D pca9552.o =20 common-obj-$(CONFIG_UNIMP) +=3D unimp.o +common-obj-$(CONFIG_EMPTY_SLOT) +=3D empty_slot.o common-obj-$(CONFIG_FW_CFG_DMA) +=3D vmcoreinfo.o =20 # ARM devices diff --git a/hw/misc/trace-events b/hw/misc/trace-events index a5862b2bed..0cb4c64ae7 100644 --- a/hw/misc/trace-events +++ b/hw/misc/trace-events @@ -39,6 +39,10 @@ ecc_mem_readl_ecr1(uint32_t ret) "Read event count 2 0x%= 08x" ecc_diag_mem_writeb(uint64_t addr, uint32_t val) "Write diagnostic %"PRId6= 4" =3D 0x%02x" ecc_diag_mem_readb(uint64_t addr, uint32_t ret) "Read diagnostic %"PRId64"= =3D 0x%02x" =20 +# empty_slot.c +empty_slot_read(uint64_t addr, unsigned width, uint64_t value, unsigned si= ze, const char *name) "rd addr:0x%04"PRIx64" data:0x%0*"PRIx64" size %u [%s= ]" +empty_slot_write(uint64_t addr, unsigned width, uint64_t value, unsigned s= ize, const char *name) "wr addr:0x%04"PRIx64" data:0x%0*"PRIx64" size %u [%= s]" + # slavio_misc.c slavio_misc_update_irq_raise(void) "Raise IRQ" slavio_misc_update_irq_lower(void) "Lower IRQ" --=20 2.21.3 From nobody Sun May 19 21:02:46 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=1589124618; cv=none; d=zohomail.com; s=zohoarc; b=ZTs8CzFiHywcHpr3XCZVjU/1cOSvadSqY3L9rgA3Wf7QcnFI8Nbq5juqpGIsJtxZVk7ffxHGXewyQbFieEkEvZtHf8liAp/qzeYfxStR4UyjD9XaFI1Sp8qEfOQwrLlY7Cf6rYZAwu9xregDGTvbj/NoZfXXQkyId2Pt/P9HbEE= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1589124618; 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=QRalvaDaYvhVirD34yrdH3n7kI/+oLwzkO7pUTRzFo0=; b=DH/4WaY1kILQXbNMbpUJEIdDqv/FGn4XCEPLsq1C7mZlbJqwLvi/zi4Mb78ROmdADo7J2uLqT63icOAHJblV8jDIG29TKLsKKz1lCR/wuwx+5qPU46TR3P7ZphwLEajdM1ClUMtxhIovIQD2XUyEQRocdRLngEDLOjlYKc59MHM= 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 1589124618641185.01738652658287; Sun, 10 May 2020 08:30:18 -0700 (PDT) Received: from localhost ([::1]:43708 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jXnuD-00083J-CQ for importer@patchew.org; Sun, 10 May 2020 11:30:17 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:52548) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1jXnsw-0006Ok-6W for qemu-devel@nongnu.org; Sun, 10 May 2020 11:28:58 -0400 Received: from mail-wm1-x344.google.com ([2a00:1450:4864:20::344]:40245) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1jXnsv-0000zU-GO for qemu-devel@nongnu.org; Sun, 10 May 2020 11:28:57 -0400 Received: by mail-wm1-x344.google.com with SMTP id u16so16046582wmc.5 for ; Sun, 10 May 2020 08:28:57 -0700 (PDT) Received: from localhost.localdomain (17.red-88-21-202.staticip.rima-tde.net. [88.21.202.17]) by smtp.gmail.com with ESMTPSA id a67sm24186702wmc.30.2020.05.10.08.28.54 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 10 May 2020 08:28:55 -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=QRalvaDaYvhVirD34yrdH3n7kI/+oLwzkO7pUTRzFo0=; b=MAQdvNsRriClSajCP0qe7AQVAt/3didUQJvymUzotBN4+qrhr8u/jpf1+s9NQlENC8 pPZeWdjhm78cBMM8B5jWJavJnCnqN9ZXGGAR3f39aCi4Wfi1/PUDPjQbC8hgPOD+Vb7b FMJNXCwjPVrIgZ/LWloV1lpJkhXui763JHhG0nqhKvkXzLGU3QK2lVD/Mjof0q9jm0VG S6D7g3W1Hyk+8VxpArfo3m3RYWJc8u15+3Ud48GUugeWI0OxKacJ7P8S5excm/PiYMMo mkOSuYohdolhFePY5M9I/Xt1O5J/YAkAeja5hOh9RV79NlRTzbLroZCjK5EInobmbj2M +DIQ== 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=QRalvaDaYvhVirD34yrdH3n7kI/+oLwzkO7pUTRzFo0=; b=hvXFFvPnkzvaywXskd99FUhQwi4yJtPYl9P1JS//d0Cfr6MfT7aqnLVQStN++y6tly HTYL+7HCW9Vd9KxmQiSoFXs1pInUUyjANLufUUPkI9sSoIIC9xMyHmO8A5yVoj4NC2vY DZwwFyooTtkeZJbhwMkXvzupVAeoFrWlimxQx7eIlQp90XwgVzHUTZMGfY3sZZT+aJIX 1Xgvs5Q6PiuUN31+lPblOshPcL8TA3hWSmDMCWFTI8ggxU/WwLH4AJPmSrNDxjmpeuaM qMZ33DJiE8lBNcl+MgE/mlhIP85HHzS2YBcQsHjFyChxZdMDX0VVQe0ifYIWUETXuVXL L07w== X-Gm-Message-State: AGi0PubgJuh4qmfq3kvlr6uxWnJsA2+gllGJ3BGIlQK5z2Ao+1vePosS nYs9mCkXjCpPuMEIKwiOC0egOw33sMY= X-Google-Smtp-Source: APiQypI9oWUOlY5F/2OI2ZaOkNiVZrvbm/i7pqdRAJUjtAna876jqVb/i35c/xjhk9r3HMgQbASGtA== X-Received: by 2002:a05:600c:22d3:: with SMTP id 19mr2499082wmg.161.1589124535953; Sun, 10 May 2020 08:28:55 -0700 (PDT) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Subject: [PATCH 7/7] hw/misc/empty_slot: Name the slots when created Date: Sun, 10 May 2020 17:28:40 +0200 Message-Id: <20200510152840.13558-8-f4bug@amsat.org> X-Mailer: git-send-email 2.21.3 In-Reply-To: <20200510152840.13558-1-f4bug@amsat.org> References: <20200510152840.13558-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::344; envelope-from=philippe.mathieu.daude@gmail.com; helo=mail-wm1-x344.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: -16 X-Spam_score: -1.7 X-Spam_bar: - X-Spam_report: (-1.7 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_EF=-0.1, FREEMAIL_FORGED_FROMDOMAIN=0.001, FREEMAIL_FROM=0.001, HEADER_FROM_DIFFERENT_DOMAINS=0.249, RCVD_IN_DNSWL_NONE=-0.0001, SPF_PASS=-0.001, URIBL_BLOCKED=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: Peter Maydell , Mark Cave-Ayland , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Aleksandar Markovic , Artyom Tarasenko , Aleksandar Rikalo , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Aurelien Jarno Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) Directly set the slot name when creating the device, to display the device name in trace events. Signed-off-by: Philippe Mathieu-Daud=C3=A9 Acked-by: Artyom Tarasenko --- include/hw/misc/empty_slot.h | 2 +- hw/mips/mips_malta.c | 2 +- hw/misc/empty_slot.c | 2 +- hw/sparc/sun4m.c | 10 +++++++--- 4 files changed, 10 insertions(+), 6 deletions(-) diff --git a/include/hw/misc/empty_slot.h b/include/hw/misc/empty_slot.h index b023bc2d91..dec56e56ae 100644 --- a/include/hw/misc/empty_slot.h +++ b/include/hw/misc/empty_slot.h @@ -14,6 +14,6 @@ =20 #include "exec/hwaddr.h" =20 -void empty_slot_init(hwaddr addr, uint64_t slot_size); +void empty_slot_init(const char *name, hwaddr addr, uint64_t slot_size); =20 #endif diff --git a/hw/mips/mips_malta.c b/hw/mips/mips_malta.c index 30ed3c1538..c6e31a8fb2 100644 --- a/hw/mips/mips_malta.c +++ b/hw/mips/mips_malta.c @@ -1246,7 +1246,7 @@ void mips_malta_init(MachineState *machine) * exception when accessing invalid memory. Create an empty slot to * emulate this feature. */ - empty_slot_init(0, 0x20000000); + empty_slot_init("GT64120", 0, 0x20000000); =20 qdev_init_nofail(dev); =20 diff --git a/hw/misc/empty_slot.c b/hw/misc/empty_slot.c index 54be085189..b568ae202b 100644 --- a/hw/misc/empty_slot.c +++ b/hw/misc/empty_slot.c @@ -50,7 +50,7 @@ static const MemoryRegionOps empty_slot_ops =3D { .endianness =3D DEVICE_NATIVE_ENDIAN, }; =20 -void empty_slot_init(hwaddr addr, uint64_t slot_size) +void empty_slot_init(const char *name, hwaddr addr, uint64_t slot_size) { if (slot_size > 0) { /* Only empty slots larger than 0 byte need handling. */ diff --git a/hw/sparc/sun4m.c b/hw/sparc/sun4m.c index 6030900124..3ef615fbbe 100644 --- a/hw/sparc/sun4m.c +++ b/hw/sparc/sun4m.c @@ -836,7 +836,8 @@ static void sun4m_hw_init(const struct sun4m_hwdef *hwd= ef, =20 /* models without ECC don't trap when missing ram is accessed */ if (!hwdef->ecc_base) { - empty_slot_init(machine->ram_size, hwdef->max_mem - machine->ram_s= ize); + empty_slot_init("ecc", machine->ram_size, + hwdef->max_mem - machine->ram_size); } =20 prom_init(hwdef->slavio_base, bios_name); @@ -867,7 +868,8 @@ static void sun4m_hw_init(const struct sun4m_hwdef *hwd= ef, Software shouldn't use aliased addresses, neither should it cra= sh when does. Using empty_slot instead of aliasing can help with debugging such accesses */ - empty_slot_init(hwdef->iommu_pad_base,hwdef->iommu_pad_len); + empty_slot_init("iommu.alias", + hwdef->iommu_pad_base, hwdef->iommu_pad_len); } =20 sparc32_dma_init(hwdef->dma_base, @@ -916,7 +918,9 @@ static void sun4m_hw_init(const struct sun4m_hwdef *hwd= ef, for (i =3D 0; i < MAX_VSIMMS; i++) { /* vsimm registers probed by OBP */ if (hwdef->vsimm[i].reg_base) { - empty_slot_init(hwdef->vsimm[i].reg_base, 0x2000); + char *name =3D g_strdup_printf("vsimm[%d]", i); + empty_slot_init(name, hwdef->vsimm[i].reg_base, 0x2000); + g_free(name); } } =20 --=20 2.21.3