diff options
| author | Michael S. Tsirkin | 2011-05-05 15:39:47 +0200 |
|---|---|---|
| committer | Michael S. Tsirkin | 2011-05-05 15:39:47 +0200 |
| commit | 5300f1a5487f67f0bde8ee1081b799108668cb1d (patch) | |
| tree | 5274ff496f2665487736a4eec23bf76601e4da44 /hw/pcnet-pci.c | |
| parent | CPUPhysMemoryClient: Pass guest physical address not region offset (diff) | |
| parent | NBD: Avoid leaking a couple of strings when the NBD device is closed (diff) | |
| download | qemu-5300f1a5487f67f0bde8ee1081b799108668cb1d.tar.gz qemu-5300f1a5487f67f0bde8ee1081b799108668cb1d.tar.xz qemu-5300f1a5487f67f0bde8ee1081b799108668cb1d.zip | |
Merge remote branch 'origin/master' into pci
Conflicts:
exec.c
Diffstat (limited to 'hw/pcnet-pci.c')
| -rw-r--r-- | hw/pcnet-pci.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/hw/pcnet-pci.c b/hw/pcnet-pci.c index 4ac3e3297c..9415a1ecf5 100644 --- a/hw/pcnet-pci.c +++ b/hw/pcnet-pci.c @@ -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; } } |