* [Qemu-devel] [PATCH] ide save/restore pio/atapi cmd transfer fields and io buffer
@ 2010-02-11 20:19 Marcelo Tosatti
2010-02-19 21:47 ` Anthony Liguori
0 siblings, 1 reply; 2+ messages in thread
From: Marcelo Tosatti @ 2010-02-11 20:19 UTC (permalink / raw)
To: qemu-devel; +Cc: Juan Quintela
Save/restore information necessary to continue in progress PIO/ATAPI CMD
transfers.
This includes the IO buffer.
Signed-off-by: Marcelo Tosatti <mtosatti@redhat.com>
diff --git a/hw/ide/core.c b/hw/ide/core.c
index b6643e8..64aebc2 100644
--- a/hw/ide/core.c
+++ b/hw/ide/core.c
@@ -2640,6 +2640,7 @@ void ide_init2(IDEBus *bus, DriveInfo *hd0, DriveInfo *hd1,
s->unit = i;
s->drive_serial = drive_serial++;
s->io_buffer = qemu_blockalign(s->bs, IDE_DMA_BUF_SECTORS*512 + 4);
+ s->io_buffer_total_len = IDE_DMA_BUF_SECTORS*512 + 4;
s->smart_selftest_data = qemu_blockalign(s->bs, 512);
s->sector_write_timer = qemu_new_timer(vm_clock,
ide_sector_write_timer_cb, s);
@@ -2674,6 +2675,25 @@ static bool is_identify_set(void *opaque, int version_id)
return s->identify_set != 0;
}
+static EndTransferFunc* transfer_end_table[] = {
+ ide_sector_read,
+ ide_sector_write,
+ ide_transfer_stop,
+ ide_atapi_cmd_reply_end,
+ ide_atapi_cmd,
+};
+
+static int transfer_end_table_idx(EndTransferFunc *fn)
+{
+ int i;
+
+ for (i = 0; i < ARRAY_SIZE(transfer_end_table); i++)
+ if (transfer_end_table[i] == fn)
+ return i;
+
+ return -1;
+}
+
static int ide_drive_post_load(void *opaque, int version_id)
{
IDEState *s = opaque;
@@ -2684,14 +2704,42 @@ static int ide_drive_post_load(void *opaque, int version_id)
s->cdrom_changed = 1;
}
}
+
+ if (s->cur_io_buffer_len) {
+ s->end_transfer_func = transfer_end_table[s->end_transfer_fn_idx];
+ s->data_ptr = s->io_buffer + s->cur_io_buffer_offset;
+ s->data_end = s->data_ptr + s->cur_io_buffer_len;
+ }
+
return 0;
}
+static void ide_drive_pre_save(void *opaque)
+{
+ IDEState *s = opaque;
+
+ s->cur_io_buffer_len = 0;
+
+ if (!(s->status & DRQ_STAT))
+ return;
+
+ s->cur_io_buffer_offset = s->data_ptr - s->io_buffer;
+ s->cur_io_buffer_len = s->data_end - s->data_ptr;
+
+ s->end_transfer_fn_idx = transfer_end_table_idx(s->end_transfer_func);
+ if (s->end_transfer_fn_idx == -1) {
+ fprintf(stderr, "%s: invalid end_transfer_func for DRQ_STAT\n",
+ __func__);
+ s->end_transfer_fn_idx = 2;
+ }
+}
+
const VMStateDescription vmstate_ide_drive = {
.name = "ide_drive",
- .version_id = 3,
+ .version_id = 4,
.minimum_version_id = 0,
.minimum_version_id_old = 0,
+ .pre_save = ide_drive_pre_save,
.post_load = ide_drive_post_load,
.fields = (VMStateField []) {
VMSTATE_INT32(mult_sectors, IDEState),
@@ -2714,7 +2762,14 @@ const VMStateDescription vmstate_ide_drive = {
VMSTATE_UINT8(sense_key, IDEState),
VMSTATE_UINT8(asc, IDEState),
VMSTATE_UINT8_V(cdrom_changed, IDEState, 3),
- /* XXX: if a transfer is pending, we do not save it yet */
+ VMSTATE_INT32_V(req_nb_sectors, IDEState, 4),
+ VMSTATE_VARRAY_INT32(io_buffer, IDEState, io_buffer_total_len, 4,
+ vmstate_info_uint8, uint8_t),
+ VMSTATE_INT32_V(cur_io_buffer_offset, IDEState, 4),
+ VMSTATE_INT32_V(cur_io_buffer_len, IDEState, 4),
+ VMSTATE_UINT8_V(end_transfer_fn_idx, IDEState, 4),
+ VMSTATE_INT32_V(elementary_transfer_size, IDEState, 4),
+ VMSTATE_INT32_V(packet_transfer_size, IDEState, 4),
VMSTATE_END_OF_LIST()
}
};
diff --git a/hw/ide/internal.h b/hw/ide/internal.h
index 1cc4b55..8615d1a 100644
--- a/hw/ide/internal.h
+++ b/hw/ide/internal.h
@@ -417,6 +417,11 @@ struct IDEState {
uint8_t *data_ptr;
uint8_t *data_end;
uint8_t *io_buffer;
+ /* PIO save/restore */
+ int32_t io_buffer_total_len;
+ int cur_io_buffer_offset;
+ int cur_io_buffer_len;
+ uint8_t end_transfer_fn_idx;
QEMUTimer *sector_write_timer; /* only used for win2k install hack */
uint32_t irq_count; /* counts IRQs when using win2k install hack */
/* CF-ATA extended error */
^ permalink raw reply related [flat|nested] 2+ messages in thread
* Re: [Qemu-devel] [PATCH] ide save/restore pio/atapi cmd transfer fields and io buffer
2010-02-11 20:19 [Qemu-devel] [PATCH] ide save/restore pio/atapi cmd transfer fields and io buffer Marcelo Tosatti
@ 2010-02-19 21:47 ` Anthony Liguori
0 siblings, 0 replies; 2+ messages in thread
From: Anthony Liguori @ 2010-02-19 21:47 UTC (permalink / raw)
To: Marcelo Tosatti; +Cc: qemu-devel, Juan Quintela
On 02/11/2010 02:19 PM, Marcelo Tosatti wrote:
> Save/restore information necessary to continue in progress PIO/ATAPI CMD
> transfers.
>
> This includes the IO buffer.
>
> Signed-off-by: Marcelo Tosatti<mtosatti@redhat.com>
>
Applied. Thanks.
Regards,
Anthony Liguori
> diff --git a/hw/ide/core.c b/hw/ide/core.c
> index b6643e8..64aebc2 100644
> --- a/hw/ide/core.c
> +++ b/hw/ide/core.c
> @@ -2640,6 +2640,7 @@ void ide_init2(IDEBus *bus, DriveInfo *hd0, DriveInfo *hd1,
> s->unit = i;
> s->drive_serial = drive_serial++;
> s->io_buffer = qemu_blockalign(s->bs, IDE_DMA_BUF_SECTORS*512 + 4);
> + s->io_buffer_total_len = IDE_DMA_BUF_SECTORS*512 + 4;
> s->smart_selftest_data = qemu_blockalign(s->bs, 512);
> s->sector_write_timer = qemu_new_timer(vm_clock,
> ide_sector_write_timer_cb, s);
> @@ -2674,6 +2675,25 @@ static bool is_identify_set(void *opaque, int version_id)
> return s->identify_set != 0;
> }
>
> +static EndTransferFunc* transfer_end_table[] = {
> + ide_sector_read,
> + ide_sector_write,
> + ide_transfer_stop,
> + ide_atapi_cmd_reply_end,
> + ide_atapi_cmd,
> +};
> +
> +static int transfer_end_table_idx(EndTransferFunc *fn)
> +{
> + int i;
> +
> + for (i = 0; i< ARRAY_SIZE(transfer_end_table); i++)
> + if (transfer_end_table[i] == fn)
> + return i;
> +
> + return -1;
> +}
> +
> static int ide_drive_post_load(void *opaque, int version_id)
> {
> IDEState *s = opaque;
> @@ -2684,14 +2704,42 @@ static int ide_drive_post_load(void *opaque, int version_id)
> s->cdrom_changed = 1;
> }
> }
> +
> + if (s->cur_io_buffer_len) {
> + s->end_transfer_func = transfer_end_table[s->end_transfer_fn_idx];
> + s->data_ptr = s->io_buffer + s->cur_io_buffer_offset;
> + s->data_end = s->data_ptr + s->cur_io_buffer_len;
> + }
> +
> return 0;
> }
>
> +static void ide_drive_pre_save(void *opaque)
> +{
> + IDEState *s = opaque;
> +
> + s->cur_io_buffer_len = 0;
> +
> + if (!(s->status& DRQ_STAT))
> + return;
> +
> + s->cur_io_buffer_offset = s->data_ptr - s->io_buffer;
> + s->cur_io_buffer_len = s->data_end - s->data_ptr;
> +
> + s->end_transfer_fn_idx = transfer_end_table_idx(s->end_transfer_func);
> + if (s->end_transfer_fn_idx == -1) {
> + fprintf(stderr, "%s: invalid end_transfer_func for DRQ_STAT\n",
> + __func__);
> + s->end_transfer_fn_idx = 2;
> + }
> +}
> +
> const VMStateDescription vmstate_ide_drive = {
> .name = "ide_drive",
> - .version_id = 3,
> + .version_id = 4,
> .minimum_version_id = 0,
> .minimum_version_id_old = 0,
> + .pre_save = ide_drive_pre_save,
> .post_load = ide_drive_post_load,
> .fields = (VMStateField []) {
> VMSTATE_INT32(mult_sectors, IDEState),
> @@ -2714,7 +2762,14 @@ const VMStateDescription vmstate_ide_drive = {
> VMSTATE_UINT8(sense_key, IDEState),
> VMSTATE_UINT8(asc, IDEState),
> VMSTATE_UINT8_V(cdrom_changed, IDEState, 3),
> - /* XXX: if a transfer is pending, we do not save it yet */
> + VMSTATE_INT32_V(req_nb_sectors, IDEState, 4),
> + VMSTATE_VARRAY_INT32(io_buffer, IDEState, io_buffer_total_len, 4,
> + vmstate_info_uint8, uint8_t),
> + VMSTATE_INT32_V(cur_io_buffer_offset, IDEState, 4),
> + VMSTATE_INT32_V(cur_io_buffer_len, IDEState, 4),
> + VMSTATE_UINT8_V(end_transfer_fn_idx, IDEState, 4),
> + VMSTATE_INT32_V(elementary_transfer_size, IDEState, 4),
> + VMSTATE_INT32_V(packet_transfer_size, IDEState, 4),
> VMSTATE_END_OF_LIST()
> }
> };
> diff --git a/hw/ide/internal.h b/hw/ide/internal.h
> index 1cc4b55..8615d1a 100644
> --- a/hw/ide/internal.h
> +++ b/hw/ide/internal.h
> @@ -417,6 +417,11 @@ struct IDEState {
> uint8_t *data_ptr;
> uint8_t *data_end;
> uint8_t *io_buffer;
> + /* PIO save/restore */
> + int32_t io_buffer_total_len;
> + int cur_io_buffer_offset;
> + int cur_io_buffer_len;
> + uint8_t end_transfer_fn_idx;
> QEMUTimer *sector_write_timer; /* only used for win2k install hack */
> uint32_t irq_count; /* counts IRQs when using win2k install hack */
> /* CF-ATA extended error */
>
>
>
>
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2010-02-19 21:47 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2010-02-11 20:19 [Qemu-devel] [PATCH] ide save/restore pio/atapi cmd transfer fields and io buffer Marcelo Tosatti
2010-02-19 21:47 ` Anthony Liguori
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).