sanchayanmaity/minix
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

-Remove qemu_pci boot variable. Useres no longer need to set qemu_pci when

Browse source 
booting MINIX under QEMU/KVM.
-Kept the diagnostic message, however.
This commit is contained in:
Arun Thomas 2009-05-14 19:07:37 +00:00
parent 143422fa0a
commit d749b3b965
1 changed files with 2 additions and 22 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

20
drivers/pci/pci.c
View file

@ -95,9 +95,6 @@ PRIVATE struct pcidev
PRIVATE int nr_pcidev= 0; PRIVATE int nr_pcidev= 0;
/* Work around the limitations of the PCI emulation in QEMU 0.7.1 */
PRIVATE int qemu_pci= 0;
FORWARD _PROTOTYPE( void pci_intel_init, (void) ); FORWARD _PROTOTYPE( void pci_intel_init, (void) );
FORWARD _PROTOTYPE( void probe_bus, (int busind) ); FORWARD _PROTOTYPE( void probe_bus, (int busind) );
FORWARD _PROTOTYPE( int is_duplicate, (U8_t busnr, U8_t dev, U8_t func) ); FORWARD _PROTOTYPE( int is_duplicate, (U8_t busnr, U8_t dev, U8_t func) );
@ -207,10 +204,6 @@ PUBLIC void pci_init()
if (!first_time) if (!first_time)
return; return;
v= 0;
env_parse("qemu_pci", "d", 0, &v, 0, 1);
qemu_pci= v;
v= 0; v= 0;
env_parse("pci_debug", "d", 0, &v, 0, 1); env_parse("pci_debug", "d", 0, &v, 0, 1);
debug= v; debug= v;
@ -776,24 +769,11 @@ printf("probe_bus(%d)\n", busind);
} }
if (sts & (PSR_SSE|PSR_RMAS|PSR_RTAS)) if (sts & (PSR_SSE|PSR_RMAS|PSR_RTAS))
{
if (qemu_pci)
{ {
printf( printf(
"PCI: ignoring bad value 0x%x in sts for QEMU\n", "PCI: ignoring bad value 0x%x in sts for QEMU\n",
sts & (PSR_SSE|PSR_RMAS|PSR_RTAS)); sts & (PSR_SSE|PSR_RMAS|PSR_RTAS));
} }
else
{
if (func == 0)
break; /* Nothing here */
/* Scan all functions of a
* multifunction device.
*/
continue;
}
}
dstr= pci_dev_name(vid, did); dstr= pci_dev_name(vid, did);
if (debug) if (debug)