79 lines
3.0 KiB
Diff
79 lines
3.0 KiB
Diff
|
diff -Naur --no-dereference a/include/hw/acpi/aml-build.h b/include/hw/acpi/aml-build.h
|
||
|
|
--- a/include/hw/acpi/aml-build.h
|
||
|
|
+++ b/include/hw/acpi/aml-build.h
|
||
|
|
@@ -4,8 +4,8 @@
|
||
|
|
#include "hw/acpi/acpi-defs.h"
|
||
|
|
#include "hw/acpi/bios-linker-loader.h"
|
||
|
|
|
||
|
|
-#define ACPI_BUILD_APPNAME6 "BOCHS "
|
||
|
|
-#define ACPI_BUILD_APPNAME8 "BXPC "
|
||
|
|
+#define ACPI_BUILD_APPNAME6 "INTEL "
|
||
|
|
+#define ACPI_BUILD_APPNAME8 "PC8086 "
|
||
|
|
|
||
|
|
#define ACPI_BUILD_TABLE_FILE "etc/acpi/tables"
|
||
|
|
#define ACPI_BUILD_RSDP_FILE "etc/acpi/rsdp"
|
||
|
|
diff -Naur --no-dereference a/include/hw/pci/pci.h b/include/hw/pci/pci.h
|
||
|
|
--- a/include/hw/pci/pci.h
|
||
|
|
+++ b/include/hw/pci/pci.h
|
||
|
|
@@ -72,19 +72,19 @@
|
||
|
|
#define PCI_DEVICE_ID_INTEL_82801IR 0x2922
|
||
|
|
|
||
|
|
/* Red Hat / Qumranet (for QEMU) -- see pci-ids.txt */
|
||
|
|
-#define PCI_VENDOR_ID_REDHAT_QUMRANET 0x1af4
|
||
|
|
-#define PCI_SUBVENDOR_ID_REDHAT_QUMRANET 0x1af4
|
||
|
|
-#define PCI_SUBDEVICE_ID_QEMU 0x1100
|
||
|
|
+#define PCI_VENDOR_ID_REDHAT_QUMRANET 0x8086
|
||
|
|
+#define PCI_SUBVENDOR_ID_REDHAT_QUMRANET 0x8086
|
||
|
|
+#define PCI_SUBDEVICE_ID_QEMU 0x8086
|
||
|
|
|
||
|
|
/* legacy virtio-pci devices */
|
||
|
|
-#define PCI_DEVICE_ID_VIRTIO_NET 0x1000
|
||
|
|
-#define PCI_DEVICE_ID_VIRTIO_BLOCK 0x1001
|
||
|
|
-#define PCI_DEVICE_ID_VIRTIO_BALLOON 0x1002
|
||
|
|
-#define PCI_DEVICE_ID_VIRTIO_CONSOLE 0x1003
|
||
|
|
-#define PCI_DEVICE_ID_VIRTIO_SCSI 0x1004
|
||
|
|
-#define PCI_DEVICE_ID_VIRTIO_RNG 0x1005
|
||
|
|
-#define PCI_DEVICE_ID_VIRTIO_9P 0x1009
|
||
|
|
-#define PCI_DEVICE_ID_VIRTIO_VSOCK 0x1012
|
||
|
|
+#define PCI_DEVICE_ID_VIRTIO_NET 0x8086
|
||
|
|
+#define PCI_DEVICE_ID_VIRTIO_BLOCK 0x8086
|
||
|
|
+#define PCI_DEVICE_ID_VIRTIO_BALLOON 0x8086
|
||
|
|
+#define PCI_DEVICE_ID_VIRTIO_CONSOLE 0x8086
|
||
|
|
+#define PCI_DEVICE_ID_VIRTIO_SCSI 0x8086
|
||
|
|
+#define PCI_DEVICE_ID_VIRTIO_RNG 0x8086
|
||
|
|
+#define PCI_DEVICE_ID_VIRTIO_9P 0x8086
|
||
|
|
+#define PCI_DEVICE_ID_VIRTIO_VSOCK 0x8086
|
||
|
|
|
||
|
|
/*
|
||
|
|
* modern virtio-pci devices get their id assigned automatically,
|
||
|
|
@@ -95,7 +95,7 @@
|
||
|
|
*/
|
||
|
|
#define PCI_DEVICE_ID_VIRTIO_10_BASE 0x1040
|
||
|
|
|
||
|
|
-#define PCI_VENDOR_ID_REDHAT 0x1b36
|
||
|
|
+#define PCI_VENDOR_ID_REDHAT 0x8086
|
||
|
|
#define PCI_DEVICE_ID_REDHAT_BRIDGE 0x0001
|
||
|
|
#define PCI_DEVICE_ID_REDHAT_SERIAL 0x0002
|
||
|
|
#define PCI_DEVICE_ID_REDHAT_SERIAL2 0x0003
|
||
|
|
diff -Naur --no-dereference a/include/standard-headers/linux/qemu_fw_cfg.h b/include/standard-headers/linux/qemu_fw_cfg.h
|
||
|
|
--- a/include/standard-headers/linux/qemu_fw_cfg.h
|
||
|
|
+++ b/include/standard-headers/linux/qemu_fw_cfg.h
|
||
|
|
@@ -4,7 +4,7 @@
|
||
|
|
|
||
|
|
#include "standard-headers/linux/types.h"
|
||
|
|
|
||
|
|
-#define FW_CFG_ACPI_DEVICE_ID "QEMU0002"
|
||
|
|
+#define FW_CFG_ACPI_DEVICE_ID "ASUS0002"
|
||
|
|
|
||
|
|
/* selector key values for "well-known" fw_cfg entries */
|
||
|
|
#define FW_CFG_SIGNATURE 0x00
|
||
|
|
@@ -71,7 +71,7 @@
|
||
|
|
#define FW_CFG_DMA_CTL_SELECT 0x08
|
||
|
|
#define FW_CFG_DMA_CTL_WRITE 0x10
|
||
|
|
|
||
|
|
-#define FW_CFG_DMA_SIGNATURE 0x51454d5520434647ULL /* "QEMU CFG" */
|
||
|
|
+#define FW_CFG_DMA_SIGNATURE 0x4155535520434647ULL /* "QEMU CFG" */
|
||
|
|
|
||
|
|
/* Control as first field allows for different structures selected by this
|
||
|
|
* field, which might be useful in the future
|