From patchwork Wed Jul 7 12:18:41 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Juan Quintela X-Patchwork-Id: 58109 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [199.232.76.165]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (Client did not present a certificate) by ozlabs.org (Postfix) with ESMTPS id 4C689B6EDD for ; Wed, 7 Jul 2010 22:24:15 +1000 (EST) Received: from localhost ([127.0.0.1]:46576 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1OWTfg-0004bx-71 for incoming@patchwork.ozlabs.org; Wed, 07 Jul 2010 08:24:12 -0400 Received: from [140.186.70.92] (port=42023 helo=eggs.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1OWTaX-0002ad-CU for qemu-devel@nongnu.org; Wed, 07 Jul 2010 08:18:54 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.69) (envelope-from ) id 1OWTaW-0002ZE-1q for qemu-devel@nongnu.org; Wed, 07 Jul 2010 08:18:53 -0400 Received: from mx1.redhat.com ([209.132.183.28]:53224) by eggs.gnu.org with esmtp (Exim 4.69) (envelope-from ) id 1OWTaV-0002Yz-Ou for qemu-devel@nongnu.org; Wed, 07 Jul 2010 08:18:52 -0400 Received: from int-mx02.intmail.prod.int.phx2.redhat.com (int-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.12]) by mx1.redhat.com (8.13.8/8.13.8) with ESMTP id o67CIoCG024453 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK) for ; Wed, 7 Jul 2010 08:18:50 -0400 Received: from localhost.localdomain (ovpn01.gateway.prod.ext.phx2.redhat.com [10.5.9.1]) by int-mx02.intmail.prod.int.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id o67CIlTR015175; Wed, 7 Jul 2010 08:18:49 -0400 From: Juan Quintela To: qemu-devel@nongnu.org Date: Wed, 7 Jul 2010 14:18:41 +0200 Message-Id: <941524af231b65c80c73c2103cd39a747582a1c3.1278504811.git.quintela@redhat.com> In-Reply-To: References: In-Reply-To: References: X-Scanned-By: MIMEDefang 2.67 on 10.5.11.12 X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. Subject: [Qemu-devel] [PATCH 1/6] Revert "ide save/restore pio/atapi cmd transfer fields and io buffer" X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: qemu-devel.nongnu.org List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org 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 --- hw/ide/core.c | 62 +--------------------------------------------------- hw/ide/internal.h | 5 ---- 2 files changed, 2 insertions(+), 65 deletions(-) diff --git a/hw/ide/core.c b/hw/ide/core.c index af52c2c..8669602 100644 --- a/hw/ide/core.c +++ b/hw/ide/core.c @@ -2660,7 +2660,6 @@ static void ide_init1(IDEBus *bus, int unit) s->unit = unit; 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); @@ -2723,25 +2722,6 @@ 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; @@ -2752,45 +2732,14 @@ 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; - int idx; - - 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; - - idx = transfer_end_table_idx(s->end_transfer_func); - if (idx == -1) { - fprintf(stderr, "%s: invalid end_transfer_func for DRQ_STAT\n", - __func__); - s->end_transfer_fn_idx = 2; - } else { - s->end_transfer_fn_idx = idx; - } -} - const VMStateDescription vmstate_ide_drive = { .name = "ide_drive", - .version_id = 4, + .version_id = 3, .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), @@ -2813,14 +2762,7 @@ const VMStateDescription vmstate_ide_drive = { VMSTATE_UINT8(sense_key, IDEState), VMSTATE_UINT8(asc, IDEState), VMSTATE_UINT8_V(cdrom_changed, IDEState, 3), - 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), + /* XXX: if a transfer is pending, we do not save it yet */ VMSTATE_END_OF_LIST() } }; diff --git a/hw/ide/internal.h b/hw/ide/internal.h index 4165543..75745ee 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 */