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

Merge remote branch 'origin/master' into pci

Browse source 
Conflicts:
	exec.c
This commit is contained in:
Michael S. Tsirkin 2011-05-05 16:39:47 +03:00
commit 5300f1a548
393 changed files with 32254 additions and 6506 deletions
Download patch file Download diff file Expand all files Collapse all files

2
hw/pcnet-pci.c
View file

@ -296,7 +296,7 @@ static int pci_pcnet_init(PCIDevice *pci_dev)
if (!pci_dev->qdev.hotplugged) {
static int loaded = 0;
if (!loaded) {
rom_add_option("pxe-pcnet.bin", -1);
rom_add_option("pxe-pcnet.rom", -1);
loaded = 1;
}
}