mirror of
https://github.com/qemu/qemu.git
synced 2024-12-03 00:33:39 +08:00
8dcf525abc
As reported in http://article.gmane.org/gmane.comp.emulators.qemu/253987 Mac OSX actually requires describing all occupied slots in ACPI - even if hotplug isn't enabled. I didn't expect this so I dropped description of all non hotpluggable slots from ACPI. As a result: before commit99fd437dee(enable hotplug for pci bridges), PCI cards show up in the "device tree" of OS X (System Information). E.g., on MountainLion users have: Hardware -> PCI Cards: Card Type Driver Installed Slot *ethernet Ethernet Controller Yes PCI Slot 2 pci8086,2934 USB UHC Yes PCI Slot 29 ethernet: Type: Ethernet Controller Driver Installed: Yes MSI: No Bus: PCI Slot PCI Slot 2 Vendor ID: 0x8086 Device ID: 0x100e Subsystem Vendor ID: 0x1af4 Subsystem ID: 0x1100 Revision ID: 0x0003 Hardware -> Ethernet Cards ethernet: Type: Ethernet Controller Bus: PCI Slot PCI Slot 2 Vendor ID: 0x8086 Device ID: 0x100e Subsystem Vendor ID: 0x1af4 Subsystem ID: 0x1100 Revision ID: 0x0003 BSD name: en0 Kext name: AppleIntel8254XEthernet.kext Location: /System/Library/Extensions/... Version: 3.1.1b1 After commit99fd437dee, users get: Hardware -> PCI Cards: This computer doesn't contain any PCI cards. If you installed PCI cards, make sure they're properly installed. Hardware -> Ethernet Cards ethernet: Type: Ethernet Controller Bus: PCI Vendor ID: 0x8086 Device ID: 0x100e Subsystem Vendor ID: 0x1af4 Subsystem ID: 0x1100 Revision ID: 0x0003 BSD name: en0 Kext name: AppleIntel8254XEthernet.kext Location: /System/Library/Extensions/... Version: 3.1.1b1 Ethernet still works, but it's not showing up on the PCI bus, and it no longer thinks it's plugged in to slot #2, as it used to before the change. To fix, append description for all occupied non hotpluggable PCI slots. One need to be careful when doing this: VGA devices are now described in SSDT, so we need to drop description from DSDT. And ISA devices are used in DSDT so drop them from SSDT. Reported-by: Gabriel L. Somlo <gsomlo@gmail.com> Signed-off-by: Michael S. Tsirkin <mst@redhat.com> Also update generated dsdt and pcihp hex dump files. Signed-off-by: Michael S. Tsirkin <mst@redhat.com>
252 lines
2.0 KiB
Plaintext
252 lines
2.0 KiB
Plaintext
static unsigned char ssdt_pcihp_name[] = {
|
|
0x34
|
|
};
|
|
static unsigned char ssdt_pcivga_end[] = {
|
|
0x99
|
|
};
|
|
static unsigned char ssdt_pcivga_name[] = {
|
|
0x70
|
|
};
|
|
static unsigned char ssdt_pcihp_adr[] = {
|
|
0x45
|
|
};
|
|
static unsigned char ssdt_pcinohp_end[] = {
|
|
0x6d
|
|
};
|
|
static unsigned char ssdt_pcihp_end[] = {
|
|
0x5c
|
|
};
|
|
static unsigned char ssdt_pciqxl_start[] = {
|
|
0x99
|
|
};
|
|
static unsigned char ssdt_pcinohp_name[] = {
|
|
0x5f
|
|
};
|
|
static unsigned char ssdp_pcihp_aml[] = {
|
|
0x53,
|
|
0x53,
|
|
0x44,
|
|
0x54,
|
|
0xc6,
|
|
0x0,
|
|
0x0,
|
|
0x0,
|
|
0x1,
|
|
0x6b,
|
|
0x42,
|
|
0x58,
|
|
0x50,
|
|
0x43,
|
|
0x0,
|
|
0x0,
|
|
0x42,
|
|
0x58,
|
|
0x53,
|
|
0x53,
|
|
0x44,
|
|
0x54,
|
|
0x50,
|
|
0x43,
|
|
0x1,
|
|
0x0,
|
|
0x0,
|
|
0x0,
|
|
0x49,
|
|
0x4e,
|
|
0x54,
|
|
0x4c,
|
|
0x23,
|
|
0x8,
|
|
0x13,
|
|
0x20,
|
|
0x10,
|
|
0x41,
|
|
0xa,
|
|
0x5c,
|
|
0x2e,
|
|
0x5f,
|
|
0x53,
|
|
0x42,
|
|
0x5f,
|
|
0x50,
|
|
0x43,
|
|
0x49,
|
|
0x30,
|
|
0x5b,
|
|
0x82,
|
|
0x29,
|
|
0x53,
|
|
0x41,
|
|
0x41,
|
|
0x5f,
|
|
0x8,
|
|
0x5f,
|
|
0x53,
|
|
0x55,
|
|
0x4e,
|
|
0xa,
|
|
0xaa,
|
|
0x8,
|
|
0x5f,
|
|
0x41,
|
|
0x44,
|
|
0x52,
|
|
0xc,
|
|
0x0,
|
|
0x0,
|
|
0xaa,
|
|
0x0,
|
|
0x14,
|
|
0x12,
|
|
0x5f,
|
|
0x45,
|
|
0x4a,
|
|
0x30,
|
|
0x1,
|
|
0x50,
|
|
0x43,
|
|
0x45,
|
|
0x4a,
|
|
0x42,
|
|
0x53,
|
|
0x45,
|
|
0x4c,
|
|
0x5f,
|
|
0x53,
|
|
0x55,
|
|
0x4e,
|
|
0x5b,
|
|
0x82,
|
|
0xf,
|
|
0x53,
|
|
0x42,
|
|
0x42,
|
|
0x5f,
|
|
0x8,
|
|
0x5f,
|
|
0x41,
|
|
0x44,
|
|
0x52,
|
|
0xc,
|
|
0x0,
|
|
0x0,
|
|
0xaa,
|
|
0x0,
|
|
0x5b,
|
|
0x82,
|
|
0x2a,
|
|
0x53,
|
|
0x43,
|
|
0x43,
|
|
0x5f,
|
|
0x8,
|
|
0x5f,
|
|
0x41,
|
|
0x44,
|
|
0x52,
|
|
0xc,
|
|
0x0,
|
|
0x0,
|
|
0xaa,
|
|
0x0,
|
|
0x14,
|
|
0x8,
|
|
0x5f,
|
|
0x53,
|
|
0x31,
|
|
0x44,
|
|
0x0,
|
|
0xa4,
|
|
0x0,
|
|
0x14,
|
|
0x8,
|
|
0x5f,
|
|
0x53,
|
|
0x32,
|
|
0x44,
|
|
0x0,
|
|
0xa4,
|
|
0x0,
|
|
0x14,
|
|
0x8,
|
|
0x5f,
|
|
0x53,
|
|
0x33,
|
|
0x44,
|
|
0x0,
|
|
0xa4,
|
|
0x0,
|
|
0x5b,
|
|
0x82,
|
|
0x2b,
|
|
0x53,
|
|
0x44,
|
|
0x44,
|
|
0x5f,
|
|
0x8,
|
|
0x5f,
|
|
0x41,
|
|
0x44,
|
|
0x52,
|
|
0xc,
|
|
0x0,
|
|
0x0,
|
|
0xaa,
|
|
0x0,
|
|
0x14,
|
|
0x8,
|
|
0x5f,
|
|
0x53,
|
|
0x31,
|
|
0x44,
|
|
0x0,
|
|
0xa4,
|
|
0x0,
|
|
0x14,
|
|
0x8,
|
|
0x5f,
|
|
0x53,
|
|
0x32,
|
|
0x44,
|
|
0x0,
|
|
0xa4,
|
|
0x0,
|
|
0x14,
|
|
0x9,
|
|
0x5f,
|
|
0x53,
|
|
0x33,
|
|
0x44,
|
|
0x0,
|
|
0xa4,
|
|
0xa,
|
|
0x3
|
|
};
|
|
static unsigned char ssdt_pciqxl_adr[] = {
|
|
0xa6
|
|
};
|
|
static unsigned char ssdt_pcinohp_adr[] = {
|
|
0x69
|
|
};
|
|
static unsigned char ssdt_pcivga_adr[] = {
|
|
0x7a
|
|
};
|
|
static unsigned char ssdt_pciqxl_name[] = {
|
|
0x9c
|
|
};
|
|
static unsigned char ssdt_pcivga_start[] = {
|
|
0x6d
|
|
};
|
|
static unsigned char ssdt_pciqxl_end[] = {
|
|
0xc6
|
|
};
|
|
static unsigned char ssdt_pcihp_start[] = {
|
|
0x31
|
|
};
|
|
static unsigned char ssdt_pcihp_id[] = {
|
|
0x3e
|
|
};
|
|
static unsigned char ssdt_pcinohp_start[] = {
|
|
0x5c
|
|
};
|