From: Philippe Mathieu-Daudé <philmd@redhat.com>
Date: Fri, 13 Dec 2019 11:11:45 +0000 (+0100)
Subject: hw/i386: Simplify ioapic_init_gsi()
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=14a1bb48ea48d541ea6f373c12fb7e88d2c89d8f;p=qmiga%2Fqemu.git

hw/i386: Simplify ioapic_init_gsi()

All callers of ioapic_init_gsi() provide a parent. We want new
uses to follow the same good practice and provide the parent
name, so do not make this optional: assert the parent name is
provided, and simplify the code.

Signed-off-by: Philippe Mathieu-Daudé <philmd@redhat.com>
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
---

diff --git a/hw/i386/x86.c b/hw/i386/x86.c
index d18a3ef03d..d8bb5c2a96 100644
--- a/hw/i386/x86.c
+++ b/hw/i386/x86.c
@@ -307,15 +307,14 @@ void ioapic_init_gsi(GSIState *gsi_state, const char *parent_name)
     SysBusDevice *d;
     unsigned int i;
 
+    assert(parent_name);
     if (kvm_ioapic_in_kernel()) {
         dev = qdev_create(NULL, TYPE_KVM_IOAPIC);
     } else {
         dev = qdev_create(NULL, TYPE_IOAPIC);
     }
-    if (parent_name) {
-        object_property_add_child(object_resolve_path(parent_name, NULL),
-                                  "ioapic", OBJECT(dev), NULL);
-    }
+    object_property_add_child(object_resolve_path(parent_name, NULL),
+                              "ioapic", OBJECT(dev), NULL);
     qdev_init_nofail(dev);
     d = SYS_BUS_DEVICE(dev);
     sysbus_mmio_map(d, 0, IO_APIC_DEFAULT_ADDRESS);