From 3abb62601b8a19bce9f8353606a981364c50c05d Mon Sep 17 00:00:00 2001 From: Juan Quintela Date: Mon, 26 Jul 2010 21:38:41 +0200 Subject: 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 Signed-off-by: Anthony Liguori --- hw/ide/internal.h | 5 ----- 1 file changed, 5 deletions(-) (limited to 'hw/ide/internal.h') 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 */ -- cgit 1.4.1