From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43) id 1MoyJf-0004UQ-O0 for qemu-devel@nongnu.org; Sat, 19 Sep 2009 07:41:23 -0400 Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43) id 1MoyJb-0004Q1-Vj for qemu-devel@nongnu.org; Sat, 19 Sep 2009 07:41:23 -0400 Received: from [199.232.76.173] (port=57877 helo=monty-python.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1MoyJb-0004Pi-I6 for qemu-devel@nongnu.org; Sat, 19 Sep 2009 07:41:19 -0400 Received: from moutng.kundenserver.de ([212.227.17.8]:64320) by monty-python.gnu.org with esmtp (Exim 4.60) (envelope-from ) id 1MoyJa-0004w3-OH for qemu-devel@nongnu.org; Sat, 19 Sep 2009 07:41:19 -0400 From: Stefan Weil Date: Sat, 19 Sep 2009 13:41:15 +0200 Message-Id: <1253360475-10671-1-git-send-email-weil@mail.berlios.de> Subject: [Qemu-devel] [PATCH] eepro100: Remove unused device status entries List-Id: qemu-devel.nongnu.org List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: QEMU Developers A lot of entries are unused (they were added by copy + paste from other drivers during development of eepro100.c). Removing them from nic_save, nic_load makes any old saved status incompatible, so a new version for the virtual machine data was needed, too. This patch is a step to synchronize my maintainer version of eepro100.c (git://repo.or.cz/qemu/ar7.git) with the version integrated in QEMU. Signed-off-by: Stefan Weil --- hw/eepro100.c | 78 +++++++++++--------------------------------------------- 1 files changed, 16 insertions(+), 62 deletions(-) diff --git a/hw/eepro100.c b/hw/eepro100.c index 1d66edb..a8f6b3f 100644 --- a/hw/eepro100.c +++ b/hw/eepro100.c @@ -195,19 +195,6 @@ typedef struct { uint8_t cmd; uint32_t start; uint32_t stop; - uint8_t boundary; - uint8_t tsr; - uint8_t tpsr; - uint16_t tcnt; - uint16_t rcnt; - uint32_t rsar; - uint8_t rsr; - uint8_t rxcr; - uint8_t isr; - uint8_t dcfg; - uint8_t imr; - uint8_t phys[6]; /* mac address */ - uint8_t curpag; uint8_t mult[8]; /* multicast mask array */ int mmio_index; VLANClientState *vc; @@ -216,7 +203,6 @@ typedef struct { uint8_t int_stat; /* PCI interrupt status */ uint32_t region[3]; /* PCI region addresses */ uint8_t macaddr[6]; - uint32_t statcounter[19]; uint16_t mdimem[32]; eeprom_t *eeprom; uint32_t device; /* device variant */ @@ -228,7 +214,8 @@ typedef struct { uint32_t ru_base; /* RU base address */ uint32_t ru_offset; /* RU address offset */ uint32_t statsaddr; /* pointer to eepro100_stats_t */ - eepro100_stats_t statistics; /* statistical counters */ + /* Statistical counters. Also used for wake-up packet (i82559). */ + eepro100_stats_t statistics; #if 0 uint16_t status; #endif @@ -240,6 +227,10 @@ typedef struct { uint8_t mem[PCI_MEM_SIZE]; } EEPRO100State; +/* Parameters for nic_save, nic_load. */ +static const int eepro100_instance = -1; +static const int eepro100_version = 20090807; + /* Default values for MDI (PHY) registers */ static const uint16_t eepro100_mdi_default[] = { /* MDI Registers 0 - 6, 7 */ @@ -1588,50 +1579,29 @@ static int nic_load(QEMUFile * f, void *opaque, int version_id) int i; int ret; - if (version_id > 3) + if (version_id != eepro100_version) { return -EINVAL; - - if (version_id >= 3) { - ret = pci_device_load(&s->dev, f); - if (ret < 0) - return ret; } - if (version_id >= 2) { - qemu_get_8s(f, &s->rxcr); - } else { - s->rxcr = 0x0c; + ret = pci_device_load(&s->dev, f); + if (ret < 0) { + return ret; } qemu_get_8s(f, &s->cmd); qemu_get_be32s(f, &s->start); qemu_get_be32s(f, &s->stop); - qemu_get_8s(f, &s->boundary); - qemu_get_8s(f, &s->tsr); - qemu_get_8s(f, &s->tpsr); - qemu_get_be16s(f, &s->tcnt); - qemu_get_be16s(f, &s->rcnt); - qemu_get_be32s(f, &s->rsar); - qemu_get_8s(f, &s->rsr); - qemu_get_8s(f, &s->isr); - qemu_get_8s(f, &s->dcfg); - qemu_get_8s(f, &s->imr); - qemu_get_buffer(f, s->phys, 6); - qemu_get_8s(f, &s->curpag); qemu_get_buffer(f, s->mult, 8); qemu_get_buffer(f, s->mem, sizeof(s->mem)); /* Restore all members of struct between scv_stat and mem. */ qemu_get_8s(f, &s->scb_stat); qemu_get_8s(f, &s->int_stat); - for (i = 0; i < 3; i++) { + for (i = 0; i < ARRAY_SIZE(s->region); i++) { qemu_get_be32s(f, &s->region[i]); } qemu_get_buffer(f, s->macaddr, 6); - for (i = 0; i < 19; i++) { - qemu_get_be32s(f, &s->statcounter[i]); - } - for (i = 0; i < 32; i++) { + for (i = 0; i < ARRAY_SIZE(s->mdimem); i++) { qemu_get_be16s(f, &s->mdimem[i]); } /* The eeprom should be saved and restored by its own routines. */ @@ -1682,37 +1652,20 @@ static void nic_save(QEMUFile * f, void *opaque) pci_device_save(&s->dev, f); - qemu_put_8s(f, &s->rxcr); - qemu_put_8s(f, &s->cmd); qemu_put_be32s(f, &s->start); qemu_put_be32s(f, &s->stop); - qemu_put_8s(f, &s->boundary); - qemu_put_8s(f, &s->tsr); - qemu_put_8s(f, &s->tpsr); - qemu_put_be16s(f, &s->tcnt); - qemu_put_be16s(f, &s->rcnt); - qemu_put_be32s(f, &s->rsar); - qemu_put_8s(f, &s->rsr); - qemu_put_8s(f, &s->isr); - qemu_put_8s(f, &s->dcfg); - qemu_put_8s(f, &s->imr); - qemu_put_buffer(f, s->phys, 6); - qemu_put_8s(f, &s->curpag); qemu_put_buffer(f, s->mult, 8); qemu_put_buffer(f, s->mem, sizeof(s->mem)); /* Save all members of struct between scv_stat and mem. */ qemu_put_8s(f, &s->scb_stat); qemu_put_8s(f, &s->int_stat); - for (i = 0; i < 3; i++) { + for (i = 0; i < ARRAY_SIZE(s->region); i++) { qemu_put_be32s(f, &s->region[i]); } qemu_put_buffer(f, s->macaddr, 6); - for (i = 0; i < 19; i++) { - qemu_put_be32s(f, &s->statcounter[i]); - } - for (i = 0; i < 32; i++) { + for (i = 0; i < ARRAY_SIZE(s->mdimem); i++) { qemu_put_be16s(f, &s->mdimem[i]); } /* The eeprom should be saved and restored by its own routines. */ @@ -1815,7 +1768,8 @@ static int nic_init(PCIDevice *pci_dev, uint32_t device) qemu_register_reset(nic_reset, s); - register_savevm(s->vc->model, -1, 3, nic_save, nic_load, s); + register_savevm(s->vc->model, eepro100_instance, eepro100_version, + nic_save, nic_load, s); return 0; } -- 1.5.6.5