From nobody Sat Nov 15 18:46:05 2025 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=1596701375; cv=none; d=zohomail.com; s=zohoarc; b=SuM0WwcT3ElJ9gIbvq4bRuaKfjKD8Gv+Ogn+VM2xLPfQjatd8uCCxErSchYvuvVR0WtIWzCvtf1UuJxQNaDVbz/t53afWAVY9Y+yFEqXsSchwyLrS1lSWbt9W74/fbToWlRVqJSw8J+JMM3IElzIiNYyqGOhSl7sSJzCaEp3myY= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1596701375; 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=Rq4yNdphOIo43q9Xr8hQFGdolus1VUdY6wY1oJGgT2Q=; b=jrK3douycy1UHb2DXfwWTQOaUHPwIXq3INWvxkCR8Fl0oTPNurVHOLLCVNf7KRn0vyGue/Z80vzIKA2+b0B+hSvGxzdHBokd2LheIO9U5c3v0GnvXY2k4N+MIXb+sioQ4/y9SU0HEA5YYQRPIFX7SOVgwC9XcpF/hbpOK3jZddg= 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 1596701375945590.1212975234776; Thu, 6 Aug 2020 01:09:35 -0700 (PDT) Received: from localhost ([::1]:50414 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1k3axy-0003xA-8W for importer@patchew.org; Thu, 06 Aug 2020 04:09:34 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:33738) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1k3awy-0002Fh-H0; Thu, 06 Aug 2020 04:08:32 -0400 Received: from mail-wm1-x329.google.com ([2a00:1450:4864:20::329]:54178) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1k3aww-0005ft-V9; Thu, 06 Aug 2020 04:08:32 -0400 Received: by mail-wm1-x329.google.com with SMTP id g8so8021779wmk.3; Thu, 06 Aug 2020 01:08:30 -0700 (PDT) Received: from localhost.localdomain (121.red-81-40-121.staticip.rima-tde.net. [81.40.121.121]) by smtp.gmail.com with ESMTPSA id w2sm6039587wre.5.2020.08.06.01.08.27 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 06 Aug 2020 01:08: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=Rq4yNdphOIo43q9Xr8hQFGdolus1VUdY6wY1oJGgT2Q=; b=Y4sKZyfhVIgYQSBnb5ToM2MgNHsGlJwXdbcrRG4A38e90jZYd7i+GpenAP8CSN3N+4 9gxUOQpzsLOEL462xvTKtaWDZBmJ0t+asS+jlI+Z2gOX1WrWgEPOcfTi7B24XTmlZ4fE DnQ8x3v5coa3Le9LtCxODrFvy6OoNr7YyKjdII5VC2nRaEwRt9h5JdBdhCTX9TE5Ljpe HfGUd3ZIXCCTBOD3MmskUVjDYufmpAtt+LdGZnYun1fSM3CLGOuM1zuhDsahQXHB1cgf FoQxDmYIXRo7ESl6ipy4aXzMTaJxOTYw7H6wIm6EPz5S7gWDOyG2/08yOdBYRfiAjTKz 63JA== 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=Rq4yNdphOIo43q9Xr8hQFGdolus1VUdY6wY1oJGgT2Q=; b=jzsCFS0GWIT16xxeHS1Z9gdsDWAblU/YRH2gpGOQjS4otYd9PQMvu+tK4fsycomc0y AWZv0YLDU8EPpDEPteuX0JJcVYZ769uNkRaWz4xtoBGODX9KdP9ccefFAGYK82xXl4uU wMBeOB7ic09THHs0ly4RuiHGSBcKaM2S0UXLgZzTh7FANyHZb7jyWksDf+aN2ndd3Fke bDwqoe4WjAnU4IET/3SWThbgRf3UuWxugoGaLjJuyaN2locNov7+yV2AtoeHWKshon3s sCIDNd1c8bemlQIkB5shMOqJl5kIypvrqs2R36b8SIo23YKuIUYnwsnTxcZHBTS+Q2Zl DaTA== X-Gm-Message-State: AOAM533UKweDcCoWLmpAlG5wXIAlthqPh2A6Cszl+i8X3cb4lFU18Fjv 2PpF1wBMxEJmJzwZfBa+UZO7GVQY X-Google-Smtp-Source: ABdhPJwQbqVFaRYfTEhE0ucxwIP57z1qC374zgUltvP1FF+yVb3HepGMYJcO4COGnfhxeRNCgoqA2Q== X-Received: by 2002:a1c:a78a:: with SMTP id q132mr6690408wme.27.1596701308456; Thu, 06 Aug 2020 01:08:28 -0700 (PDT) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Subject: [PATCH-for-5.2 1/7] hw/block/fdc: Let sector count be unsigned Date: Thu, 6 Aug 2020 10:08:18 +0200 Message-Id: <20200806080824.21567-2-f4bug@amsat.org> X-Mailer: git-send-email 2.21.3 In-Reply-To: <20200806080824.21567-1-f4bug@amsat.org> References: <20200806080824.21567-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::329; envelope-from=philippe.mathieu.daude@gmail.com; helo=mail-wm1-x329.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=no autolearn_force=no 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: Kevin Wolf , John Snow , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , qemu-block@nongnu.org, Max Reitz Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) Sectors count can not be negative, make it unsigned. Signed-off-by: Philippe Mathieu-Daud=C3=A9 --- hw/block/fdc.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/hw/block/fdc.c b/hw/block/fdc.c index e9ed3eef45..2cec7568c1 100644 --- a/hw/block/fdc.c +++ b/hw/block/fdc.c @@ -245,14 +245,14 @@ static void fd_init(FDrive *drv) =20 #define NUM_SIDES(drv) ((drv)->flags & FDISK_DBL_SIDES ? 2 : 1) =20 -static int fd_sector_calc(uint8_t head, uint8_t track, uint8_t sect, - uint8_t last_sect, uint8_t num_sides) +static uint32_t fd_sector_calc(uint8_t head, uint8_t track, uint8_t sect, + uint8_t last_sect, uint8_t num_sides) { return (((track * num_sides) + head) * last_sect) + sect - 1; } =20 /* Returns current position, in sectors, for given drive */ -static int fd_sector(FDrive *drv) +static uint32_t fd_sector(FDrive *drv) { return fd_sector_calc(drv->head, drv->track, drv->sect, drv->last_sect, NUM_SIDES(drv)); --=20 2.21.3 From nobody Sat Nov 15 18:46:05 2025 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=1596701376; cv=none; d=zohomail.com; s=zohoarc; b=K6dDpg+jMSOb36FsSRZIP3z40EvOZHm2mqSNIiTyzi8QCaU8fG+5s2RE9c2uDwy6tS4d+OXTomojQOLtHxxIQ8JO8t7bkwPjIkmTVB+Tb9L/GJzk5ENK+XPSZA2Oit3z32CxkbmWgCugfA7qGfw01WShb+bYbBUEVB5+YxAd5rg= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1596701376; 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=4+aXm2ggWfq1Fly1rmq/Lj+bQKm9iyQ1C1siDyh5+3o=; b=Tpk32FU0BZbhRq5uF5v473DJPWw1FrgzvUbU744bdfPc2xeYO+G96YaMju/Mw8NFvIHEc6e4ev97dUleSCTILtvkC6Onj4PkA5MgXY774RTl7mfsdLH8/VBW6m8q0Koq1rfInuLoDWppNf2s2NYI7jh1VdQqxNGdWoVSTxlB5Kc= 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 1596701376387609.073854720873; Thu, 6 Aug 2020 01:09:36 -0700 (PDT) Received: from localhost ([::1]:50440 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1k3axz-0003xi-0k for importer@patchew.org; Thu, 06 Aug 2020 04:09:35 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:33742) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1k3awz-0002GZ-8M; Thu, 06 Aug 2020 04:08:33 -0400 Received: from mail-wr1-x444.google.com ([2a00:1450:4864:20::444]:36307) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1k3awx-0005g1-NO; Thu, 06 Aug 2020 04:08:32 -0400 Received: by mail-wr1-x444.google.com with SMTP id 88so43044772wrh.3; Thu, 06 Aug 2020 01:08:30 -0700 (PDT) Received: from localhost.localdomain (121.red-81-40-121.staticip.rima-tde.net. [81.40.121.121]) by smtp.gmail.com with ESMTPSA id w2sm6039587wre.5.2020.08.06.01.08.28 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 06 Aug 2020 01:08:29 -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=4+aXm2ggWfq1Fly1rmq/Lj+bQKm9iyQ1C1siDyh5+3o=; b=vBIqgLBL2GNNUoliO1+45+XjA00P0+68zsF6XGyQV6irjsbG0+pF3A8i+4AJpF8911 hqYyNeTbUjnauH/vE+HyFZnMyWEdyCOiFEnEsn5SmG7fmG65uCsg4yEHAVyHrjjunwNC k5m/XbXEonFRdztED73Y2XmR5Tdy9RRBPEscDwN410wqfjkh37igJPEl7ZOXmG6Uh69D /hRMhZGMx3b7v2TzhsguyD2fci82sqETGIZTCjERzsxNSoxz/tW14M1vuE6hdcrgr+nG WDiOtafb0hOHp6r9T7jj4ALHUHUE0A8MjRdKiqOWrC/Jh1fgYoyxkOiOai+j+ddPA+hU Qhkg== 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=4+aXm2ggWfq1Fly1rmq/Lj+bQKm9iyQ1C1siDyh5+3o=; b=uc2XUo7Ttiq1iqAAAGSRUVETQ0aEUW15Y79sw4T+qj1D/1HAtmi6waj3DCkFtqRaIK atVmZOjyxoFXV83VRv6+8DC3gujFvTe/L6b2zMSRUNsAfhtOwT9EOZzEPlooJCiWwM2W E94byvTkFSUWvTe28bB5j13Oo8TfTeGM9gB3UxFmgVQk+ivJ28/BhQO/gzpPXdOOJVYg 6sfUlDolfPgsqziCS+cGhB84IKGywYzfqgS9bDiJU88ZG/pO1tPMIV0CHd9wmlooAW4V 4CJSHU8xwKSeyZDi9yH0L1D3zT15qG6GU9H9y/oZL5x4WkaeWaP+UhdxQFVVCr/NYCe5 rs+A== X-Gm-Message-State: AOAM531RG76uHpmuZYEjj7tnk/OsrgpVnaxYb3CUcUI9HboQOhtPltLE dZp63kMxW0Cqhzbz4hjLElg6bzEh X-Google-Smtp-Source: ABdhPJzupK0w6Pw7Yv3JZ9t//wVtZZTftWvR1hHu7uKTk88NmVL83zwitQ5FW2WzZkaPUh2Vk174og== X-Received: by 2002:a5d:51c3:: with SMTP id n3mr6340324wrv.104.1596701309639; Thu, 06 Aug 2020 01:08:29 -0700 (PDT) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Subject: [PATCH-for-5.2 2/7] hw/block/fdc: Let sector offset be unsigned Date: Thu, 6 Aug 2020 10:08:19 +0200 Message-Id: <20200806080824.21567-3-f4bug@amsat.org> X-Mailer: git-send-email 2.21.3 In-Reply-To: <20200806080824.21567-1-f4bug@amsat.org> References: <20200806080824.21567-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: 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=no autolearn_force=no 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: Kevin Wolf , John Snow , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , qemu-block@nongnu.org, Max Reitz Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) Sector offset can not be negative, make it unsigned. Signed-off-by: Philippe Mathieu-Daud=C3=A9 --- hw/block/fdc.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/hw/block/fdc.c b/hw/block/fdc.c index 2cec7568c1..c91ed7ee2d 100644 --- a/hw/block/fdc.c +++ b/hw/block/fdc.c @@ -259,7 +259,7 @@ static uint32_t fd_sector(FDrive *drv) } =20 /* Returns current position, in bytes, for given drive */ -static int fd_offset(FDrive *drv) +static uint64_t fd_offset(FDrive *drv) { g_assert(fd_sector(drv) < INT_MAX >> BDRV_SECTOR_BITS); return fd_sector(drv) << BDRV_SECTOR_BITS; --=20 2.21.3 From nobody Sat Nov 15 18:46:05 2025 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=1596701460; cv=none; d=zohomail.com; s=zohoarc; b=b6wNlTzQ8NUUATOVf+ImR72CAbnrFY8g1Lh+OtAZGaTREXR/re1IQVk3hSncQrpKmtR8FMT6pJ8mfR71FdAd0lZdz1x9kaJyE1BeX/FPzViIMOInsJDP+KelCwKH6lipRKru0NDuJuKBhNyjwkXs5tmajPbL/5RRxLzeY5X1j+Y= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1596701460; 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=aNqGoj9XEuK6FXLTe1Hk7gTK5CIz55oFAjsctzZx5hc=; b=RAHJFzV4BtaTB9L6eydj0mUrLmRoY1oA+Af7jsKipQgryXKYj6ln9Evz9KNHcTGd81oq+gjUNPF9vI8fcPyKh5sLJGB4AyevJw1QDDNw4a7f1x5fysEUH/PjkMel4jUg+/feoEMCxexRNYf/sN1idnDJha+e9vvPhL9wktCkotM= 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 15967014604594.650859093137001; Thu, 6 Aug 2020 01:11:00 -0700 (PDT) Received: from localhost ([::1]:58382 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1k3azL-0007J8-5h for importer@patchew.org; Thu, 06 Aug 2020 04:10:59 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:33752) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1k3ax0-0002Il-IV; Thu, 06 Aug 2020 04:08:34 -0400 Received: from mail-wr1-x430.google.com ([2a00:1450:4864:20::430]:39162) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1k3awy-0005gD-S3; Thu, 06 Aug 2020 04:08:34 -0400 Received: by mail-wr1-x430.google.com with SMTP id a5so33116377wrm.6; Thu, 06 Aug 2020 01:08:32 -0700 (PDT) Received: from localhost.localdomain (121.red-81-40-121.staticip.rima-tde.net. [81.40.121.121]) by smtp.gmail.com with ESMTPSA id w2sm6039587wre.5.2020.08.06.01.08.29 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 06 Aug 2020 01:08: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=aNqGoj9XEuK6FXLTe1Hk7gTK5CIz55oFAjsctzZx5hc=; b=YwoTuFlWhAhJ1u06Ry7qUkbdpDuuky9kAz6KS7zMs1BIw6Sb19k4aAcd9sbZXqXVJ7 IoTPR42VSGyi0GHH/CzCwstaBTuWAR52Cd/88iyqTZjCUIs5g0UM4BKsJlggWBfqDjTL lkksyd1wRvDf6elv3HqBhTS6df7FH1eDdosoKqT+XhaMKjvoCVYzB80mxeNyr4pr+HWl ggYVMf8cnMKGa7MfndxljT9IdGD9kxUzQsq9IrOKC7gtSR9cHmjDtROpe72j5VULcBKm /XZbtGEw4xMgq5LtQEz6sAygMTK/kau3N3GAjNyHJvT6Kv8AEN33E91SaG/1uEUUmMMr Xtsw== 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=aNqGoj9XEuK6FXLTe1Hk7gTK5CIz55oFAjsctzZx5hc=; b=EfuUZaaJO0ajoNlJUz22wOYdwGrYDcklFQljOpINvR1q7AflMzU9jv4oBbRMNB+p1D 6zOM8tgVaTm/HB3kPqbsHvVyrHz/eBuGQ9THMpyoreeQkePdv+35rwmfwj+AYYEpTVqM FnLaYYDZ1Gku+l+pUm7seRD6b/NoGJic01467FAlusNnv16v+JRNJRbn1N59yCNDG4ip sdeNHw67S4vfxGh2O/SbhXfJwlzZi5sW5jOTWCZZI9droygvdpa3LXm5fXWnSMC6xB7I HJ93mYmNDnSVbRf1yAvViGmQo5yDh9RAMxB93QzR6BHx5SJZSFLC2zZVHtcJ8olU6PZH NSXQ== X-Gm-Message-State: AOAM532o7bVs5TnCUFOckglPjNTlBC4ysAf71GqMGW/Vjj8DPyO/TgVP DB2XBKYzx5Nr3+yZy7/IAlXY53Ef X-Google-Smtp-Source: ABdhPJy8uhbLGRzwvC20F0yyO8FoOirgX8AyP2EB1JUr8RoP52AwKxS5ooSCWR2kHcPNGk1QSw1iXw== X-Received: by 2002:a5d:68cf:: with SMTP id p15mr6378477wrw.148.1596701310699; Thu, 06 Aug 2020 01:08:30 -0700 (PDT) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Subject: [PATCH-for-5.2 3/7] hw/block/fdc: Use warn_report() instead of debug FLOPPY_DPRINTF() calls Date: Thu, 6 Aug 2020 10:08:20 +0200 Message-Id: <20200806080824.21567-4-f4bug@amsat.org> X-Mailer: git-send-email 2.21.3 In-Reply-To: <20200806080824.21567-1-f4bug@amsat.org> References: <20200806080824.21567-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::430; envelope-from=philippe.mathieu.daude@gmail.com; helo=mail-wr1-x430.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=no autolearn_force=no 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: Kevin Wolf , John Snow , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , qemu-block@nongnu.org, Max Reitz Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) Use warn_report() instead of debug FLOPPY_DPRINTF() calls. Signed-off-by: Philippe Mathieu-Daud=C3=A9 --- hw/block/fdc.c | 32 +++++++++++++++----------------- 1 file changed, 15 insertions(+), 17 deletions(-) diff --git a/hw/block/fdc.c b/hw/block/fdc.c index c91ed7ee2d..ee45ec0b27 100644 --- a/hw/block/fdc.c +++ b/hw/block/fdc.c @@ -395,12 +395,10 @@ static int pick_geometry(FDrive *drv) if (match =3D=3D -1) { if (size_match !=3D -1) { parse =3D &fd_formats[size_match]; - FLOPPY_DPRINTF("User requested floppy drive type '%s', " - "but inserted medium appears to be a " - "%"PRId64" sector '%s' type\n", - FloppyDriveType_str(drv->drive), - nb_sectors, - FloppyDriveType_str(parse->drive)); + warn_report("User requested floppy drive type '%s', but insert= ed " + "medium appears to be a %"PRId64" sector '%s' type= ", + FloppyDriveType_str(drv->drive), nb_sectors, + FloppyDriveType_str(parse->drive)); } assert(type_match !=3D -1 && "misconfigured fd_format"); match =3D type_match; @@ -1805,8 +1803,8 @@ static int fdctrl_transfer_handler (void *opaque, int= nchan, /* READ & SCAN commands and realign to a sector for WRITE */ if (blk_pread(cur_drv->blk, fd_offset(cur_drv), fdctrl->fifo, BDRV_SECTOR_SIZE) < 0) { - FLOPPY_DPRINTF("Floppy: error getting sector %d\n", - fd_sector(cur_drv)); + warn_report("Floppy: error getting sector %" PRIu32, + fd_sector(cur_drv)); /* Sure, image size is too small... */ memset(fdctrl->fifo, 0, FD_SECTOR_LEN); } @@ -1833,8 +1831,8 @@ static int fdctrl_transfer_handler (void *opaque, int= nchan, fdctrl->data_pos, len); if (blk_pwrite(cur_drv->blk, fd_offset(cur_drv), fdctrl->fifo, BDRV_SECTOR_SIZE, 0) < 0) { - FLOPPY_DPRINTF("error writing sector %d\n", - fd_sector(cur_drv)); + warn_report("error writing sector %" PRIu32, + fd_sector(cur_drv)); fdctrl_stop_transfer(fdctrl, FD_SR0_ABNTERM | FD_SR0_SEEK,= 0x00, 0x00); goto transfer_error; } @@ -1911,8 +1909,8 @@ static uint32_t fdctrl_read_data(FDCtrl *fdctrl) if (pos =3D=3D 0) { if (fdctrl->data_pos !=3D 0) if (!fdctrl_seek_to_next_sect(fdctrl, cur_drv)) { - FLOPPY_DPRINTF("error seeking to next sector %d\n", - fd_sector(cur_drv)); + warn_report("error seeking to next sector %" PRIu32, + fd_sector(cur_drv)); return 0; } if (blk_pread(cur_drv->blk, fd_offset(cur_drv), fdctrl->fifo, @@ -1997,7 +1995,7 @@ static void fdctrl_format_sector(FDCtrl *fdctrl) if (cur_drv->blk =3D=3D NULL || blk_pwrite(cur_drv->blk, fd_offset(cur_drv), fdctrl->fifo, BDRV_SECTOR_SIZE, 0) < 0) { - FLOPPY_DPRINTF("error formatting sector %d\n", fd_sector(cur_drv)); + warn_report("error formatting sector %" PRIu32, fd_sector(cur_drv)= ); fdctrl_stop_transfer(fdctrl, FD_SR0_ABNTERM | FD_SR0_SEEK, 0x00, 0= x00); } else { if (cur_drv->sect =3D=3D cur_drv->last_sect) { @@ -2421,13 +2419,13 @@ static void fdctrl_write_data(FDCtrl *fdctrl, uint3= 2_t value) cur_drv =3D get_cur_drv(fdctrl); if (blk_pwrite(cur_drv->blk, fd_offset(cur_drv), fdctrl->fifo, BDRV_SECTOR_SIZE, 0) < 0) { - FLOPPY_DPRINTF("error writing sector %d\n", - fd_sector(cur_drv)); + warn_report("error writing sector %" PRIu32, + fd_sector(cur_drv)); break; } if (!fdctrl_seek_to_next_sect(fdctrl, cur_drv)) { - FLOPPY_DPRINTF("error seeking to next sector %d\n", - fd_sector(cur_drv)); + warn_report("error seeking to next sector %" PRIu32, + fd_sector(cur_drv)); break; } } --=20 2.21.3 From nobody Sat Nov 15 18:46:05 2025 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=1596701568; cv=none; d=zohomail.com; s=zohoarc; b=YJNYuO7HnQmzo5BIAqrZKKs2taeId4C7n0lx7mpd8PMOgKF6dtHMC5+lGGUaiWqc72lSHWWlr8UPlwws5QlWAf6HsHO0XNY6qRf167mXCzjipTYaSYBjyqvn/e5Wjaj0h+Ppg2XxP4mMtj8roldLkMfIFeMAbEshjNX8bsW5djg= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1596701568; 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=9LYhTPA+0RjAHP6HLE9QxoCa5EB+fRF80ZAoq1URUGk=; b=B10AdJt8nC+DD1eAWwf9AyDi1euf131KbbIjXNSs1D560uqzWWKjaqhXleA6SNELlRInI3X3G0UiZB+dF0i52ZzIV7uWQXe8gPhBkedUHuqlcj8f5InGqlOidFrI9DT5yGnONCAHDmKMysvOYTQEfudLdizsPWpA3B7a2ikUx74= 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 1596701568879126.92802605201632; Thu, 6 Aug 2020 01:12:48 -0700 (PDT) Received: from localhost ([::1]:35556 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1k3b15-00019g-Ib for importer@patchew.org; Thu, 06 Aug 2020 04:12:47 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:33780) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1k3ax3-0002Pd-49; Thu, 06 Aug 2020 04:08:37 -0400 Received: from mail-wm1-x32e.google.com ([2a00:1450:4864:20::32e]:56194) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1k3ax1-0005gU-2Y; Thu, 06 Aug 2020 04:08:36 -0400 Received: by mail-wm1-x32e.google.com with SMTP id 9so7995508wmj.5; Thu, 06 Aug 2020 01:08:34 -0700 (PDT) Received: from localhost.localdomain (121.red-81-40-121.staticip.rima-tde.net. [81.40.121.121]) by smtp.gmail.com with ESMTPSA id w2sm6039587wre.5.2020.08.06.01.08.31 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 06 Aug 2020 01:08:31 -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=9LYhTPA+0RjAHP6HLE9QxoCa5EB+fRF80ZAoq1URUGk=; b=LHljM23t/K8o4aLlCm8bBXh/r7b8prEa7Q4epFhBb3l+jMN4VT/fy1kN/gp43iCv05 nl1wVdkC+ZtpiG0qolkkUYEOVv/SgbLUgyOGvuWMd0RBmGghVkeK97JFvndM7bQsFi4G yRkHR8hTsGp6f6FIj8E85YxmPJ9iPHkgMfLIL/DXypFR7W5pPt9ag+k1qKqyuJk3X9PQ /6noB0QhKUO4fZHjk8jUfSWlInYNi9wjIRfO/NGn+NyikLD9rY+7A2rz8AwwTcFxOX3j PkdjsnQjxCmLSQMN7qrd8ypKkX223H6Gyft0SSXxb0JVmz+6e2gVdO4OWmt+jgbY8UbR Ytww== 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=9LYhTPA+0RjAHP6HLE9QxoCa5EB+fRF80ZAoq1URUGk=; b=KSRBX7x4pE60wykdkfN02LXyZ3YM2x9yPdnvc4up/xr5jQJ163A9vg5PvLc1YwS+yy 6eEws8JM3iENOoK7NHxdDcww4g2orljeImJ9I5nKCNCL8drwAoTQcbNMLlwOeSmrDCbq WJrgZSZITR/C2kkN5WJVKzE3Rja1tDMxE6JpG2x+88rhuBWmWl2DvVGiqwtXdK7yhpKs wIzm5z2D2eIhTAYe84Jc8rV6jZIOOZJs+2xd/GVxjuM7KTHRUO5JDF9yCazrk80ze4F3 SyS1Ig+1a7GzVqPYeFJjiE0uIiHBciNRytA3NUOSOx6JeaOsUQcbJheHujfsT46xR5On a6sw== X-Gm-Message-State: AOAM533pSq6+ECTbvdSToa27JHHydd/Fll1nGInByIT5noYb5fW3CW23 WVWmpXe5WwLsWvejO+WfEeNPUrX7 X-Google-Smtp-Source: ABdhPJzIyY9HchRIJ6VPScs9HjqlQ8LZSVbgcAbPbn2020qrAokAiOVcnAEMTHQU981JcEY05Uulvg== X-Received: by 2002:a7b:c011:: with SMTP id c17mr6697267wmb.63.1596701312026; Thu, 06 Aug 2020 01:08:32 -0700 (PDT) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Subject: [PATCH-for-5.2 4/7] hw/block/fdc: Convert debug FLOPPY_DPRINTF() to trace events Date: Thu, 6 Aug 2020 10:08:21 +0200 Message-Id: <20200806080824.21567-5-f4bug@amsat.org> X-Mailer: git-send-email 2.21.3 In-Reply-To: <20200806080824.21567-1-f4bug@amsat.org> References: <20200806080824.21567-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::32e; envelope-from=philippe.mathieu.daude@gmail.com; helo=mail-wm1-x32e.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=no autolearn_force=no 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: Kevin Wolf , John Snow , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , qemu-block@nongnu.org, Max Reitz Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) Convert debug FLOPPY_DPRINTF() to trace events. Signed-off-by: Philippe Mathieu-Daud=C3=A9 --- hw/block/fdc.c | 6 +++--- hw/block/trace-events | 3 +++ 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/hw/block/fdc.c b/hw/block/fdc.c index ee45ec0b27..f9f3f3c079 100644 --- a/hw/block/fdc.c +++ b/hw/block/fdc.c @@ -326,7 +326,7 @@ static int fd_seek(FDrive *drv, uint8_t head, uint8_t t= rack, uint8_t sect, /* Set drive back to track 0 */ static void fd_recalibrate(FDrive *drv) { - FLOPPY_DPRINTF("recalibrate\n"); + trace_floppy_recalibrate(); fd_seek(drv, 0, 0, 1, 1); } =20 @@ -438,7 +438,7 @@ static void fd_revalidate(FDrive *drv) { int rc; =20 - FLOPPY_DPRINTF("revalidate\n"); + trace_floppy_revalidate(); if (drv->blk !=3D NULL) { drv->ro =3D blk_is_read_only(drv->blk); if (!blk_is_inserted(drv->blk)) { @@ -1283,7 +1283,7 @@ static void fdctrl_reset(FDCtrl *fdctrl, int do_irq) { int i; =20 - FLOPPY_DPRINTF("reset controller\n"); + trace_fdc_reset(); fdctrl_reset_irq(fdctrl); /* Initialise controller */ fdctrl->sra =3D 0; diff --git a/hw/block/trace-events b/hw/block/trace-events index 958fcc5508..9f7caf9b17 100644 --- a/hw/block/trace-events +++ b/hw/block/trace-events @@ -1,8 +1,11 @@ # See docs/devel/tracing.txt for syntax documentation. =20 # fdc.c +fdc_reset(void) "" fdc_ioport_read(uint8_t reg, uint8_t value) "read reg 0x%02x val 0x%02x" fdc_ioport_write(uint8_t reg, uint8_t value) "write reg 0x%02x val 0x%02x" +floppy_recalibrate(void) "" +floppy_revalidate(void) "" =20 # pflash_cfi02.c # pflash_cfi01.c --=20 2.21.3 From nobody Sat Nov 15 18:46:05 2025 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=1596701380; cv=none; d=zohomail.com; s=zohoarc; b=VZfKuLkL8TtzvGmuEXNdoR7wF3eMK7UOKpKabUo6wibsbRxJjcJiIZ7ZhvuooaOejTaNwG8j0Li8t7VLNaj7xNeebVa25HCUhXSRd34ZbHl/QNKdTbrvySy/7z0R57pBuYJX3xueL9f3yQdK0jDy7mOOneMA/bR2zF8xEAalCeM= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1596701380; 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=Jz0WDn0HteYxXs7mrN9I12dBppq/lF1r2frSPkCB9xM=; b=jVfg+udsmChIGiIUVPbj8by9G+DjQIBBkgJPZs+kjtxSfj+l1CvIFmG5IuxLfWOCOYp6PbsjNArVzCMat6AGXBcbXFH2oebekUt64wsORoI5tNZ3i9ZKGx3liOxjgTaQE/LbYsyDCHj7TWwZP4te+2gWtGvVpN2oODZeAsANmfE= 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 1596701380490694.1903126054066; Thu, 6 Aug 2020 01:09:40 -0700 (PDT) Received: from localhost ([::1]:50856 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1k3ay3-00048N-15 for importer@patchew.org; Thu, 06 Aug 2020 04:09:39 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:33804) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1k3ax4-0002Rd-6g; Thu, 06 Aug 2020 04:08:38 -0400 Received: from mail-wr1-x42b.google.com ([2a00:1450:4864:20::42b]:33003) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1k3ax1-0005gW-8w; Thu, 06 Aug 2020 04:08:37 -0400 Received: by mail-wr1-x42b.google.com with SMTP id p20so8172512wrf.0; Thu, 06 Aug 2020 01:08:34 -0700 (PDT) Received: from localhost.localdomain (121.red-81-40-121.staticip.rima-tde.net. [81.40.121.121]) by smtp.gmail.com with ESMTPSA id w2sm6039587wre.5.2020.08.06.01.08.32 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 06 Aug 2020 01:08: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=Jz0WDn0HteYxXs7mrN9I12dBppq/lF1r2frSPkCB9xM=; b=Ldy2CiQiR4hg0J5ePsfDdxpmqS4ktlMVnziOHNwPTC6Kz19sUtDV1UVgRhnjzycVdE kJSqL7/rEuAoLvH7yQlyE2UecAc/2fErsv0LwLK0XRl+Noa6+nlGfxoGxBKHQ7N4XzMn FkQZRBlvfZwmt16hh0/VKtfs8Lfz+Dlkgou7B2a921qXBuxvuhpr53RS9KakV7HaOaom uYJDXfs+1Eq2g7EaCl35SSebhCOZDIokHiTDYtLHbQuAZgogUlA/5RMZQ4p9rOEX644A qwiFlU0xSqWOPH5SV0wx3Hw9Mf6hq5fvchI1zRrS1M1tRUy09HLxCo7BZXOax+ErMqNB 6rvw== 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=Jz0WDn0HteYxXs7mrN9I12dBppq/lF1r2frSPkCB9xM=; b=XQYZ3I+SFNEOW/rMkTkn7wI2rigyX9+YhssLhbHNBtCKvPTDgAhK06e3qvDxXL1mSb li+p3OOeFVSCd8N5ATRLjCWfP5rFLRiZtMST+ITpoF809RiDTASn1M9uHnWFQcwp/zhj uhus6OmWJPCZqDUu4gD6Zk7vhghzA6LHBtWKwO5RzU3CzM+u1/9knUwPwlJ1oY8yNrgH P0r867do2B19D6Wsk5w9s2/PQi8gfCfa7PSVNdHAW/48jK/5SU9JAHYXU5myc7RwzSBF ej4RI9Vj3zQ7iEtNqjxMPxlkt4Ab9IE6oPmeK0rAlgJP+alHvWw0MC8DmEqhm0pc5jpS sZEA== X-Gm-Message-State: AOAM531BxmhjIQSytohZ9433UNUMN3+V7aIJnvhKX4H38/1lWOG7oX8I NWihcMviMn6fu1hSXAwr9Dhv+eIx X-Google-Smtp-Source: ABdhPJyAWuwofRGqutjHXh+I76xWr1LqPcbju6RKVxiCJEcnSwabQJhJ/qFk0p2HYvFw6aOJEgxbsg== X-Received: by 2002:adf:ea92:: with SMTP id s18mr6288388wrm.269.1596701313036; Thu, 06 Aug 2020 01:08:33 -0700 (PDT) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Subject: [PATCH-for-5.2 5/7] hw/block/fdc: Drop pointless FLOPPY_DPRINTF() call Date: Thu, 6 Aug 2020 10:08:22 +0200 Message-Id: <20200806080824.21567-6-f4bug@amsat.org> X-Mailer: git-send-email 2.21.3 In-Reply-To: <20200806080824.21567-1-f4bug@amsat.org> References: <20200806080824.21567-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::42b; envelope-from=philippe.mathieu.daude@gmail.com; helo=mail-wr1-x42b.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=no autolearn_force=no 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: Kevin Wolf , John Snow , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , qemu-block@nongnu.org, Max Reitz Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) Remove not very helpful debug call. Signed-off-by: Philippe Mathieu-Daud=C3=A9 --- hw/block/fdc.c | 1 - 1 file changed, 1 deletion(-) diff --git a/hw/block/fdc.c b/hw/block/fdc.c index f9f3f3c079..278220ed29 100644 --- a/hw/block/fdc.c +++ b/hw/block/fdc.c @@ -2636,7 +2636,6 @@ static void fdctrl_realize_common(DeviceState *dev, F= DCtrl *fdctrl, } } =20 - FLOPPY_DPRINTF("init controller\n"); fdctrl->fifo =3D qemu_memalign(512, FD_SECTOR_LEN); memset(fdctrl->fifo, 0, FD_SECTOR_LEN); fdctrl->fifo_size =3D 512; --=20 2.21.3 From nobody Sat Nov 15 18:46:05 2025 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=1596701644; cv=none; d=zohomail.com; s=zohoarc; b=ebY36XBgiHfkylmKExGor+O/iogIK7yFNg2OpDdtT8sI3rWD6e3dkpXb+hE+6cw5n+vByj9+uQ3gVbHGvEp2bwnm37QSs7dIQXx1v/+WwqMeriiMLGrzY8QUn68fbqQazlTRYlZyiihsZhPggyO8FCW00Y1IM3SAJ2NPCTCpqBc= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1596701644; 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=OOTPgo4khN8yFS6+N1vBA/0RT1rnYM2M5KZls9TsuCE=; b=kKIR7j0BFC7FYFECBR0OgFToy9ajYORe6VlpCqCvKrQHP+DWhax6Wnw1BsGD27UnMito9ODSS7/Mw9Rcx02t86XQXN72fznsH8SNmNoDc8XTI3G85JOfqx2p15oYQlMWjsyeS6Nh6xId72Y8bpdv/FkdRPnRMvXEDtwfiOyHVyk= 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 1596701644494588.9075668738183; Thu, 6 Aug 2020 01:14:04 -0700 (PDT) Received: from localhost ([::1]:42820 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1k3b2I-0004AD-Pe for importer@patchew.org; Thu, 06 Aug 2020 04:14:02 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:33810) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1k3ax4-0002SL-Go; Thu, 06 Aug 2020 04:08:38 -0400 Received: from mail-wm1-x344.google.com ([2a00:1450:4864:20::344]:33551) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1k3ax2-0005gn-Hh; Thu, 06 Aug 2020 04:08:38 -0400 Received: by mail-wm1-x344.google.com with SMTP id f18so6010740wmc.0; Thu, 06 Aug 2020 01:08:35 -0700 (PDT) Received: from localhost.localdomain (121.red-81-40-121.staticip.rima-tde.net. [81.40.121.121]) by smtp.gmail.com with ESMTPSA id w2sm6039587wre.5.2020.08.06.01.08.33 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 06 Aug 2020 01:08: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=OOTPgo4khN8yFS6+N1vBA/0RT1rnYM2M5KZls9TsuCE=; b=iSXZ0WtFI7B5lfFyIX5uhGvbcJ19xsOUClRvsinoOL5lNvhWfznHqHMXneREsl/MZX YVWh64SDX36P8EP3zCvJiMJ8jCAMOQQvwRJfG4OZuKQhVpkGVNXixGqJUfRY6Bx9LWc4 3eBZ3M/2SaYrRZ7/c+tXi++EJDGujUV+ySteCAxfT6sQVnLo1sXGKu4NmzFlHPnke8OQ 2na23Qmwt4EKYvq8N1BX2E5y6DrVfElOCKOxVzFUc81/PzwMdSgedE0BNCqq/p7UlkQc TXZEjvucfIo+8w7/vLWCxHASweIeVmVU43ApMjC3U050LpcjW6T9yVTlxH6M+WMdKFMW CKCg== 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=OOTPgo4khN8yFS6+N1vBA/0RT1rnYM2M5KZls9TsuCE=; b=f2XJ4eNUlDC/nNVsMxw14aD2AnwEbdcicQnpyw1QV3iAqthAvFonGGKjjTddTrKa0F 1EkMCSeDT8BSGCPJ/EzBSwuGXf8ZpHW9yK7n0E+fFCjTUT5R5uebxZ7KEK3TZVpUsLiN R3P/UqPNn7Yhuai7KOlWkqIBmLDD+aP1aN+uYDgRpGS7vPT/YonMHUhk+i73Tw8WR2aJ aHgunERHiVS4zXVxXxWvJtXF3e3Q1RF6dtx525R7PzAi9EjjG+6NMRdYBkILqtgHeaOb h0/uHxyxgxcIoqng8fXG238h4M74HHnLUb/TllzxZzRYE1peGK6sAhUteXaMTrjItlWU M7Sg== X-Gm-Message-State: AOAM533Nfy3oHLIs7OCUQ8Ipq3IQvqTxETD8v/PU99XklCRhaj0/D9Ig P/55tJ04sdw8DMhLKRjBZUXvH/Zf X-Google-Smtp-Source: ABdhPJwyvdSLMcAjmlc5DQxwKNrfKQltf9a62bTU8j7hl3JxTF9eBbMGtS2XfWimxPxSKd5QjOBW3A== X-Received: by 2002:a1c:23c2:: with SMTP id j185mr6635342wmj.84.1596701314345; Thu, 06 Aug 2020 01:08:34 -0700 (PDT) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Subject: [PATCH-for-5.2 6/7] hw/block/fdc: Use more descriptive TypeInfo names Date: Thu, 6 Aug 2020 10:08:23 +0200 Message-Id: <20200806080824.21567-7-f4bug@amsat.org> X-Mailer: git-send-email 2.21.3 In-Reply-To: <20200806080824.21567-1-f4bug@amsat.org> References: <20200806080824.21567-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: 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=no autolearn_force=no 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: Kevin Wolf , John Snow , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , qemu-block@nongnu.org, Max Reitz Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) Better name TypeInfo structures: - ISA bus - Common floppy controller - Intel 82078 floppy controller - SUN floppy controller Signed-off-by: Philippe Mathieu-Daud=C3=A9 --- hw/block/fdc.c | 18 ++++++++++-------- 1 file changed, 10 insertions(+), 8 deletions(-) diff --git a/hw/block/fdc.c b/hw/block/fdc.c index 278220ed29..6944b06e4b 100644 --- a/hw/block/fdc.c +++ b/hw/block/fdc.c @@ -2930,7 +2930,7 @@ static void isabus_fdc_instance_init(Object *obj) DEVICE(obj)); } =20 -static const TypeInfo isa_fdc_info =3D { +static const TypeInfo isabus_fdc_info =3D { .name =3D TYPE_ISA_FDC, .parent =3D TYPE_ISA_DEVICE, .instance_size =3D sizeof(FDCtrlISABus), @@ -2971,7 +2971,7 @@ static void sysbus_fdc_class_init(ObjectClass *klass,= void *data) set_bit(DEVICE_CATEGORY_STORAGE, dc->categories); } =20 -static const TypeInfo sysbus_fdc_info =3D { +static const TypeInfo sysbus_fdc_i82078_info =3D { .name =3D "sysbus-fdc", .parent =3D TYPE_SYSBUS_FDC, .instance_init =3D sysbus_fdc_initfn, @@ -2997,7 +2997,7 @@ static void sun4m_fdc_class_init(ObjectClass *klass, = void *data) set_bit(DEVICE_CATEGORY_STORAGE, dc->categories); } =20 -static const TypeInfo sun4m_fdc_info =3D { +static const TypeInfo sysbus_fdc_sun4m_info =3D { .name =3D "SUNW,fdtwo", .parent =3D TYPE_SYSBUS_FDC, .instance_init =3D sun4m_fdc_initfn, @@ -3013,7 +3013,7 @@ static void sysbus_fdc_common_class_init(ObjectClass = *klass, void *data) dc->vmsd =3D &vmstate_sysbus_fdc; } =20 -static const TypeInfo sysbus_fdc_type_info =3D { +static const TypeInfo sysbus_fdc_common_info =3D { .name =3D TYPE_SYSBUS_FDC, .parent =3D TYPE_SYS_BUS_DEVICE, .instance_size =3D sizeof(FDCtrlSysBus), @@ -3024,10 +3024,12 @@ static const TypeInfo sysbus_fdc_type_info =3D { =20 static void fdc_register_types(void) { - type_register_static(&isa_fdc_info); - type_register_static(&sysbus_fdc_type_info); - type_register_static(&sysbus_fdc_info); - type_register_static(&sun4m_fdc_info); + type_register_static(&isabus_fdc_info); + + type_register_static(&sysbus_fdc_common_info); + type_register_static(&sysbus_fdc_i82078_info); + type_register_static(&sysbus_fdc_sun4m_info); + type_register_static(&floppy_bus_info); type_register_static(&floppy_drive_info); } --=20 2.21.3 From nobody Sat Nov 15 18:46:05 2025 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=1596701488; cv=none; d=zohomail.com; s=zohoarc; b=hiqrpCi1sIgZTOkPdXxSFxIylE6zy8olsUbhuk3luD9J02XB5D8gItTBt3HaiAcSBKcQQN4hs5nxxNpaLoc0DXfn/GVVka7H1hnXYu3dwNqKobFQY014MQQWXIJK9AhEcRZ56J/AXU+5IDqkZU5+ZHf1Ehx4Rgu7iyTmuz1qMJ4= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1596701488; 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=7eAZ0/8yiggvPhkOUdkJ91QA34FcT2pw/7CIAHLDBoI=; b=Rpa4AO1sGVjknvrSNj1QbcpJ7tS5Aj2R6P3S5gH7fEol/DdkOv5cye5PO06+KA+idncCgHVjanMbPlK2fuMWY4deCCe9xmMMNW32NFDBcqZX/UlUlf8DqBTvoTJ+keSoY91t1+4qn28teRHtdN2umZf6DSUbP7XaG3CCX4Lvpwo= 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 159670148835856.56656969646019; Thu, 6 Aug 2020 01:11:28 -0700 (PDT) Received: from localhost ([::1]:59332 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1k3azn-0007hO-6a for importer@patchew.org; Thu, 06 Aug 2020 04:11:27 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:33814) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1k3ax5-0002UQ-AM; Thu, 06 Aug 2020 04:08:39 -0400 Received: from mail-wr1-x431.google.com ([2a00:1450:4864:20::431]:33009) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1k3ax3-0005gs-Jo; Thu, 06 Aug 2020 04:08:38 -0400 Received: by mail-wr1-x431.google.com with SMTP id p20so8172616wrf.0; Thu, 06 Aug 2020 01:08:36 -0700 (PDT) Received: from localhost.localdomain (121.red-81-40-121.staticip.rima-tde.net. [81.40.121.121]) by smtp.gmail.com with ESMTPSA id w2sm6039587wre.5.2020.08.06.01.08.34 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 06 Aug 2020 01:08:34 -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=7eAZ0/8yiggvPhkOUdkJ91QA34FcT2pw/7CIAHLDBoI=; b=gT4mV6Re+G81D1DVLg9KyuO+IJIuIezbYCwieNnxvT+udghu7NEpXuqp0bMRBEHHsZ pEJIUgOclMIRZ+DtmjrLYx9yEx0+6MQwMK2maW2bd2/S98LWdc7hjLvwZaodgtUDXBDA KZKG2cmbD6SydenFWC+tM/YpDnlP17JwQEBbShY+OpLWifR9/CmZ5DLQ2nogsQaM38NZ /rBF41Wa8P+vB2UeEjwGr2WXvxHDSSarzobR6q43IZOx8Fj9H8mwhih3pSE+b0mDJjYt qRnpCRPcEnRB1+Tugj7NiDIl4a5POWas5hehqknBekmZWT5aLJPKUt2fUKwxDtrj0pvq pHXw== 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=7eAZ0/8yiggvPhkOUdkJ91QA34FcT2pw/7CIAHLDBoI=; b=P4WK3EQdM/MptmLXffSLte+RwKSzkZr46w7kzLpcLFbrEilfxToLKKjk+O7bgcT5mo 6EtGM86wy66Qn50OFTBd2+jM5hkOPM6IGlch/XbzTmbn0fBOBpPqNZPu8Cp09eGXMqKW Wku1DlQBr7R9o59A8YEhl73pGiWRkj8T+4KrRb8q6/kHRkiht+snCR569ya4G9sdcBe3 YUKGxiiqkTXiwmyVeaRP1xijqLRZg5kqU46DgOyyrBdnxDv9eGaX0Z/A3MIw7BV9v0NT 1M4wIUz64SUn+cbiNvn9nzqCdmgjzUzeQvuw0cHcsMgBV1/9zvaOGnvjj+uI8C9507TW p5VQ== X-Gm-Message-State: AOAM5327s4zpw9o/yG7UIsXmJrvyuvAqYL/t2n14r1kGqKgDsjZ6pIlF AowFCtMi+Hyi7/3+a/hpHHMNshJ3 X-Google-Smtp-Source: ABdhPJyyNSbtrPbc8vneLMA2gswDfr9U65erO/ZXRdVXi1BT3/35+DwLFTbnaUFVx0lQPaam955IpQ== X-Received: by 2002:adf:cd12:: with SMTP id w18mr6399520wrm.352.1596701315485; Thu, 06 Aug 2020 01:08:35 -0700 (PDT) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Subject: [PATCH-for-5.2 7/7] hw/block/fdc: Add ASCII art schema of QOM relations Date: Thu, 6 Aug 2020 10:08:24 +0200 Message-Id: <20200806080824.21567-8-f4bug@amsat.org> X-Mailer: git-send-email 2.21.3 In-Reply-To: <20200806080824.21567-1-f4bug@amsat.org> References: <20200806080824.21567-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::431; envelope-from=philippe.mathieu.daude@gmail.com; helo=mail-wr1-x431.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=no autolearn_force=no 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: Kevin Wolf , John Snow , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , qemu-block@nongnu.org, Max Reitz Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) Without knowing the QEMU history, it is hard to relate QEMU objects with the hardware datasheet. For example, one naively expects: * a floppy disk is plugged / unplugged on the bus Wrong! QEMU floppy disks always sit on the bus. The block drives are plugged / unplugged on the disks, and the disks magically re-adapt their proprieties to match the block drive. * a floppy controller has a fixed number of disks pluggable on the bus Wrong! QEMU floppy controllers have as much slots as the number of floppy drive provided when a machine is created. Then the ACPI table are generated and the number of slots can not be modified. So if you expect a dual slot controller being created with slot A and B, if the machine is created with a single drive attached, the controller will only have slot A created, and you will never be able to plug drive B without risking a mismatch in the ACPI tables. * a floppy controller supporting 4 disks uses 2 buses Wrong! QEMU uses a single bus to plug the 4 disks. As all these false assumptions are not obvious (we don't plug a disk, we plug a block drive into a disk, etc...), start documenting the QOM relationships with a simple ASCII schema. Signed-off-by: Philippe Mathieu-Daud=C3=A9 --- hw/block/fdc.c | 22 ++++++++++++++++++++++ 1 file changed, 22 insertions(+) diff --git a/hw/block/fdc.c b/hw/block/fdc.c index 6944b06e4b..b109f37050 100644 --- a/hw/block/fdc.c +++ b/hw/block/fdc.c @@ -47,6 +47,28 @@ #include "qemu/module.h" #include "trace.h" =20 +/* + * QOM relationship: + * =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D + * + * +-------------------+ + * | | + * isa/sysbus <--->| | + * | | + * irq/dma <----| fdc | + * | + * clk ---->| | +-+------+-+ +-+------= +-+ + * | | | | blk | | | | blk = | | + * +--------+----------+ | | | | | | = | | + * | | +------+ | | +------= + | + * | | | | = | + * | | floppy | | floppy= | + * | +----+-----+ +----+---= --+ + * | floppy-bus | | + * +------------------------v---------------v--- + * + */ + /********************************************************/ /* debug Floppy devices */ =20 --=20 2.21.3