diff options
| author | Juan Quintela <quintela@redhat.com> | 2010-07-26 21:38:41 +0200 |
|---|---|---|
| committer | Anthony Liguori <aliguori@us.ibm.com> | 2010-07-26 16:19:50 -0500 |
| commit | 3abb62601b8a19bce9f8353606a981364c50c05d (patch) | |
| tree | 7afb6f00b653845608a40d4a1b04e7d3ddbd9c97 /hw/ide/internal.h | |
| parent | 7ed6184bf24dffe81e767ab449f90247bb38e204 (diff) | |
| download | qemu-3abb62601b8a19bce9f8353606a981364c50c05d.tar.gz | |
Revert "ide save/restore pio/atapi cmd transfer fields and io buffer"
This reverts commit ed487bb1d69040b9dac64a4fc076d8dd82b131d6.
The conflicts are due to commit 4fc8d6711aff7a9c11e402c3d77b481609f9f486
that is a fix to the ide_drive_pre_save() function. It reverts both
(and both are reinstantiated later in the series)
Conflicts:
hw/ide/core.c
Signed-off-by: Juan Quintela <quintela@redhat.com>
Signed-off-by: Anthony Liguori <aliguori@us.ibm.com>
Diffstat (limited to 'hw/ide/internal.h')
| -rw-r--r-- | hw/ide/internal.h | 5 |
1 files changed, 0 insertions, 5 deletions
diff --git a/hw/ide/internal.h b/hw/ide/internal.h index 416554324c..75745eee83 100644 --- a/hw/ide/internal.h +++ b/hw/ide/internal.h @@ -419,11 +419,6 @@ 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 */ |