qemu-devel.nongnu.org archive mirror
 help / color / mirror / Atom feed
From: Kevin Wolf <kwolf@redhat.com>
To: anthony@codemonkey.ws
Cc: kwolf@redhat.com, qemu-devel@nongnu.org
Subject: [Qemu-devel] [PATCH 07/27] fdc: add a 'check media rate' property. Not used yet
Date: Wed, 29 Feb 2012 16:17:48 +0100	[thread overview]
Message-ID: <1330528688-21996-8-git-send-email-kwolf@redhat.com> (raw)
In-Reply-To: <1330528688-21996-1-git-send-email-kwolf@redhat.com>

From: Hervé Poussineau <hpoussin@reactos.org>

Set it to true for current Qemu versions, and false for previous ones

Signed-off-by: Hervé Poussineau <hpoussin@reactos.org>
Signed-off-by: Kevin Wolf <kwolf@redhat.com>
---
 hw/fdc.c     |    3 +++
 hw/pc_piix.c |   28 ++++++++++++++++++++++++++++
 2 files changed, 31 insertions(+), 0 deletions(-)

diff --git a/hw/fdc.c b/hw/fdc.c
index 08012f9..1c7e775 100644
--- a/hw/fdc.c
+++ b/hw/fdc.c
@@ -420,6 +420,7 @@ struct FDCtrl {
     int sun4m;
     FDrive drives[MAX_FD];
     int reset_sensei;
+    uint32_t check_media_rate;
     /* Timers state */
     uint8_t timer0;
     uint8_t timer1;
@@ -2003,6 +2004,8 @@ static Property isa_fdc_properties[] = {
     DEFINE_PROP_DRIVE("driveB", FDCtrlISABus, state.drives[1].bs),
     DEFINE_PROP_INT32("bootindexA", FDCtrlISABus, bootindexA, -1),
     DEFINE_PROP_INT32("bootindexB", FDCtrlISABus, bootindexB, -1),
+    DEFINE_PROP_BIT("check_media_rate", FDCtrlISABus, state.check_media_rate,
+                    0, true),
     DEFINE_PROP_END_OF_LIST(),
 };
 
diff --git a/hw/pc_piix.c b/hw/pc_piix.c
index 5e11d15..6c5c40f 100644
--- a/hw/pc_piix.c
+++ b/hw/pc_piix.c
@@ -384,6 +384,10 @@ static QEMUMachine pc_machine_v1_0 = {
             .driver   = "pc-sysfw",
             .property = "rom_only",
             .value    = stringify(1),
+        }, {
+            .driver   = "isa-fdc",
+            .property = "check_media_rate",
+            .value    = "off",
         },
         { /* end of list */ }
     },
@@ -399,6 +403,10 @@ static QEMUMachine pc_machine_v0_15 = {
             .driver   = "pc-sysfw",
             .property = "rom_only",
             .value    = stringify(1),
+        }, {
+            .driver   = "isa-fdc",
+            .property = "check_media_rate",
+            .value    = "off",
         },
         { /* end of list */ }
     },
@@ -434,6 +442,10 @@ static QEMUMachine pc_machine_v0_14 = {
             .driver   = "virtio-balloon-pci",
             .property = "event_idx",
             .value    = "off",
+        },{
+            .driver   = "isa-fdc",
+            .property = "check_media_rate",
+            .value    = "off",
         },
         {
             .driver   = "pc-sysfw",
@@ -486,6 +498,10 @@ static QEMUMachine pc_machine_v0_13 = {
             .driver   = "AC97",
             .property = "use_broken_id",
             .value    = stringify(1),
+        },{
+            .driver   = "isa-fdc",
+            .property = "check_media_rate",
+            .value    = "off",
         },
         {
             .driver   = "pc-sysfw",
@@ -542,6 +558,10 @@ static QEMUMachine pc_machine_v0_12 = {
             .driver   = "AC97",
             .property = "use_broken_id",
             .value    = stringify(1),
+        },{
+            .driver   = "isa-fdc",
+            .property = "check_media_rate",
+            .value    = "off",
         },
         {
             .driver   = "pc-sysfw",
@@ -606,6 +626,10 @@ static QEMUMachine pc_machine_v0_11 = {
             .driver   = "AC97",
             .property = "use_broken_id",
             .value    = stringify(1),
+        },{
+            .driver   = "isa-fdc",
+            .property = "check_media_rate",
+            .value    = "off",
         },
         {
             .driver   = "pc-sysfw",
@@ -682,6 +706,10 @@ static QEMUMachine pc_machine_v0_10 = {
             .driver   = "AC97",
             .property = "use_broken_id",
             .value    = stringify(1),
+        },{
+            .driver   = "isa-fdc",
+            .property = "check_media_rate",
+            .value    = "off",
         },
         {
             .driver   = "pc-sysfw",
-- 
1.7.6.5

  parent reply	other threads:[~2012-02-29 15:15 UTC|newest]

Thread overview: 29+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2012-02-29 15:17 [Qemu-devel] [PULL 00/27] Block patches Kevin Wolf
2012-02-29 15:17 ` [Qemu-devel] [PATCH 01/27] fdc: take side count into account Kevin Wolf
2012-02-29 15:17 ` [Qemu-devel] [PATCH 02/27] fdc: set busy bit when starting a command Kevin Wolf
2012-02-29 15:17 ` [Qemu-devel] [PATCH 03/27] fdc: most control commands do not generate interrupts Kevin Wolf
2012-02-29 15:17 ` [Qemu-devel] [PATCH 04/27] fdc: handle read-only floppies (abort early on write commands) Kevin Wolf
2012-02-29 15:17 ` [Qemu-devel] [PATCH 05/27] fdc: add CCR (Configuration Control Register) write register Kevin Wolf
2012-02-29 15:17 ` [Qemu-devel] [PATCH 06/27] block: add a transfer rate for floppy types Kevin Wolf
2012-02-29 15:17 ` Kevin Wolf [this message]
2012-02-29 15:17 ` [Qemu-devel] [PATCH 08/27] fdc: check if media rate is correct before doing any transfer Kevin Wolf
2012-02-29 15:17 ` [Qemu-devel] [PATCH 09/27] fdc: fix seek command, which shouldn't check tracks Kevin Wolf
2012-02-29 15:17 ` [Qemu-devel] [PATCH 10/27] fdc: DIR (Digital Input Register) should return status of current drive Kevin Wolf
2012-02-29 15:17 ` [Qemu-devel] [PATCH 11/27] ide: fail I/O to empty disk Kevin Wolf
2012-02-29 15:17 ` [Qemu-devel] [PATCH 12/27] qcow2: Fix build with DEBUG_EXT enabled Kevin Wolf
2012-02-29 15:17 ` [Qemu-devel] [PATCH 13/27] block: remove unused fields in BlockDriverState Kevin Wolf
2012-02-29 15:17 ` [Qemu-devel] [PATCH 14/27] block: drop aio_multiwrite in BlockDriver Kevin Wolf
2012-02-29 15:17 ` [Qemu-devel] [PATCH 15/27] qcow2: Fix offset in qcow2_read_extensions Kevin Wolf
2012-02-29 15:17 ` [Qemu-devel] [PATCH 16/27] qcow2: Reject too large header extensions Kevin Wolf
2012-02-29 15:17 ` [Qemu-devel] [PATCH 17/27] qapi: Introduce blockdev-group-snapshot-sync command Kevin Wolf
2012-02-29 15:17 ` [Qemu-devel] [PATCH 18/27] QMP: Add qmp command for blockdev-group-snapshot-sync Kevin Wolf
2012-02-29 15:18 ` [Qemu-devel] [PATCH 19/27] qemu-iotests: export TEST_DIR for non-bash tests Kevin Wolf
2012-02-29 15:18 ` [Qemu-devel] [PATCH 20/27] qemu-iotests: add iotests Python module Kevin Wolf
2012-02-29 15:18 ` [Qemu-devel] [PATCH 21/27] test: add image streaming tests Kevin Wolf
2012-02-29 15:18 ` [Qemu-devel] [PATCH 22/27] qemu-iotests: Filter out DOS line endings Kevin Wolf
2012-02-29 15:18 ` [Qemu-devel] [PATCH 23/27] qemu-iotests: 026: Reduce output changes for cache=none qcow2 Kevin Wolf
2012-02-29 15:18 ` [Qemu-devel] [PATCH 24/27] qemu-iotests: Test rebase with short backing file Kevin Wolf
2012-02-29 15:18 ` [Qemu-devel] [PATCH 25/27] qemu-tool: revert cpu_get_clock() abort(3) Kevin Wolf
2012-02-29 15:18 ` [Qemu-devel] [PATCH 26/27] qemu-io: fix segment fault when the image format is qed Kevin Wolf
2012-02-29 15:18 ` [Qemu-devel] [PATCH 27/27] qemu-img: " Kevin Wolf
2012-02-29 21:06 ` [Qemu-devel] [PULL 00/27] Block patches Anthony Liguori

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1330528688-21996-8-git-send-email-kwolf@redhat.com \
    --to=kwolf@redhat.com \
    --cc=anthony@codemonkey.ws \
    --cc=qemu-devel@nongnu.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).