From nobody Sun Feb 8 23:03:59 2026 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of redhat.com designates 63.128.21.124 as permitted sender) client-ip=63.128.21.124; envelope-from=libvir-list-bounces@redhat.com; helo=us-smtp-delivery-124.mimecast.com; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 63.128.21.124 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=pass(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1612372776; cv=none; d=zohomail.com; s=zohoarc; b=Yv7vu43/YMEXSUzJhPtmTNQOULVZLVSGpVgxMB232txKMBORYx+0Ui/hnGNvdBogQ2ARdr8s3Wab7+pDsozVxhcfaZKDZTyjRqhXMwXh163htckCqqO0p7RJC4SQBOn09SfLl4fYqQa5K1AQHEJ2T/Wd0YQaYyMo3grftm6jwpA= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1612372776; 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=kYklCZBhA7V8LFsFYA0gNo4ysA72N5WDoOxZLU9rWOs=; b=ZUvpws+Ua+QYl0AMOiPgXgAV8S69w2+tGULwg56othgJ7+YBdIWDXUBeSlhGhuEBHxRf1xHZ00IOdImQxLbllUikyuvYEY2zhYl8rKjqgu+FTFrJpC6SEC3PCYwtBiYgyOTh4+RZQ24EIYgjBXo0td1kPb2noTBzi1YluH5ErEM= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 63.128.21.124 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=pass header.from= (p=none dis=none) header.from= Return-Path: Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [63.128.21.124]) by mx.zohomail.com with SMTPS id 1612372776053365.3500759475876; Wed, 3 Feb 2021 09:19:36 -0800 (PST) Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-136-5YGapZvANCClewzQwy8AWQ-1; Wed, 03 Feb 2021 12:19:33 -0500 Received: from smtp.corp.redhat.com (int-mx04.intmail.prod.int.phx2.redhat.com [10.5.11.14]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 5A3758030B7; Wed, 3 Feb 2021 17:19:27 +0000 (UTC) Received: from colo-mx.corp.redhat.com (colo-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.21]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 384CA5D9F4; Wed, 3 Feb 2021 17:19:27 +0000 (UTC) Received: from lists01.pubmisc.prod.ext.phx2.redhat.com (lists01.pubmisc.prod.ext.phx2.redhat.com [10.5.19.33]) by colo-mx.corp.redhat.com (Postfix) with ESMTP id 0331257DFE; Wed, 3 Feb 2021 17:19:27 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx06.intmail.prod.int.phx2.redhat.com [10.5.11.16]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id 113HJOdh020630 for ; Wed, 3 Feb 2021 12:19:24 -0500 Received: by smtp.corp.redhat.com (Postfix) id A22915C238; Wed, 3 Feb 2021 17:19:24 +0000 (UTC) Received: from thuth.com (ovpn-112-165.ams2.redhat.com [10.36.112.165]) by smtp.corp.redhat.com (Postfix) with ESMTP id 514C15886C; Wed, 3 Feb 2021 17:19:22 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1612372775; h=from:from:sender:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references:list-id:list-help: list-unsubscribe:list-subscribe:list-post; bh=kYklCZBhA7V8LFsFYA0gNo4ysA72N5WDoOxZLU9rWOs=; b=WDc9Zaux40vtGpCIDFzKqXNADUbVDJMfx5wKZeeH7zXH/cQnwOyqB4yRB4ENgmz/eGNokV EmIHpRmNDigE7RIxpu6A7QLcE8A2mxxc4N4OcpNBxtqNBmrFRWM2xRKYI2OBo1dv1NpBj+ ROb1V2DGOybgViAYuybnx6Qp0fzo+d8= X-MC-Unique: 5YGapZvANCClewzQwy8AWQ-1 From: Thomas Huth To: qemu-devel@nongnu.org, Paolo Bonzini Subject: [PATCH 2/4] hw/block/fdc: Remove the check_media_rate property Date: Wed, 3 Feb 2021 18:18:30 +0100 Message-Id: <20210203171832.483176-3-thuth@redhat.com> In-Reply-To: <20210203171832.483176-1-thuth@redhat.com> References: <20210203171832.483176-1-thuth@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.16 X-loop: libvir-list@redhat.com Cc: Eduardo Habkost , qemu-block@nongnu.org, David Hildenbrand , libvir-list@redhat.com, "Michael S. Tsirkin" , Gerd Hoffmann , John Snow X-BeenThere: libvir-list@redhat.com X-Mailman-Version: 2.1.12 Precedence: junk List-Id: Development discussions about the libvirt library & tools List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: libvir-list-bounces@redhat.com Errors-To: libvir-list-bounces@redhat.com X-Scanned-By: MIMEDefang 2.79 on 10.5.11.14 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=libvir-list-bounces@redhat.com X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @redhat.com) Content-Type: text/plain; charset="utf-8" This was only required for the pc-1.0 and earlier machine types. Now that these have been removed, we can also drop the corresponding code from the FDC device. Signed-off-by: Thomas Huth Acked-by: John Snow Reviewed-by: John Snow --- hw/block/fdc.c | 17 ++--------------- tests/qemu-iotests/172.out | 35 ----------------------------------- 2 files changed, 2 insertions(+), 50 deletions(-) diff --git a/hw/block/fdc.c b/hw/block/fdc.c index 292ea87805..198940e737 100644 --- a/hw/block/fdc.c +++ b/hw/block/fdc.c @@ -874,7 +874,6 @@ struct FDCtrl { FloppyDriveType type; } qdev_for_drives[MAX_FD]; int reset_sensei; - uint32_t check_media_rate; FloppyDriveType fallback; /* type=3Dauto failure fallback */ /* Timers state */ uint8_t timer0; @@ -1021,18 +1020,10 @@ static const VMStateDescription vmstate_fdrive_medi= a_changed =3D { } }; =20 -static bool fdrive_media_rate_needed(void *opaque) -{ - FDrive *drive =3D opaque; - - return drive->fdctrl->check_media_rate; -} - static const VMStateDescription vmstate_fdrive_media_rate =3D { .name =3D "fdrive/media_rate", .version_id =3D 1, .minimum_version_id =3D 1, - .needed =3D fdrive_media_rate_needed, .fields =3D (VMStateField[]) { VMSTATE_UINT8(media_rate, FDrive), VMSTATE_END_OF_LIST() @@ -1689,8 +1680,7 @@ static void fdctrl_start_transfer(FDCtrl *fdctrl, int= direction) =20 /* Check the data rate. If the programmed data rate does not match * the currently inserted medium, the operation has to fail. */ - if (fdctrl->check_media_rate && - (fdctrl->dsr & FD_DSR_DRATEMASK) !=3D cur_drv->media_rate) { + if ((fdctrl->dsr & FD_DSR_DRATEMASK) !=3D cur_drv->media_rate) { FLOPPY_DPRINTF("data rate mismatch (fdc=3D%d, media=3D%d)\n", fdctrl->dsr & FD_DSR_DRATEMASK, cur_drv->media_rate= ); fdctrl_stop_transfer(fdctrl, FD_SR0_ABNTERM, FD_SR1_MA, 0x00); @@ -2489,8 +2479,7 @@ static void fdctrl_result_timer(void *opaque) cur_drv->sect =3D (cur_drv->sect % cur_drv->last_sect) + 1; } /* READ_ID can't automatically succeed! */ - if (fdctrl->check_media_rate && - (fdctrl->dsr & FD_DSR_DRATEMASK) !=3D cur_drv->media_rate) { + if ((fdctrl->dsr & FD_DSR_DRATEMASK) !=3D cur_drv->media_rate) { FLOPPY_DPRINTF("read id rate mismatch (fdc=3D%d, media=3D%d)\n", fdctrl->dsr & FD_DSR_DRATEMASK, cur_drv->media_rate= ); fdctrl_stop_transfer(fdctrl, FD_SR0_ABNTERM, FD_SR1_MA, 0x00); @@ -2895,8 +2884,6 @@ static Property isa_fdc_properties[] =3D { DEFINE_PROP_UINT32("dma", FDCtrlISABus, dma, 2), DEFINE_PROP_DRIVE("driveA", FDCtrlISABus, state.qdev_for_drives[0].blk= ), DEFINE_PROP_DRIVE("driveB", FDCtrlISABus, state.qdev_for_drives[1].blk= ), - DEFINE_PROP_BIT("check_media_rate", FDCtrlISABus, state.check_media_ra= te, - 0, true), DEFINE_PROP_SIGNED("fdtypeA", FDCtrlISABus, state.qdev_for_drives[0].t= ype, FLOPPY_DRIVE_TYPE_AUTO, qdev_prop_fdc_drive_type, FloppyDriveType), diff --git a/tests/qemu-iotests/172.out b/tests/qemu-iotests/172.out index 2cd4a8fd83..349ae51d6c 100644 --- a/tests/qemu-iotests/172.out +++ b/tests/qemu-iotests/172.out @@ -14,7 +14,6 @@ Testing: dma =3D 2 (0x2) driveA =3D "" driveB =3D "" - check_media_rate =3D true fdtypeA =3D "auto" fdtypeB =3D "auto" fallback =3D "288" @@ -44,7 +43,6 @@ Testing: -fda TEST_DIR/t.qcow2 dma =3D 2 (0x2) driveA =3D "" driveB =3D "" - check_media_rate =3D true fdtypeA =3D "auto" fdtypeB =3D "auto" fallback =3D "288" @@ -84,7 +82,6 @@ Testing: -fdb TEST_DIR/t.qcow2 dma =3D 2 (0x2) driveA =3D "" driveB =3D "" - check_media_rate =3D true fdtypeA =3D "auto" fdtypeB =3D "auto" fallback =3D "288" @@ -139,7 +136,6 @@ Testing: -fda TEST_DIR/t.qcow2 -fdb TEST_DIR/t.qcow2.2 dma =3D 2 (0x2) driveA =3D "" driveB =3D "" - check_media_rate =3D true fdtypeA =3D "auto" fdtypeB =3D "auto" fallback =3D "288" @@ -195,7 +191,6 @@ Testing: -fdb dma =3D 2 (0x2) driveA =3D "" driveB =3D "" - check_media_rate =3D true fdtypeA =3D "auto" fdtypeB =3D "auto" fallback =3D "288" @@ -236,7 +231,6 @@ Testing: -drive if=3Dfloppy,file=3DTEST_DIR/t.qcow2 dma =3D 2 (0x2) driveA =3D "" driveB =3D "" - check_media_rate =3D true fdtypeA =3D "auto" fdtypeB =3D "auto" fallback =3D "288" @@ -276,7 +270,6 @@ Testing: -drive if=3Dfloppy,file=3DTEST_DIR/t.qcow2,ind= ex=3D1 dma =3D 2 (0x2) driveA =3D "" driveB =3D "" - check_media_rate =3D true fdtypeA =3D "auto" fdtypeB =3D "auto" fallback =3D "288" @@ -331,7 +324,6 @@ Testing: -drive if=3Dfloppy,file=3DTEST_DIR/t.qcow2 -dr= ive if=3Dfloppy,file=3DTEST_DIR/t dma =3D 2 (0x2) driveA =3D "" driveB =3D "" - check_media_rate =3D true fdtypeA =3D "auto" fdtypeB =3D "auto" fallback =3D "288" @@ -392,7 +384,6 @@ Use -device floppy,unit=3D0,drive=3D... instead. dma =3D 2 (0x2) driveA =3D "" driveB =3D "" - check_media_rate =3D true fdtypeA =3D "auto" fdtypeB =3D "auto" fallback =3D "288" @@ -434,7 +425,6 @@ Use -device floppy,unit=3D1,drive=3D... instead. dma =3D 2 (0x2) driveA =3D "" driveB =3D "" - check_media_rate =3D true fdtypeA =3D "auto" fdtypeB =3D "auto" fallback =3D "288" @@ -478,7 +468,6 @@ Use -device floppy,unit=3D1,drive=3D... instead. dma =3D 2 (0x2) driveA =3D "" driveB =3D "" - check_media_rate =3D true fdtypeA =3D "auto" fdtypeB =3D "auto" fallback =3D "288" @@ -537,7 +526,6 @@ Testing: -drive if=3Dnone,file=3DTEST_DIR/t.qcow2 -devi= ce floppy,drive=3Dnone0 dma =3D 2 (0x2) driveA =3D "" driveB =3D "" - check_media_rate =3D true fdtypeA =3D "auto" fdtypeB =3D "auto" fallback =3D "288" @@ -577,7 +565,6 @@ Testing: -drive if=3Dnone,file=3DTEST_DIR/t.qcow2 -devi= ce floppy,drive=3Dnone0,unit=3D1 dma =3D 2 (0x2) driveA =3D "" driveB =3D "" - check_media_rate =3D true fdtypeA =3D "auto" fdtypeB =3D "auto" fallback =3D "288" @@ -617,7 +604,6 @@ Testing: -drive if=3Dnone,file=3DTEST_DIR/t.qcow2 -driv= e if=3Dnone,file=3DTEST_DIR/t.qco dma =3D 2 (0x2) driveA =3D "" driveB =3D "" - check_media_rate =3D true fdtypeA =3D "auto" fdtypeB =3D "auto" fallback =3D "288" @@ -678,7 +664,6 @@ Use -device floppy,unit=3D1,drive=3D... instead. dma =3D 2 (0x2) driveA =3D "" driveB =3D "" - check_media_rate =3D true fdtypeA =3D "auto" fdtypeB =3D "auto" fallback =3D "288" @@ -736,7 +721,6 @@ Use -device floppy,unit=3D0,drive=3D... instead. dma =3D 2 (0x2) driveA =3D "" driveB =3D "" - check_media_rate =3D true fdtypeA =3D "auto" fdtypeB =3D "auto" fallback =3D "288" @@ -808,7 +792,6 @@ Testing: -fda TEST_DIR/t.qcow2 -drive if=3Dnone,file=3D= TEST_DIR/t.qcow2.2 -device fl dma =3D 2 (0x2) driveA =3D "" driveB =3D "" - check_media_rate =3D true fdtypeA =3D "auto" fdtypeB =3D "auto" fallback =3D "288" @@ -864,7 +847,6 @@ Testing: -fda TEST_DIR/t.qcow2 -drive if=3Dnone,file=3D= TEST_DIR/t.qcow2.2 -device fl dma =3D 2 (0x2) driveA =3D "" driveB =3D "" - check_media_rate =3D true fdtypeA =3D "auto" fdtypeB =3D "auto" fallback =3D "288" @@ -920,7 +902,6 @@ Testing: -fdb TEST_DIR/t.qcow2 -drive if=3Dnone,file=3D= TEST_DIR/t.qcow2.2 -device fl dma =3D 2 (0x2) driveA =3D "" driveB =3D "" - check_media_rate =3D true fdtypeA =3D "auto" fdtypeB =3D "auto" fallback =3D "288" @@ -976,7 +957,6 @@ Testing: -fdb TEST_DIR/t.qcow2 -drive if=3Dnone,file=3D= TEST_DIR/t.qcow2.2 -device fl dma =3D 2 (0x2) driveA =3D "" driveB =3D "" - check_media_rate =3D true fdtypeA =3D "auto" fdtypeB =3D "auto" fallback =3D "288" @@ -1041,7 +1021,6 @@ Testing: -drive if=3Dfloppy,file=3DTEST_DIR/t.qcow2 -= drive if=3Dnone,file=3DTEST_DIR/t.q dma =3D 2 (0x2) driveA =3D "" driveB =3D "" - check_media_rate =3D true fdtypeA =3D "auto" fdtypeB =3D "auto" fallback =3D "288" @@ -1097,7 +1076,6 @@ Testing: -drive if=3Dfloppy,file=3DTEST_DIR/t.qcow2 -= drive if=3Dnone,file=3DTEST_DIR/t.q dma =3D 2 (0x2) driveA =3D "" driveB =3D "" - check_media_rate =3D true fdtypeA =3D "auto" fdtypeB =3D "auto" fallback =3D "288" @@ -1161,7 +1139,6 @@ Use -device floppy,unit=3D0,drive=3D... instead. dma =3D 2 (0x2) driveA =3D "" driveB =3D "" - check_media_rate =3D true fdtypeA =3D "auto" fdtypeB =3D "auto" fallback =3D "288" @@ -1219,7 +1196,6 @@ Use -device floppy,unit=3D0,drive=3D... instead. dma =3D 2 (0x2) driveA =3D "" driveB =3D "" - check_media_rate =3D true fdtypeA =3D "auto" fdtypeB =3D "auto" fallback =3D "288" @@ -1277,7 +1253,6 @@ Use -device floppy,unit=3D1,drive=3D... instead. dma =3D 2 (0x2) driveA =3D "" driveB =3D "" - check_media_rate =3D true fdtypeA =3D "auto" fdtypeB =3D "auto" fallback =3D "288" @@ -1335,7 +1310,6 @@ Use -device floppy,unit=3D1,drive=3D... instead. dma =3D 2 (0x2) driveA =3D "" driveB =3D "" - check_media_rate =3D true fdtypeA =3D "auto" fdtypeB =3D "auto" fallback =3D "288" @@ -1391,7 +1365,6 @@ Testing: -drive if=3Dnone,file=3DTEST_DIR/t.qcow2 -gl= obal floppy.drive=3Dnone0 -device dma =3D 2 (0x2) driveA =3D "" driveB =3D "" - check_media_rate =3D true fdtypeA =3D "auto" fdtypeB =3D "auto" fallback =3D "288" @@ -1473,7 +1446,6 @@ Testing: -device floppy dma =3D 2 (0x2) driveA =3D "" driveB =3D "" - check_media_rate =3D true fdtypeA =3D "auto" fdtypeB =3D "auto" fallback =3D "288" @@ -1500,7 +1472,6 @@ Testing: -device floppy,drive-type=3D120 dma =3D 2 (0x2) driveA =3D "" driveB =3D "" - check_media_rate =3D true fdtypeA =3D "auto" fdtypeB =3D "auto" fallback =3D "288" @@ -1527,7 +1498,6 @@ Testing: -device floppy,drive-type=3D144 dma =3D 2 (0x2) driveA =3D "" driveB =3D "" - check_media_rate =3D true fdtypeA =3D "auto" fdtypeB =3D "auto" fallback =3D "288" @@ -1554,7 +1524,6 @@ Testing: -device floppy,drive-type=3D288 dma =3D 2 (0x2) driveA =3D "" driveB =3D "" - check_media_rate =3D true fdtypeA =3D "auto" fdtypeB =3D "auto" fallback =3D "288" @@ -1584,7 +1553,6 @@ Testing: -drive if=3Dnone,file=3DTEST_DIR/t.qcow2 -de= vice floppy,drive=3Dnone0,drive-t dma =3D 2 (0x2) driveA =3D "" driveB =3D "" - check_media_rate =3D true fdtypeA =3D "auto" fdtypeB =3D "auto" fallback =3D "288" @@ -1624,7 +1592,6 @@ Testing: -drive if=3Dnone,file=3DTEST_DIR/t.qcow2 -de= vice floppy,drive=3Dnone0,drive-t dma =3D 2 (0x2) driveA =3D "" driveB =3D "" - check_media_rate =3D true fdtypeA =3D "auto" fdtypeB =3D "auto" fallback =3D "288" @@ -1667,7 +1634,6 @@ Testing: -drive if=3Dnone,file=3DTEST_DIR/t.qcow2 -de= vice floppy,drive=3Dnone0,logical dma =3D 2 (0x2) driveA =3D "" driveB =3D "" - check_media_rate =3D true fdtypeA =3D "auto" fdtypeB =3D "auto" fallback =3D "288" @@ -1707,7 +1673,6 @@ Testing: -drive if=3Dnone,file=3DTEST_DIR/t.qcow2 -de= vice floppy,drive=3Dnone0,physica dma =3D 2 (0x2) driveA =3D "" driveB =3D "" - check_media_rate =3D true fdtypeA =3D "auto" fdtypeB =3D "auto" fallback =3D "288" --=20 2.27.0