Merge remote-tracking branch 'luiz/queue/qmp' into staging

[qemu.git] / hw / piix4.c

diff --git a/hw/piix4.c b/hw/piix4.c
index ce4eb0d1ae3f2c2676535a86636402a9fb4d6b81..0f5cd014e59815ccb5656529687c08a295d4d96d 100644 (file)
--- a/hw/piix4.c
+++ b/hw/piix4.c
@@ -22,11 +22,11 @@
  * THE SOFTWARE.
  */
 
-#include "hw.h"
-#include "pc.h"
-#include "pci.h"
-#include "isa.h"
-#include "sysbus.h"
+#include "hw/hw.h"
+#include "hw/pc.h"
+#include "hw/pci/pci.h"
+#include "hw/isa.h"
+#include "hw/sysbus.h"
 
 PCIDevice *piix4_dev;
 
@@ -117,7 +117,7 @@ static void piix4_class_init(ObjectClass *klass, void *data)
     dc->vmsd = &vmstate_piix4;
 }
 
-static TypeInfo piix4_info = {
+static const TypeInfo piix4_info = {
     .name          = "PIIX4",
     .parent        = TYPE_PCI_DEVICE,
     .instance_size = sizeof(PIIX4State),