From 39a51dfda835a75c0ebbfd92705b96e4de77f795 Mon Sep 17 00:00:00 2001
From: Markus Armbruster <armbru@redhat.com>
Date: Tue, 27 Oct 2009 13:52:13 +0100
Subject: [PATCH] qdev: Tag isa-fdc, PIIX3 IDE and PIIX4 IDE as no-user

These devices are created automatically, and attempting to create
another one with -device fails with "qemu: hardware error:
register_ioport_write: invalid opaque".

Signed-off-by: Markus Armbruster <armbru@redhat.com>
Signed-off-by: Anthony Liguori <aliguori@us.ibm.com>
---
 hw/fdc.c      | 1 +
 hw/ide/piix.c | 2 ++
 2 files changed, 3 insertions(+)

diff --git a/hw/fdc.c b/hw/fdc.c
index 06f3a2cb99..d2bfa71d8f 100644
--- a/hw/fdc.c
+++ b/hw/fdc.c
@@ -1997,6 +1997,7 @@ static ISADeviceInfo isa_fdc_info = {
     .init = isabus_fdc_init1,
     .qdev.name  = "isa-fdc",
     .qdev.size  = sizeof(fdctrl_isabus_t),
+    .qdev.no_user = 1,
     .qdev.vmsd  = &vmstate_fdc,
     .qdev.reset = fdctrl_external_reset_isa,
     .qdev.props = (Property[]) {
diff --git a/hw/ide/piix.c b/hw/ide/piix.c
index 8958d56a5c..a4756e0f27 100644
--- a/hw/ide/piix.c
+++ b/hw/ide/piix.c
@@ -179,10 +179,12 @@ static PCIDeviceInfo piix_ide_info[] = {
     {
         .qdev.name    = "PIIX3 IDE",
         .qdev.size    = sizeof(PCIIDEState),
+        .qdev.no_user = 1,
         .init         = pci_piix3_ide_initfn,
     },{
         .qdev.name    = "PIIX4 IDE",
         .qdev.size    = sizeof(PCIIDEState),
+        .qdev.no_user = 1,
         .init         = pci_piix4_ide_initfn,
     },{
         /* end of list */