* [Qemu-devel] [PATCH] ide scsi: Mess with geometry only for hard disk devices
@ 2012-07-12 16:52 Markus Armbruster
2012-07-23 7:25 ` Markus Armbruster
0 siblings, 1 reply; 4+ messages in thread
From: Markus Armbruster @ 2012-07-12 16:52 UTC (permalink / raw)
To: qemu-devel; +Cc: kwolf
Legacy -drive cyls=... are now ignored completely when the drive
doesn't back a hard disk device. Before, they were first checked
against a hard disk's limits, then ignored.
Signed-off-by: Markus Armbruster <armbru@redhat.com>
---
hw/ide/qdev.c | 3 ++-
hw/scsi-disk.c | 3 ++-
2 files changed, 4 insertions(+), 2 deletions(-)
diff --git a/hw/ide/qdev.c b/hw/ide/qdev.c
index 22e58df..5ea9b8f 100644
--- a/hw/ide/qdev.c
+++ b/hw/ide/qdev.c
@@ -149,7 +149,8 @@ static int ide_dev_initfn(IDEDevice *dev, IDEDriveKind kind)
}
blkconf_serial(&dev->conf, &dev->serial);
- if (blkconf_geometry(&dev->conf, &dev->chs_trans, 65536, 16, 255) < 0) {
+ if (kind != IDE_CD
+ && blkconf_geometry(&dev->conf, &dev->chs_trans, 65536, 16, 255) < 0) {
return -1;
}
diff --git a/hw/scsi-disk.c b/hw/scsi-disk.c
index 525816c..318318c 100644
--- a/hw/scsi-disk.c
+++ b/hw/scsi-disk.c
@@ -1750,7 +1750,8 @@ static int scsi_initfn(SCSIDevice *dev)
}
blkconf_serial(&s->qdev.conf, &s->serial);
- if (blkconf_geometry(&dev->conf, NULL, 65535, 255, 255) < 0) {
+ if (dev->type == TYPE_DISK
+ && blkconf_geometry(&dev->conf, NULL, 65535, 255, 255) < 0) {
return -1;
}
--
1.7.6.5
^ permalink raw reply related [flat|nested] 4+ messages in thread
* Re: [Qemu-devel] [PATCH] ide scsi: Mess with geometry only for hard disk devices
2012-07-12 16:52 [Qemu-devel] [PATCH] ide scsi: Mess with geometry only for hard disk devices Markus Armbruster
@ 2012-07-23 7:25 ` Markus Armbruster
2012-07-23 10:03 ` Paolo Bonzini
0 siblings, 1 reply; 4+ messages in thread
From: Markus Armbruster @ 2012-07-23 7:25 UTC (permalink / raw)
To: qemu-devel; +Cc: kwolf
Ping?
Markus Armbruster <armbru@redhat.com> writes:
> Legacy -drive cyls=... are now ignored completely when the drive
> doesn't back a hard disk device. Before, they were first checked
> against a hard disk's limits, then ignored.
>
> Signed-off-by: Markus Armbruster <armbru@redhat.com>
> ---
> hw/ide/qdev.c | 3 ++-
> hw/scsi-disk.c | 3 ++-
> 2 files changed, 4 insertions(+), 2 deletions(-)
>
> diff --git a/hw/ide/qdev.c b/hw/ide/qdev.c
> index 22e58df..5ea9b8f 100644
> --- a/hw/ide/qdev.c
> +++ b/hw/ide/qdev.c
> @@ -149,7 +149,8 @@ static int ide_dev_initfn(IDEDevice *dev, IDEDriveKind kind)
> }
>
> blkconf_serial(&dev->conf, &dev->serial);
> - if (blkconf_geometry(&dev->conf, &dev->chs_trans, 65536, 16, 255) < 0) {
> + if (kind != IDE_CD
> + && blkconf_geometry(&dev->conf, &dev->chs_trans, 65536, 16, 255) < 0) {
> return -1;
> }
>
> diff --git a/hw/scsi-disk.c b/hw/scsi-disk.c
> index 525816c..318318c 100644
> --- a/hw/scsi-disk.c
> +++ b/hw/scsi-disk.c
> @@ -1750,7 +1750,8 @@ static int scsi_initfn(SCSIDevice *dev)
> }
>
> blkconf_serial(&s->qdev.conf, &s->serial);
> - if (blkconf_geometry(&dev->conf, NULL, 65535, 255, 255) < 0) {
> + if (dev->type == TYPE_DISK
> + && blkconf_geometry(&dev->conf, NULL, 65535, 255, 255) < 0) {
> return -1;
> }
^ permalink raw reply [flat|nested] 4+ messages in thread
* Re: [Qemu-devel] [PATCH] ide scsi: Mess with geometry only for hard disk devices
2012-07-23 7:25 ` Markus Armbruster
@ 2012-07-23 10:03 ` Paolo Bonzini
2012-07-26 13:42 ` Kevin Wolf
0 siblings, 1 reply; 4+ messages in thread
From: Paolo Bonzini @ 2012-07-23 10:03 UTC (permalink / raw)
To: Markus Armbruster; +Cc: kwolf, qemu-devel
Il 23/07/2012 09:25, Markus Armbruster ha scritto:
> Ping?
>
> Markus Armbruster <armbru@redhat.com> writes:
>
>> Legacy -drive cyls=... are now ignored completely when the drive
>> doesn't back a hard disk device. Before, they were first checked
>> against a hard disk's limits, then ignored.
>>
>> Signed-off-by: Markus Armbruster <armbru@redhat.com>
>> ---
>> hw/ide/qdev.c | 3 ++-
>> hw/scsi-disk.c | 3 ++-
>> 2 files changed, 4 insertions(+), 2 deletions(-)
>>
>> diff --git a/hw/ide/qdev.c b/hw/ide/qdev.c
>> index 22e58df..5ea9b8f 100644
>> --- a/hw/ide/qdev.c
>> +++ b/hw/ide/qdev.c
>> @@ -149,7 +149,8 @@ static int ide_dev_initfn(IDEDevice *dev, IDEDriveKind kind)
>> }
>>
>> blkconf_serial(&dev->conf, &dev->serial);
>> - if (blkconf_geometry(&dev->conf, &dev->chs_trans, 65536, 16, 255) < 0) {
>> + if (kind != IDE_CD
>> + && blkconf_geometry(&dev->conf, &dev->chs_trans, 65536, 16, 255) < 0) {
>> return -1;
>> }
>>
>> diff --git a/hw/scsi-disk.c b/hw/scsi-disk.c
>> index 525816c..318318c 100644
>> --- a/hw/scsi-disk.c
>> +++ b/hw/scsi-disk.c
>> @@ -1750,7 +1750,8 @@ static int scsi_initfn(SCSIDevice *dev)
>> }
>>
>> blkconf_serial(&s->qdev.conf, &s->serial);
>> - if (blkconf_geometry(&dev->conf, NULL, 65535, 255, 255) < 0) {
>> + if (dev->type == TYPE_DISK
>> + && blkconf_geometry(&dev->conf, NULL, 65535, 255, 255) < 0) {
>> return -1;
>> }
>
>
Acked-by: Paolo Bonzini <pbonzini@redhat.com>
Kevin, are you taking this patch?
Paolo
^ permalink raw reply [flat|nested] 4+ messages in thread
* Re: [Qemu-devel] [PATCH] ide scsi: Mess with geometry only for hard disk devices
2012-07-23 10:03 ` Paolo Bonzini
@ 2012-07-26 13:42 ` Kevin Wolf
0 siblings, 0 replies; 4+ messages in thread
From: Kevin Wolf @ 2012-07-26 13:42 UTC (permalink / raw)
To: Paolo Bonzini; +Cc: Markus Armbruster, qemu-devel
Am 23.07.2012 12:03, schrieb Paolo Bonzini:
> Il 23/07/2012 09:25, Markus Armbruster ha scritto:
>> Ping?
>>
>> Markus Armbruster <armbru@redhat.com> writes:
>>
>>> Legacy -drive cyls=... are now ignored completely when the drive
>>> doesn't back a hard disk device. Before, they were first checked
>>> against a hard disk's limits, then ignored.
>>>
>>> Signed-off-by: Markus Armbruster <armbru@redhat.com>
>>> ---
>>> hw/ide/qdev.c | 3 ++-
>>> hw/scsi-disk.c | 3 ++-
>>> 2 files changed, 4 insertions(+), 2 deletions(-)
>>>
>>> diff --git a/hw/ide/qdev.c b/hw/ide/qdev.c
>>> index 22e58df..5ea9b8f 100644
>>> --- a/hw/ide/qdev.c
>>> +++ b/hw/ide/qdev.c
>>> @@ -149,7 +149,8 @@ static int ide_dev_initfn(IDEDevice *dev, IDEDriveKind kind)
>>> }
>>>
>>> blkconf_serial(&dev->conf, &dev->serial);
>>> - if (blkconf_geometry(&dev->conf, &dev->chs_trans, 65536, 16, 255) < 0) {
>>> + if (kind != IDE_CD
>>> + && blkconf_geometry(&dev->conf, &dev->chs_trans, 65536, 16, 255) < 0) {
>>> return -1;
>>> }
>>>
>>> diff --git a/hw/scsi-disk.c b/hw/scsi-disk.c
>>> index 525816c..318318c 100644
>>> --- a/hw/scsi-disk.c
>>> +++ b/hw/scsi-disk.c
>>> @@ -1750,7 +1750,8 @@ static int scsi_initfn(SCSIDevice *dev)
>>> }
>>>
>>> blkconf_serial(&s->qdev.conf, &s->serial);
>>> - if (blkconf_geometry(&dev->conf, NULL, 65535, 255, 255) < 0) {
>>> + if (dev->type == TYPE_DISK
>>> + && blkconf_geometry(&dev->conf, NULL, 65535, 255, 255) < 0) {
>>> return -1;
>>> }
>>
>>
>
> Acked-by: Paolo Bonzini <pbonzini@redhat.com>
>
> Kevin, are you taking this patch?
Thanks, applied to the block branch.
Kevin
^ permalink raw reply [flat|nested] 4+ messages in thread
end of thread, other threads:[~2012-07-26 13:42 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2012-07-12 16:52 [Qemu-devel] [PATCH] ide scsi: Mess with geometry only for hard disk devices Markus Armbruster
2012-07-23 7:25 ` Markus Armbruster
2012-07-23 10:03 ` Paolo Bonzini
2012-07-26 13:42 ` Kevin Wolf
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).