[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
Re: [Qemu-devel] [PATCH V2 05/10] hw/sd.c: add SD card save/load support
From: |
Peter Maydell |
Subject: |
Re: [Qemu-devel] [PATCH V2 05/10] hw/sd.c: add SD card save/load support |
Date: |
Wed, 11 Apr 2012 11:24:44 +0100 |
On 5 April 2012 16:48, Igor Mitsyanko <address@hidden> wrote:
> @@ -416,8 +421,9 @@ static void sd_reset(SDState *sd, BlockDriverState *bdrv)
> if (sd->wp_groups)
> g_free(sd->wp_groups);
> sd->wp_switch = bdrv ? bdrv_is_read_only(bdrv) : false;
> + sd->wpgrps_size = BITS_TO_LONGS(sect);
> sd->wp_groups = bitmap_new(sect);
> @@ -565,8 +605,7 @@ static void sd_lock_command(SDState *sd)
> sd->card_status |= LOCK_UNLOCK_FAILED;
> return;
> }
> - bitmap_zero(sd->wp_groups, BITS_TO_LONGS((sd->size >> (HWBLOCK_SHIFT
> +
> - SECTOR_SHIFT + WPGROUP_SHIFT)) + 1));
> + bitmap_zero(sd->wp_groups, sd->wpgrps_size);
> sd->csd[14] &= ~0x10;
> sd->card_status &= ~CARD_IS_LOCKED;
> sd->pwd_len = 0;
These two hunks together are still passing a count of longs rather
than a count of bits to bitmap_zero(). If you fix this in the
earlier patch then I think you should be able to avoid having to
change the same bit of code in sd_lock_command() again in this patch.
Otherwise OK.
-- PMM
- [Qemu-devel] [PATCH V2 00/10] SD save/load support and SD qomification, Igor Mitsyanko, 2012/04/05
- [Qemu-devel] [PATCH V2 01/10] hw/sd.c: convert wp_groups in SDState to bitfield, Igor Mitsyanko, 2012/04/05
- [Qemu-devel] [PATCH V2 03/10] hw/sd.c: make sd_dataready() return bool, Igor Mitsyanko, 2012/04/05
- [Qemu-devel] [PATCH V2 07/10] SD card: introduce "if-idx" property for SD card objects, Igor Mitsyanko, 2012/04/05
- [Qemu-devel] [PATCH V2 05/10] hw/sd.c: add SD card save/load support, Igor Mitsyanko, 2012/04/05
- Re: [Qemu-devel] [PATCH V2 05/10] hw/sd.c: add SD card save/load support,
Peter Maydell <=
- [Qemu-devel] [PATCH V2 10/10] hw/sd.c: introduce SD card "image" property and allow SD hot-insert, Igor Mitsyanko, 2012/04/05
[Qemu-devel] [PATCH V2 08/10] SD card: introduce "spi_mode" property for SD card objects, Igor Mitsyanko, 2012/04/05
[Qemu-devel] [PATCH V2 06/10] hw/sd.c: convert to QOM object, Igor Mitsyanko, 2012/04/05