[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] Re: [PATCH 05/14] ide: Remove redundant IDEState member con
From: |
Kevin Wolf |
Subject: |
[Qemu-devel] Re: [PATCH 05/14] ide: Remove redundant IDEState member conf |
Date: |
Mon, 31 May 2010 16:56:43 +0200 |
User-agent: |
Mozilla/5.0 (X11; U; Linux x86_64; en-US; rv:1.9.1.9) Gecko/20100430 Fedora/3.0.4-2.fc12 Thunderbird/3.0.4 |
Am 28.05.2010 15:38, schrieb Markus Armbruster:
> Commit 428c149b added IDEState member conf to let commit 0009baf1 find
> the BlockConf from there. It exists only for qdev drives, created via
> ide_drive_initfn(), not for drives created via ide_init2().
>
> But for a qdev drive, we can just as well reach its IDEDevice, which
> contains the BlockConf. Do that, and revert the parts of commit
> 428c149b that add IDEState member conf.
>
> Signed-off-by: Markus Armbruster <address@hidden>
> ---
> hw/ide/core.c | 16 +++++++---------
> hw/ide/internal.h | 4 +---
> hw/ide/qdev.c | 3 +--
> 3 files changed, 9 insertions(+), 14 deletions(-)
>
> diff --git a/hw/ide/core.c b/hw/ide/core.c
> index 066fecb..c3334b1 100644
> --- a/hw/ide/core.c
> +++ b/hw/ide/core.c
> @@ -98,6 +98,7 @@ static void ide_identify(IDEState *s)
> {
> uint16_t *p;
> unsigned int oldsize;
> + IDEDevice *dev;
>
> if (s->identify_set) {
> memcpy(s->io_buffer, s->identify_data, sizeof(s->identify_data));
> @@ -165,8 +166,9 @@ static void ide_identify(IDEState *s)
> put_le16(p + 101, s->nb_sectors >> 16);
> put_le16(p + 102, s->nb_sectors >> 32);
> put_le16(p + 103, s->nb_sectors >> 48);
> - if (s->conf && s->conf->physical_block_size)
> - put_le16(p + 106, 0x6000 | get_physical_block_exp(s->conf));
> + dev = s->unit ? s->bus->slave : s->bus->master;
> + if (dev && dev->conf.physical_block_size)
If this is meant to be the same condition it would be dev->conf && ...
I can't really tell right now if it can happen that either dev or
dev->conf can be NULL here. In a quick attempt I couldn't get either one.
So, which version is correct, or should the first part be dropped
completely?
Kevin
- [Qemu-devel] [PATCH 00/14] Block-related fixes and cleanups, Markus Armbruster, 2010/05/28
- [Qemu-devel] [PATCH 09/14] qdev: New qdev_prop_set_string(), Markus Armbruster, 2010/05/28
- [Qemu-devel] [PATCH 06/14] ide: Split ide_init1() off ide_init2(), Markus Armbruster, 2010/05/28
- [Qemu-devel] [PATCH 08/14] ide: Split non-qdev code off ide_init2(), Markus Armbruster, 2010/05/28
- [Qemu-devel] [PATCH 10/14] qdev: Don't leak string property value on hot unplug, Markus Armbruster, 2010/05/28
- [Qemu-devel] [PATCH 07/14] ide: Change ide_init_drive() to require valid dinfo argument, Markus Armbruster, 2010/05/28
- [Qemu-devel] [PATCH 05/14] ide: Remove redundant IDEState member conf, Markus Armbruster, 2010/05/28
- [Qemu-devel] Re: [PATCH 05/14] ide: Remove redundant IDEState member conf,
Kevin Wolf <=
- [Qemu-devel] [PATCH 11/14] ide: Turn drive serial into a qdev property ide-drive.serial, Markus Armbruster, 2010/05/28
- [Qemu-devel] [PATCH 14/14] scsi: Fix info qtree for scsi-disk.ver, Markus Armbruster, 2010/05/28
- [Qemu-devel] [PATCH 13/14] scsi: Turn drive serial into a qdev property scsi-disk.serial, Markus Armbruster, 2010/05/28
- [Qemu-devel] [PATCH 02/14] blockdev: Belatedly remove driveopts, Markus Armbruster, 2010/05/28
- [Qemu-devel] [PATCH 01/14] blockdev: Belatedly remove MAX_DRIVES, Markus Armbruster, 2010/05/28
- [Qemu-devel] [PATCH 12/14] ide: Fix info qtree for ide-drive.ver, Markus Armbruster, 2010/05/28
- [Qemu-devel] [PATCH 04/14] ide: Remove useless IDEDeviceInfo members unit, drive, Markus Armbruster, 2010/05/28
- [Qemu-devel] [PATCH 03/14] usb: Remove unused usb_device_add() parameter is_hotplug, Markus Armbruster, 2010/05/28
- [Qemu-devel] Re: [PATCH 00/14] Block-related fixes and cleanups, Gerd Hoffmann, 2010/05/31