diff options
| author | Isaku Yamahata <yamahata@valinux.co.jp> | 2010-06-23 16:15:27 +0900 |
|---|---|---|
| committer | Blue Swirl <blauwirbel@gmail.com> | 2010-07-11 20:00:56 +0300 |
| commit | b80d4a9887fa4b6cc63f8c3a13ab2a45054d3e5c (patch) | |
| tree | 652384d69555ce92fddcb9bd2fbe7abb8e91f67b /hw/pcnet.c | |
| parent | 6fa84913eccec4266a27c81ae88465f6790742b9 (diff) | |
| download | qemu-b80d4a9887fa4b6cc63f8c3a13ab2a45054d3e5c.tar.gz qemu-b80d4a9887fa4b6cc63f8c3a13ab2a45054d3e5c.tar.bz2 qemu-b80d4a9887fa4b6cc63f8c3a13ab2a45054d3e5c.zip | |
pci: don't overwrite multi functio bit in pci header type.
Don't overwrite pci header type.
Otherwise, multi function bit which pci_init_header_type() sets
appropriately is lost.
Anyway PCI_HEADER_TYPE_NORMAL is zero, so it is unnecessary to zero
which is already zero cleared.
how to test:
run qemu and issue info pci to see whether a device in question is
normal device, not pci-to-pci bridge.
This is handy because guest os isn't required.
tested changes:
The following files are covered by using following commands.
sparc64-softmmu
apb_pci.c, vga-pci.c, cmd646.c, ne2k_pci.c, sun4u.c
ppc-softmmu
grackle_pci.c, cmd646.c, ne2k_pci.c, vga-pci.c, macio.c
ppc-softmmu -M mac99
unin_pci.c(uni-north, uni-north-agp)
ppc64-softmmu
pci-ohci, ne2k_pci, vga-pci, unin_pci.c(u3-agp)
x86_64-softmmu
acpi_piix4.c, ide/piix.c, piix_pci.c
-vga vmware vmware_vga.c
-watchdog i6300esb wdt_i6300esb.c
-usb usb-uhci.c
-sound ac97 ac97.c
-nic model=rtl8139 rtl8139.c
-nic model=pcnet pcnet.c
-balloon virtio virtio-pci.c:
untested changes:
The following changes aren't tested.
prep_pci.c: ppc-softmmu -M prep should cover, but core dumped.
unin_pci.c(uni-north-pci): the caller is commented out.
openpic.c: the caller is commented out in ppc_prep.c
Signed-off-by: Isaku Yamahata <yamahata@valinux.co.jp>
Signed-off-by: Blue Swirl <blauwirbel@gmail.com>
Diffstat (limited to 'hw/pcnet.c')
| -rw-r--r-- | hw/pcnet.c | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/hw/pcnet.c b/hw/pcnet.c index 5e63eb5c06..5e7593050e 100644 --- a/hw/pcnet.c +++ b/hw/pcnet.c @@ -1990,7 +1990,6 @@ static int pci_pcnet_init(PCIDevice *pci_dev) /* TODO: 0 is the default anyway, no need to set it. */ pci_conf[PCI_CLASS_PROG] = 0x00; pci_config_set_class(pci_conf, PCI_CLASS_NETWORK_ETHERNET); - pci_conf[PCI_HEADER_TYPE] = PCI_HEADER_TYPE_NORMAL; // header_type /* TODO: not necessary, is set when BAR is registered. */ pci_set_long(pci_conf + PCI_BASE_ADDRESS_0, PCI_BASE_ADDRESS_SPACE_IO); |