motorhead/qemu
1
0
Fork 0
mirror of https://github.com/Motorhead1991/qemu.git synced 2025-08-02 23:33:54 -06:00
Code Issues Projects Releases Packages Wiki Activity Actions

Save/load PCI-device, PCI-bus and PIIX3 irq-related state (patches by Uri Lublin.

Browse source 
Note that other PCI bridges are not fixed here.


git-svn-id: svn://svn.savannah.nongnu.org/qemu/trunk@3793 c046a42c-6fe2-441c-8c8c-71466251a162
This commit is contained in:
balrog 2007-12-09 23:56:13 +00:00
parent b26177d7ec
commit 52fc1d83bc
2 changed files with 63 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

19
hw/piix_pci.c
View file

@ -57,6 +57,7 @@ static int pci_slot_get_pirq(PCIDevice *pci_dev, int irq_num)
static uint32_t isa_page_descs[384 / 4];
static uint8_t smm_enabled;
static int pci_irq_levels[4];
static void update_pam(PCIDevice *d, uint32_t start, uint32_t end, int r)
{
@ -139,22 +140,32 @@ static void i440fx_write_config(PCIDevice *d,
static void i440fx_save(QEMUFile* f, void *opaque)
{
PCIDevice *d = opaque;
int i;
pci_device_save(d, f);
qemu_put_8s(f, &smm_enabled);
for (i = 0; i < 4; i++)
qemu_put_be32(f, pci_irq_levels[i]);
}
static int i440fx_load(QEMUFile* f, void *opaque, int version_id)
{
PCIDevice *d = opaque;
int ret;
int ret, i;
if (version_id != 1)
if (version_id > 2)
return -EINVAL;
ret = pci_device_load(d, f);
if (ret < 0)
return ret;
i440fx_update_memory_mappings(d);
qemu_get_8s(f, &smm_enabled);
if (version_id >= 2)
for (i = 0; i < 4; i++)
pci_irq_levels[i] = qemu_get_be32(f);
return 0;
}
@ -192,7 +203,7 @@ PCIBus *i440fx_init(PCIDevice **pi440fx_state, qemu_irq *pic)
d->config[0x72] = 0x02; /* SMRAM */
register_savevm("I440FX", 0, 1, i440fx_save, i440fx_load, d);
register_savevm("I440FX", 0, 2, i440fx_save, i440fx_load, d);
*pi440fx_state = d;
return b;
}
@ -205,8 +216,6 @@ PCIDevice *piix4_dev;
/* just used for simpler irq handling. */
#define PCI_IRQ_WORDS ((PCI_DEVICES_MAX + 31) / 32)
static int pci_irq_levels[4];
static void piix3_set_irq(qemu_irq *pic, int irq_num, int level)
{
int i, pic_irq, pic_level;