From: Anthony Liguori <aliguori@us.ibm.com>
Date: Fri, 11 Jan 2013 14:36:52 +0000 (-0600)
Subject: Merge remote-tracking branch 'kraxel/q35.1' into staging
X-Git-Url: http://git.maquefel.me/?a=commitdiff_plain;h=e2848a78b0a6715f94623bdf43ef74d3d08cfe4d;p=qemu.git

Merge remote-tracking branch 'kraxel/q35.1' into staging

* kraxel/q35.1:
  Makefile: install the "acpi-dsdt.aml" and "q35-acpi-dsdt.aml" blobs too
  pc: rename machine types
  q35: document chipset devices
  q35: add ich9 intel hda controller

Conflicts:
	hw/intel-hda.c

aliguori: resolve conflict with static const change from Andreas.

Signed-off-by: Anthony Liguori <aliguori@us.ibm.com>
---

e2848a78b0a6715f94623bdf43ef74d3d08cfe4d
diff --cc hw/intel-hda.c
index 0a533dfa54,eed1d384fc..784c229d8f
--- a/hw/intel-hda.c
+++ b/hw/intel-hda.c
@@@ -1249,11 -1246,40 +1246,40 @@@ static void intel_hda_class_init_common
      dc->props = intel_hda_properties;
  }
  
- static const TypeInfo intel_hda_info = {
+ static void intel_hda_class_init_ich6(ObjectClass *klass, void *data)
+ {
+     DeviceClass *dc = DEVICE_CLASS(klass);
+     PCIDeviceClass *k = PCI_DEVICE_CLASS(klass);
+ 
+     intel_hda_class_init_common(klass);
+     k->device_id = 0x2668;
+     k->revision = 1;
+     dc->desc = "Intel HD Audio Controller (ich6)";
+ }
+ 
+ static void intel_hda_class_init_ich9(ObjectClass *klass, void *data)
+ {
+     DeviceClass *dc = DEVICE_CLASS(klass);
+     PCIDeviceClass *k = PCI_DEVICE_CLASS(klass);
+ 
+     intel_hda_class_init_common(klass);
+     k->device_id = 0x293e;
+     k->revision = 3;
+     dc->desc = "Intel HD Audio Controller (ich9)";
+ }
+ 
 -static TypeInfo intel_hda_info_ich6 = {
++static const TypeInfo intel_hda_info_ich6 = {
      .name          = "intel-hda",
      .parent        = TYPE_PCI_DEVICE,
      .instance_size = sizeof(IntelHDAState),
-     .class_init    = intel_hda_class_init,
+     .class_init    = intel_hda_class_init_ich6,
+ };
+ 
 -static TypeInfo intel_hda_info_ich9 = {
++static const TypeInfo intel_hda_info_ich9 = {
+     .name          = "ich9-intel-hda",
+     .parent        = TYPE_PCI_DEVICE,
+     .instance_size = sizeof(IntelHDAState),
+     .class_init    = intel_hda_class_init_ich9,
  };
  
  static void hda_codec_device_class_init(ObjectClass *klass, void *data)