From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([208.118.235.92]:59904) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1S2lFK-00062s-JM for qemu-devel@nongnu.org; Wed, 29 Feb 2012 10:15:26 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1S2lEv-0003TV-5w for qemu-devel@nongnu.org; Wed, 29 Feb 2012 10:15:14 -0500 Received: from mx1.redhat.com ([209.132.183.28]:17515) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1S2lEu-0003TB-Tx for qemu-devel@nongnu.org; Wed, 29 Feb 2012 10:14:49 -0500 From: Kevin Wolf Date: Wed, 29 Feb 2012 16:17:48 +0100 Message-Id: <1330528688-21996-8-git-send-email-kwolf@redhat.com> In-Reply-To: <1330528688-21996-1-git-send-email-kwolf@redhat.com> References: <1330528688-21996-1-git-send-email-kwolf@redhat.com> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: quoted-printable Subject: [Qemu-devel] [PATCH 07/27] fdc: add a 'check media rate' property. Not used yet List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: anthony@codemonkey.ws Cc: kwolf@redhat.com, qemu-devel@nongnu.org From: Herv=C3=A9 Poussineau Set it to true for current Qemu versions, and false for previous ones Signed-off-by: Herv=C3=A9 Poussineau Signed-off-by: Kevin Wolf --- 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[] =3D { 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(), }; =20 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 =3D { .driver =3D "pc-sysfw", .property =3D "rom_only", .value =3D stringify(1), + }, { + .driver =3D "isa-fdc", + .property =3D "check_media_rate", + .value =3D "off", }, { /* end of list */ } }, @@ -399,6 +403,10 @@ static QEMUMachine pc_machine_v0_15 =3D { .driver =3D "pc-sysfw", .property =3D "rom_only", .value =3D stringify(1), + }, { + .driver =3D "isa-fdc", + .property =3D "check_media_rate", + .value =3D "off", }, { /* end of list */ } }, @@ -434,6 +442,10 @@ static QEMUMachine pc_machine_v0_14 =3D { .driver =3D "virtio-balloon-pci", .property =3D "event_idx", .value =3D "off", + },{ + .driver =3D "isa-fdc", + .property =3D "check_media_rate", + .value =3D "off", }, { .driver =3D "pc-sysfw", @@ -486,6 +498,10 @@ static QEMUMachine pc_machine_v0_13 =3D { .driver =3D "AC97", .property =3D "use_broken_id", .value =3D stringify(1), + },{ + .driver =3D "isa-fdc", + .property =3D "check_media_rate", + .value =3D "off", }, { .driver =3D "pc-sysfw", @@ -542,6 +558,10 @@ static QEMUMachine pc_machine_v0_12 =3D { .driver =3D "AC97", .property =3D "use_broken_id", .value =3D stringify(1), + },{ + .driver =3D "isa-fdc", + .property =3D "check_media_rate", + .value =3D "off", }, { .driver =3D "pc-sysfw", @@ -606,6 +626,10 @@ static QEMUMachine pc_machine_v0_11 =3D { .driver =3D "AC97", .property =3D "use_broken_id", .value =3D stringify(1), + },{ + .driver =3D "isa-fdc", + .property =3D "check_media_rate", + .value =3D "off", }, { .driver =3D "pc-sysfw", @@ -682,6 +706,10 @@ static QEMUMachine pc_machine_v0_10 =3D { .driver =3D "AC97", .property =3D "use_broken_id", .value =3D stringify(1), + },{ + .driver =3D "isa-fdc", + .property =3D "check_media_rate", + .value =3D "off", }, { .driver =3D "pc-sysfw", --=20 1.7.6.5