ShuriZma
/
xemu
mirror of https://github.com/xemu-project/xemu.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

e1000: unfold mac_regarraystosave array 

Signed-off-by: Juan Quintela <quintela@redhat.com>
Signed-off-by: Anthony Liguori <aliguori@us.ibm.com>
This commit is contained in:
Juan Quintela 2009-10-19 19:20:26 +02:00 committed by Anthony Liguori
parent 2e88504938
commit 28366c3ac5
1 changed files with 14 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
hw/e1000.c
View File

@ -881,17 +881,11 @@ e1000_mmio_readw(void *opaque, target_phys_addr_t addr)
(8 * (addr & 3))) & 0xffff; (8 * (addr & 3))) & 0xffff;
} }
static const struct {
int size;
int array0;
} mac_regarraystosave[] = { {32, RA}, {128, MTA}, {128, VFTA} };
enum { MAC_NARRAYS = ARRAY_SIZE(mac_regarraystosave) };
static void static void
nic_save(QEMUFile *f, void *opaque) nic_save(QEMUFile *f, void *opaque)
{ {
E1000State *s = opaque; E1000State *s = opaque;
int i, j; int i;
pci_device_save(&s->dev, f); pci_device_save(&s->dev, f);
qemu_put_be32(f, 0); qemu_put_be32(f, 0);
@ -959,17 +953,19 @@ nic_save(QEMUFile *f, void *opaque)
qemu_put_be32s(f, &s->mac_reg[TXDCTL]); qemu_put_be32s(f, &s->mac_reg[TXDCTL]);
qemu_put_be32s(f, &s->mac_reg[WUFC]); qemu_put_be32s(f, &s->mac_reg[WUFC]);
qemu_put_be32s(f, &s->mac_reg[VET]); qemu_put_be32s(f, &s->mac_reg[VET]);
for (i = 0; i < MAC_NARRAYS; i++) for (i = RA; i < RA + 32; i++)
for (j = 0; j < mac_regarraystosave[i].size; j++) qemu_put_be32s(f, &s->mac_reg[i]);
qemu_put_be32s(f, for (i = MTA; i < MTA + 128; i++)
s->mac_reg + mac_regarraystosave[i].array0 + j); qemu_put_be32s(f, &s->mac_reg[i]);
for (i = VFTA; i < VFTA + 128; i++)
qemu_put_be32s(f, &s->mac_reg[i]);
} }
static int static int
nic_load(QEMUFile *f, void *opaque, int version_id) nic_load(QEMUFile *f, void *opaque, int version_id)
{ {
E1000State *s = opaque; E1000State *s = opaque;
int i, j, ret; int i, ret;
if ((ret = pci_device_load(&s->dev, f)) < 0) if ((ret = pci_device_load(&s->dev, f)) < 0)
return ret; return ret;
@ -1040,10 +1036,12 @@ nic_load(QEMUFile *f, void *opaque, int version_id)
qemu_get_be32s(f, &s->mac_reg[TXDCTL]); qemu_get_be32s(f, &s->mac_reg[TXDCTL]);
qemu_get_be32s(f, &s->mac_reg[WUFC]); qemu_get_be32s(f, &s->mac_reg[WUFC]);
qemu_get_be32s(f, &s->mac_reg[VET]); qemu_get_be32s(f, &s->mac_reg[VET]);
for (i = 0; i < MAC_NARRAYS; i++) for (i = RA; i < RA + 32; i++)
for (j = 0; j < mac_regarraystosave[i].size; j++) qemu_get_be32s(f, &s->mac_reg[i]);
qemu_get_be32s(f, for (i = MTA; i < MTA + 128; i++)
s->mac_reg + mac_regarraystosave[i].array0 + j); qemu_get_be32s(f, &s->mac_reg[i]);
for (i = VFTA; i < VFTA + 128; i++)
qemu_get_be32s(f, &s->mac_reg[i]);
return 0; return 0;
} }