From acff9df6a80455a8228dd6547cdd2714dbbe93ec Mon Sep 17 00:00:00 2001 From: bellard Date: Wed, 1 Feb 2006 21:40:18 +0000 Subject: [PATCH] =?UTF-8?q?rxcr=20save/restore=20(initial=20patch=20by=20J?= =?UTF-8?q?=C3=BCrgen=20Pfennig?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit git-svn-id: svn://svn.savannah.nongnu.org/qemu/trunk@1733 c046a42c-6fe2-441c-8c8c-71466251a162 --- hw/ne2000.c | 13 ++++++++++--- 1 file changed, 10 insertions(+), 3 deletions(-) diff --git a/hw/ne2000.c b/hw/ne2000.c index 2940abd35c..efc3ea8ece 100644 --- a/hw/ne2000.c +++ b/hw/ne2000.c @@ -643,6 +643,8 @@ static void ne2000_save(QEMUFile* f,void* opaque) { NE2000State* s=(NE2000State*)opaque; + qemu_put_8s(f, &s->rxcr); + qemu_put_8s(f, &s->cmd); qemu_put_be32s(f, &s->start); qemu_put_be32s(f, &s->stop); @@ -667,8 +669,13 @@ static int ne2000_load(QEMUFile* f,void* opaque,int version_id) { NE2000State* s=(NE2000State*)opaque; - if (version_id != 1) + if (version_id == 2) { + qemu_get_8s(f, &s->rxcr); + } else if (version_id == 1) { + s->rxcr = 0x0c; + } else { return -EINVAL; + } qemu_get_8s(f, &s->cmd); qemu_get_be32s(f, &s->start); @@ -726,7 +733,7 @@ void isa_ne2000_init(int base, int irq, NICInfo *nd) s->macaddr[4], s->macaddr[5]); - register_savevm("ne2000", 0, 1, ne2000_save, ne2000_load, s); + register_savevm("ne2000", 0, 2, ne2000_save, ne2000_load, s); } /***********************************************************/ @@ -796,7 +803,7 @@ void pci_ne2000_init(PCIBus *bus, NICInfo *nd) s->macaddr[5]); /* XXX: instance number ? */ - register_savevm("ne2000", 0, 1, ne2000_save, ne2000_load, s); + register_savevm("ne2000", 0, 2, ne2000_save, ne2000_load, s); register_savevm("ne2000_pci", 0, 1, generic_pci_save, generic_pci_load, &d->dev); }