summary refs log tree commit diff stats
path: root/hw/i386
diff options
context:
space:
mode:
authorMarkus Armbruster <armbru@redhat.com>2020-06-10 07:32:09 +0200
committerMarkus Armbruster <armbru@redhat.com>2020-06-15 22:05:28 +0200
commitc23e05614e54e11f54961fbf086193ccb4cf8aa5 (patch)
tree7f37c45d17c92b79fc0cf17746cf4a8114d816de /hw/i386
parent96927c744f9cd5205f95ef897c35695038dc2896 (diff)
downloadfocaccia-qemu-c23e05614e54e11f54961fbf086193ccb4cf8aa5.tar.gz
focaccia-qemu-c23e05614e54e11f54961fbf086193ccb4cf8aa5.zip
isa: Convert uses of isa_create(), isa_try_create() manually
Same transformation as in the previous commit.  Manual, because
convincing Coccinelle to transform these cases is not worthwhile.

Signed-off-by: Markus Armbruster <armbru@redhat.com>
Reviewed-by: Paolo Bonzini <pbonzini@redhat.com>
Message-Id: <20200610053247.1583243-21-armbru@redhat.com>
Diffstat (limited to 'hw/i386')
-rw-r--r--hw/i386/pc.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/hw/i386/pc.c b/hw/i386/pc.c
index ab2380c01f..30a2b5eb30 100644
--- a/hw/i386/pc.c
+++ b/hw/i386/pc.c
@@ -1158,14 +1158,14 @@ static void pc_superio_init(ISABus *isa_bus, bool create_fdctrl, bool no_vmport)
     i8042 = isa_create_simple(isa_bus, "i8042");
     if (!no_vmport) {
         isa_create_simple(isa_bus, TYPE_VMPORT);
-        vmmouse = isa_try_create(isa_bus, "vmmouse");
+        vmmouse = isa_try_new("vmmouse");
     } else {
         vmmouse = NULL;
     }
     if (vmmouse) {
         object_property_set_link(OBJECT(vmmouse), OBJECT(i8042),
                                  "i8042", &error_abort);
-        qdev_init_nofail(DEVICE(vmmouse));
+        isa_realize_and_unref(vmmouse, isa_bus, &error_fatal);
     }
     port92 = isa_create_simple(isa_bus, TYPE_PORT92);