From patchwork Wed Apr 28 02:28:03 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Alexander Bulekov X-Patchwork-Id: 12227883 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-15.8 required=3.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS,HK_RANDOM_FROM,INCLUDES_CR_TRAILER, INCLUDES_PATCH,MAILING_LIST_MULTI,MSGID_FROM_MTA_HEADER,SPF_HELO_NONE, SPF_PASS,USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 08ADDC433ED for ; Wed, 28 Apr 2021 02:29:51 +0000 (UTC) Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 09B5E61408 for ; Wed, 28 Apr 2021 02:29:49 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 09B5E61408 Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=bu.edu Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Received: from localhost ([::1]:45958 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1lbZxU-0002eU-TH for qemu-devel@archiver.kernel.org; Tue, 27 Apr 2021 22:29:48 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:42282) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lbZw6-00029H-Jr; Tue, 27 Apr 2021 22:28:22 -0400 Received: from mail-mw2nam12on2125.outbound.protection.outlook.com ([40.107.244.125]:12903 helo=NAM12-MW2-obe.outbound.protection.outlook.com) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lbZw3-00036V-EQ; Tue, 27 Apr 2021 22:28:22 -0400 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=ILfSIbyiG1RhX9f3kd1OkNynV3VRzNUre2xqp6QS+xsjgDMtWCe6I6il0KwLIrffT8EWf4yu2L4EIBus2HhGg8nqYZMZ+xaLfIjrIa4TnFJNEcTgVLVZ84uwoDdkzR0dAIhyZVBkcTkiQX6pCBLdEYfji/zkuCJnAlI2MCo4UfAiM88otOCgVFcQgQigRcyLinSWgBAMJz9VyQzt0wJIn7F/BDO5g7y5lDvoMZ8mRGgTLUXnXMtczYcErPa8T0S1XnsrLH8OZiQ1q6nQCe0lc4Khd0kF6t+WFlEAllKTK11isAVCZORQ+dwH/HiFFL7GK1iO/DOI7aXlCPWQRvKf0Q== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=ONMzyKYlHo7FeYLpdGGvwR2qISymD6L2csLge/vTpEs=; b=HI5+mA+TxOb2CaIYgzoDbMhpwUrqoC9tpJinpepQ2kTsGhwTlUp8mglhunQWEVRZA+QHFPT8h/XT0OpSTTkKRVi3B+3Yowp62A5cVbNqXeWHyd5woXS9hz0EJdkHfXz2v8LsgK7XPWz6W5z+uw+g29yhwvwafV2UZxQJ2LPwoIjZZo4crg/F7QTFxzRgu+LrSyWHkOSDpI1g+wr7urQtaqHW2htZyfIrbT7ZQEUjOwrSorw7V8F5sorQNiKGViZUrH3Yay2KPa/NYhNDcTVkW9wvPb2o/QwYUPF5wPjnNmEY33tLmOT9eapbw7Mzt4PIHP7Jvghf/Af0Sk16aAnQ8Q== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=bu.edu; dmarc=pass action=none header.from=bu.edu; dkim=pass header.d=bu.edu; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=bushare.onmicrosoft.com; s=selector2-bushare-onmicrosoft-com; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=ONMzyKYlHo7FeYLpdGGvwR2qISymD6L2csLge/vTpEs=; b=8UTa0wq2WIlrku4ya2v3L+PhvRExaM6cphFlxxsPNJBHwusTE3h7zC5yG16pQAWddFMJFDInZ6hhPChP1x+yCBw/C8ynWJixGLlXtmuo+8Ze1uu2EZ7xKK1JXqMWEB2a1irQSPOuYRt7D5U31A0Ewa6VYxS2OnjiPkGy5USYSaQ= Authentication-Results: nongnu.org; dkim=none (message not signed) header.d=none;nongnu.org; dmarc=none action=none header.from=bu.edu; Received: from SN6PR03MB3871.namprd03.prod.outlook.com (2603:10b6:805:6d::32) by SA0PR03MB5514.namprd03.prod.outlook.com (2603:10b6:806:b0::10) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4065.24; Wed, 28 Apr 2021 02:28:15 +0000 Received: from SN6PR03MB3871.namprd03.prod.outlook.com ([fe80::c0e9:c756:fca4:f971]) by SN6PR03MB3871.namprd03.prod.outlook.com ([fe80::c0e9:c756:fca4:f971%7]) with mapi id 15.20.4065.027; Wed, 28 Apr 2021 02:28:15 +0000 From: Alexander Bulekov To: qemu-devel@nongnu.org Subject: [PATCH v2] floppy: remove dead code related to formatting Date: Tue, 27 Apr 2021 22:28:03 -0400 Message-Id: <20210428022803.606814-1-alxndr@bu.edu> X-Mailer: git-send-email 2.28.0 X-Originating-IP: [72.74.210.193] X-ClientProxiedBy: MN2PR01CA0050.prod.exchangelabs.com (2603:10b6:208:23f::19) To SN6PR03MB3871.namprd03.prod.outlook.com (2603:10b6:805:6d::32) MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 Received: from stormtrooper.vrmnet (72.74.210.193) by MN2PR01CA0050.prod.exchangelabs.com (2603:10b6:208:23f::19) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4087.25 via Frontend Transport; Wed, 28 Apr 2021 02:28:14 +0000 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: ff8ed8c5-a1ac-49d7-3943-08d909ed46c9 X-MS-TrafficTypeDiagnostic: SA0PR03MB5514: X-MS-Exchange-Transport-Forked: True X-Microsoft-Antispam-PRVS: X-MS-Oob-TLC-OOBClassifiers: OLM:9508; X-MS-Exchange-SenderADCheck: 1 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: URKVZTzOD8s1xyHbyjjCOV3JHDy7IDq9UCaiOSs6JugaNpHfD/aIJXOqvqlZW1cRC0qt7WWCNKWJcKjon/Qna/XD8Cdt0cMo9vOjKpF3wR6/4ANxWkOmPofLKU+mn3K8X8h+xJ5R5MKhKaonC5zXav8nDwIJf6cgh+ECLQPa0rU8zLbAk2EMW//7x5Dia7GTGEBoFixcYp7+7wPcCrvbkE8nJfYmyeAJ6aB3E/ysVu+JHoYOqJ/Xls9UR/9vkDAhW4vHdOTs/XcjhsBJceCMm7+2VQRjkbzBEwuqw2a+3kqh+JY8cx1FZ6rLO7BBL6JUOHqZV9vfLLG4xEYDucC24q58br9YlZDxTPghuQ1F6U8st26YxiLVwk/Gcz8diu8Ca2nmOJjj6xYCDj9LEDOBnzWk77l9KMrK8VsRBOXnabdmuw8fQAwTZmpLCVLF5ApOOju8yjE7T8GJqzjb702rBPDfiSRBhcuK138eQPF0KwGClkUHjujcLtX48QUaeb70az17rKkuiLWwtznHFFnEFzCPu5wG8BAKP2AyctkCD3mZWDxn/N4T6kBUHOOIhPV5/nyYi03sU3ZUWnAO4NI/Mj7nYY/SLxHf0tyLRrNg7BNV+5uglQ8CeEEYgk5ISYXzWPhsXGRiqn4ZBYo0PyFN0g== X-Forefront-Antispam-Report: CIP:255.255.255.255; CTRY:; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:SN6PR03MB3871.namprd03.prod.outlook.com; PTR:; CAT:NONE; SFS:(4636009)(346002)(376002)(39860400002)(136003)(396003)(366004)(4326008)(6916009)(83380400001)(86362001)(8676002)(6512007)(52116002)(6506007)(2906002)(6486002)(36756003)(26005)(66476007)(478600001)(186003)(5660300002)(38350700002)(38100700002)(16526019)(1076003)(54906003)(2616005)(956004)(6666004)(75432002)(66946007)(316002)(786003)(8936002)(66556008); DIR:OUT; SFP:1102; X-MS-Exchange-AntiSpam-MessageData: =?utf-8?q?2pV79zPYBhTRgg4pD2m4U+ocjZIDQ0?= =?utf-8?q?wLewLZV3v6PHYCze8XlVLBeoy3UcJDP5wqrktwWQtKvcMY/Z9PSYrakKapfqjWQgS?= =?utf-8?q?/6MOImbNd36QBNZs5Cv70E1+GTX7ZVcy+xXW+1DFZbwSDO7SYxA2vtz+PHAUTS87k?= =?utf-8?q?134uJvnmqDaMHj5SEwcKTC7bP4QQ/eq8urED4vbndtkwmiN/jcGW6sCWMjwYFzCcs?= =?utf-8?q?nZjF59Glf3R+JY1tfwv5iWTSEaK7vgIFtqMVX4YtdVqzMt7HMaeJp+YsuK95kx6BB?= =?utf-8?q?LeXasYXRkNEI35lJvsu/rltGbMQIlyFgYajeFz7YXdSpQrdN99hSYQfJpvMq64lWY?= =?utf-8?q?KCbC5l3AAAm5o4xknIm542H0QeVUVziisov/U5O2nuM7d2Xq5h1ZE+C6gTt/Yvt+h?= =?utf-8?q?B4S52vZ1xJqB8yspKDwapOmCPFoccMb2bviG/L+BPi2BkqsKfMuNRpV54Kt9DuP1B?= =?utf-8?q?CPBNQxaVRrVTUDrx3nmbEgLDY/T4kiXGwW14uekUz/hxli9nFpzt/CwRWC/54GpXk?= =?utf-8?q?/MIpJe5yj/j6HRaH/zGhOdigMOB0mGUYZe7npJU2i2Mq2Xkmj6nK+mKU3lAcnUuOP?= =?utf-8?q?a1e1hv9aW119Xthg9hT4M4YOmNxz8p9LnL5w/FTlqDoNEACHUABWejlvrTgAUUYsF?= =?utf-8?q?bIvE1ZKzwnr4CBHJyZ4y+E2hIzpezG7VknDbeUVeDBJ5/ZxK1HfA3AseizA6p8yR/?= =?utf-8?q?gucpXWJtH6g42JAzkI3uDaRRPpveRFjAyV4+Gn52y3tDmFNkxR0lIatkOKbAAZGMW?= =?utf-8?q?O87H5XXFtWhjtSxpXno1vRgwpHzCYsH1rQ/jDYinHZCL6BPt4YskmGy6mOI9Frua7?= =?utf-8?q?7ZeQ6OwH/VPVXRmbz+b/AD4nxjTsTaxy+uZTDMA6mSXTpaKH0qu4szDD2/PPfSU3A?= =?utf-8?q?E12zsPAYRcih7wmOr6q4qm1MDIS0MvtRmKgkfmyZ7cgwVtfZnjiMhoyG2N0LB9grx?= =?utf-8?q?j+iYlxrPym+b8lRq9NHRt0iCcL8fy5M+SiZRb+bP14lV/VMv0ek5QZmvshXLHq4Oa?= =?utf-8?q?of7Kgk8rTvAsBc1HpMQgLqRZ3pgoDZTDKaBXShIDREmMy6HlOhFCgbh19zy31/JxD?= =?utf-8?q?vSHHV2cDds75cSowWEnl/vBkprTHNuOzRpD5ii9KL/nq8h9JcomjZEPxoXcHpjBZq?= =?utf-8?q?zlyNoPFcXb6oxpe/ix6af3xnaJjoZB6YGHOD36qrRQ0u5ZqkrLtHurNidCuEIgQw7?= =?utf-8?q?vjN6wgz2JGzXrv2z8hcpi43glk7yRpJq96LwZeVYNQLKIShdGrkkwHWFofUuln2uN?= =?utf-8?q?LcYDGBBVBhnDYH?= X-OriginatorOrg: bu.edu X-MS-Exchange-CrossTenant-Network-Message-Id: ff8ed8c5-a1ac-49d7-3943-08d909ed46c9 X-MS-Exchange-CrossTenant-AuthSource: SN6PR03MB3871.namprd03.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 28 Apr 2021 02:28:15.1516 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: d57d32cc-c121-488f-b07b-dfe705680c71 X-MS-Exchange-CrossTenant-MailboxType: HOSTED X-MS-Exchange-CrossTenant-UserPrincipalName: t+gKEpGz4CAYAnMmoTR1M9fM0QyKXS4rOE/SFoH6mLgrlKN62M+RZ2MyLIYXxtYX X-MS-Exchange-Transport-CrossTenantHeadersStamped: SA0PR03MB5514 Received-SPF: pass client-ip=40.107.244.125; envelope-from=alxndr@bu.edu; helo=NAM12-MW2-obe.outbound.protection.outlook.com X-Spam_score_int: -8 X-Spam_score: -0.9 X-Spam_bar: / X-Spam_report: (-0.9 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, HK_RANDOM_ENVFROM=0.001, HK_RANDOM_FROM=0.999, MSGID_FROM_MTA_HEADER=0.001, RCVD_IN_DNSWL_NONE=-0.0001, RCVD_IN_MSPIKE_H2=-0.001, SPF_HELO_PASS=-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 , "open list:Floppy" , Max Reitz , Alexander Bulekov , =?utf-8?q?Herv=C3=A9_Poussineau?= , John Snow Errors-To: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Sender: "Qemu-devel" fdctrl_format_sector was added in baca51faff ("updated floppy driver: formatting code, disk geometry auto detect (Jocelyn Mayer)") The single callsite is guarded by a check: fdctrl->data_state & FD_STATE_FORMAT However, the only place where the FD_STATE_FORMAT flag is set (in fdctrl_handle_format_track) is closely followed by the same flag being unset, with no possibility to call fdctrl_format_sector in between. This removes fdctrl_format_sector, the unncessary setting/unsetting of the FD_STATE_FORMAT flag, and the fdctrl_handle_format_track function (which is just a stub). Suggested-by: Hervé Poussineau Signed-off-by: Alexander Bulekov --- I ran through tests/qtest/fdc-test, and ran fdformat on a dummy disk - nothing exploded, but since I don't use floppies very often, more eyes definitely won't hurt. In particular, I'm not sure about the fdctrl_handle_format_track delete - that function has side-effects on both FDrive and FDCtrl, and it is certainly reachable. If deleting the whole thing seems wrong, I'll roll-back that change, and we can just remove the unreachable code.. hw/block/fdc.c | 97 -------------------------------------------------- 1 file changed, 97 deletions(-) diff --git a/hw/block/fdc.c b/hw/block/fdc.c index a825c2acba..d851d23cc0 100644 --- a/hw/block/fdc.c +++ b/hw/block/fdc.c @@ -657,7 +657,6 @@ enum { enum { FD_STATE_MULTI = 0x01, /* multi track flag */ - FD_STATE_FORMAT = 0x02, /* format flag */ }; enum { @@ -826,7 +825,6 @@ enum { }; #define FD_MULTI_TRACK(state) ((state) & FD_STATE_MULTI) -#define FD_FORMAT_CMD(state) ((state) & FD_STATE_FORMAT) struct FDCtrl { MemoryRegion iomem; @@ -1942,67 +1940,6 @@ static uint32_t fdctrl_read_data(FDCtrl *fdctrl) return retval; } -static void fdctrl_format_sector(FDCtrl *fdctrl) -{ - FDrive *cur_drv; - uint8_t kh, kt, ks; - - SET_CUR_DRV(fdctrl, fdctrl->fifo[1] & FD_DOR_SELMASK); - cur_drv = get_cur_drv(fdctrl); - kt = fdctrl->fifo[6]; - kh = fdctrl->fifo[7]; - ks = fdctrl->fifo[8]; - FLOPPY_DPRINTF("format sector at %d %d %02x %02x (%d)\n", - GET_CUR_DRV(fdctrl), kh, kt, ks, - fd_sector_calc(kh, kt, ks, cur_drv->last_sect, - NUM_SIDES(cur_drv))); - switch (fd_seek(cur_drv, kh, kt, ks, fdctrl->config & FD_CONFIG_EIS)) { - case 2: - /* sect too big */ - fdctrl_stop_transfer(fdctrl, FD_SR0_ABNTERM, 0x00, 0x00); - fdctrl->fifo[3] = kt; - fdctrl->fifo[4] = kh; - fdctrl->fifo[5] = ks; - return; - case 3: - /* track too big */ - fdctrl_stop_transfer(fdctrl, FD_SR0_ABNTERM, FD_SR1_EC, 0x00); - fdctrl->fifo[3] = kt; - fdctrl->fifo[4] = kh; - fdctrl->fifo[5] = ks; - return; - case 4: - /* No seek enabled */ - fdctrl_stop_transfer(fdctrl, FD_SR0_ABNTERM, 0x00, 0x00); - fdctrl->fifo[3] = kt; - fdctrl->fifo[4] = kh; - fdctrl->fifo[5] = ks; - return; - case 1: - fdctrl->status0 |= FD_SR0_SEEK; - break; - default: - break; - } - memset(fdctrl->fifo, 0, FD_SECTOR_LEN); - if (cur_drv->blk == 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)); - fdctrl_stop_transfer(fdctrl, FD_SR0_ABNTERM | FD_SR0_SEEK, 0x00, 0x00); - } else { - if (cur_drv->sect == cur_drv->last_sect) { - fdctrl->data_state &= ~FD_STATE_FORMAT; - /* Last sector done */ - fdctrl_stop_transfer(fdctrl, 0x00, 0x00, 0x00); - } else { - /* More to do */ - fdctrl->data_pos = 0; - fdctrl->data_len = 4; - } - } -} - static void fdctrl_handle_lock(FDCtrl *fdctrl, int direction) { fdctrl->lock = (fdctrl->fifo[0] & 0x80) ? 1 : 0; @@ -2110,34 +2047,6 @@ static void fdctrl_handle_readid(FDCtrl *fdctrl, int direction) (NANOSECONDS_PER_SECOND / 50)); } -static void fdctrl_handle_format_track(FDCtrl *fdctrl, int direction) -{ - FDrive *cur_drv; - - SET_CUR_DRV(fdctrl, fdctrl->fifo[1] & FD_DOR_SELMASK); - cur_drv = get_cur_drv(fdctrl); - fdctrl->data_state |= FD_STATE_FORMAT; - if (fdctrl->fifo[0] & 0x80) - fdctrl->data_state |= FD_STATE_MULTI; - else - fdctrl->data_state &= ~FD_STATE_MULTI; - cur_drv->bps = - fdctrl->fifo[2] > 7 ? 16384 : 128 << fdctrl->fifo[2]; -#if 0 - cur_drv->last_sect = - cur_drv->flags & FDISK_DBL_SIDES ? fdctrl->fifo[3] : - fdctrl->fifo[3] / 2; -#else - cur_drv->last_sect = fdctrl->fifo[3]; -#endif - /* TODO: implement format using DMA expected by the Bochs BIOS - * and Linux fdformat (read 3 bytes per sector via DMA and fill - * the sector with the specified fill byte - */ - fdctrl->data_state &= ~FD_STATE_FORMAT; - fdctrl_stop_transfer(fdctrl, 0x00, 0x00, 0x00); -} - static void fdctrl_handle_specify(FDCtrl *fdctrl, int direction) { fdctrl->timer0 = (fdctrl->fifo[1] >> 4) & 0xF; @@ -2330,7 +2239,6 @@ static const FDCtrlCommand handlers[] = { { FD_CMD_SEEK, 0xff, "SEEK", 2, fdctrl_handle_seek }, { FD_CMD_SENSE_INTERRUPT_STATUS, 0xff, "SENSE INTERRUPT STATUS", 0, fdctrl_handle_sense_interrupt_status }, { FD_CMD_RECALIBRATE, 0xff, "RECALIBRATE", 1, fdctrl_handle_recalibrate }, - { FD_CMD_FORMAT_TRACK, 0xbf, "FORMAT TRACK", 5, fdctrl_handle_format_track }, { FD_CMD_READ_TRACK, 0xbf, "READ TRACK", 8, fdctrl_start_transfer, FD_DIR_READ }, { FD_CMD_RESTORE, 0xff, "RESTORE", 17, fdctrl_handle_restore }, /* part of READ DELETED DATA */ { FD_CMD_SAVE, 0xff, "SAVE", 0, fdctrl_handle_save }, /* part of READ DELETED DATA */ @@ -2448,11 +2356,6 @@ static void fdctrl_write_data(FDCtrl *fdctrl, uint32_t value) /* We have all parameters now, execute the command */ fdctrl->phase = FD_PHASE_EXECUTION; - if (fdctrl->data_state & FD_STATE_FORMAT) { - fdctrl_format_sector(fdctrl); - break; - } - cmd = get_command(fdctrl->fifo[0]); FLOPPY_DPRINTF("Calling handler for '%s'\n", cmd->name); cmd->handler(fdctrl, cmd->direction);