From: "Hervé Poussineau" <hpoussin@reactos.org>
To: qemu-devel@nongnu.org
Cc: "Kevin Wolf" <kwolf@redhat.com>,
"Hervé Poussineau" <hpoussin@reactos.org>
Subject: [Qemu-devel] [PATCH v4 08/11] fdc: add a 'check media rate' property. Not used yet
Date: Mon, 6 Feb 2012 22:29:09 +0100 [thread overview]
Message-ID: <1328563752-3976-9-git-send-email-hpoussin@reactos.org> (raw)
In-Reply-To: <1328563752-3976-1-git-send-email-hpoussin@reactos.org>
Set it to true for current Qemu versions, and false for previous ones
Signed-off-by: Hervé Poussineau <hpoussin@reactos.org>
---
hw/fdc.c | 3 +++
hw/pc_piix.c | 36 ++++++++++++++++++++++++++++++++++++
2 files changed, 39 insertions(+), 0 deletions(-)
diff --git a/hw/fdc.c b/hw/fdc.c
index 7c675f6..af007ae 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 400c6b6..baaecd9 100644
--- a/hw/pc_piix.c
+++ b/hw/pc_piix.c
@@ -386,6 +386,14 @@ static QEMUMachine pc_machine_v1_0 = {
.init = pc_init_pci,
.max_cpus = 255,
.is_default = 1,
+ .compat_props = (GlobalProperty[]) {
+ {
+ .driver = "isa-fdc",
+ .property = "check_media_rate",
+ .value = "off",
+ },
+ { /* end of list */ }
+ },
};
static QEMUMachine pc_machine_v0_15 = {
@@ -394,6 +402,14 @@ static QEMUMachine pc_machine_v0_15 = {
.init = pc_init_pci,
.max_cpus = 255,
.is_default = 1,
+ .compat_props = (GlobalProperty[]) {
+ {
+ .driver = "isa-fdc",
+ .property = "check_media_rate",
+ .value = "off",
+ },
+ { /* end of list */ }
+ },
};
static QEMUMachine pc_machine_v0_14 = {
@@ -426,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",
},
{ /* end of list */ }
},
@@ -473,6 +493,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",
},
{ /* end of list */ }
},
@@ -524,6 +548,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",
},
{ /* end of list */ }
}
@@ -583,6 +611,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",
},
{ /* end of list */ }
}
@@ -654,6 +686,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",
},
{ /* end of list */ }
},
--
1.7.8.3
next prev parent reply other threads:[~2012-02-06 21:30 UTC|newest]
Thread overview: 18+ messages / expand[flat|nested] mbox.gz Atom feed top
2012-02-06 21:29 [Qemu-devel] [PATCH v4 00/11] Misc fixes for floppy emulation Hervé Poussineau
2012-02-06 21:29 ` [Qemu-devel] [PATCH v4 01/11] fdc: take side count into account Hervé Poussineau
2012-02-06 21:29 ` [Qemu-devel] [PATCH v4 02/11] fdc: set busy bit when starting a command Hervé Poussineau
2012-02-06 21:29 ` [Qemu-devel] [PATCH v4 03/11] fdc: most control commands do not generate interrupts Hervé Poussineau
2012-02-06 21:29 ` [Qemu-devel] [PATCH v4 04/11] fdc: handle read-only floppies (abort early on write commands) Hervé Poussineau
2012-02-06 21:29 ` [Qemu-devel] [PATCH v4 05/11] fdc: add CCR (Configuration Control Register) write register Hervé Poussineau
2012-02-06 21:29 ` [Qemu-devel] [PATCH v4 06/11] block: add a transfer rate for floppy types Hervé Poussineau
2012-02-06 21:29 ` [Qemu-devel] [PATCH v4 07/11] pc: add 1.1 machine type Hervé Poussineau
2012-02-14 15:11 ` Kevin Wolf
2012-02-06 21:29 ` Hervé Poussineau [this message]
2012-02-06 21:29 ` [Qemu-devel] [PATCH v4 09/11] fdc: check if media rate is correct before doing any transfer Hervé Poussineau
2012-02-14 15:16 ` Kevin Wolf
2012-02-14 15:28 ` Paolo Bonzini
2012-02-14 15:34 ` Kevin Wolf
2012-02-06 21:29 ` [Qemu-devel] [PATCH v4 10/11] fdc: fix seek command, which shouldn't check tracks Hervé Poussineau
2012-02-06 21:29 ` [Qemu-devel] [PATCH v4 11/11] fdc: DIR (Digital Input Register) should return status of current drive Hervé Poussineau
2012-02-14 12:31 ` [Qemu-devel] [PATCH v4 00/11] Misc fixes for floppy emulation Hervé Poussineau
2012-02-14 15:27 ` Kevin Wolf
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=1328563752-3976-9-git-send-email-hpoussin@reactos.org \
--to=hpoussin@reactos.org \
--cc=kwolf@redhat.com \
--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).