From nobody Sun May 5 11:27:43 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1576235568; cv=none; d=zohomail.com; s=zohoarc; b=FpjGpBM71KB9IgUD1wsPebfFAWxf7dEIQmOs0Yq9dKKHJh1iT6KyK0p7MpWrO/6D6toAALpECPsAEIlgEo2sD8eK0z+1J0BwnE9JnFHxFqWM/MM3T/dN3jWBW6afjp9WTVjvCF/LaORKM/JT4vn88CQuo4QViwuaBr0mx5qRixA= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1576235568; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:Sender:Subject:To; bh=9m3dEZtdHZV4704oi8uUh8EJBV6qZdzh2uIOy9D2PN0=; b=aMqYyHitdztSJWjGyVLfXCVB/nFPVrg9e9r0aCbap2/nqVGSGdlMKJd4hKfv/SywoRTokJYPXbiXgqTFBfS4qX/fGpe8y7LSsks9P7P+PAvEUgQmQQmmpCUyY7CgMZ/g0QaoKs4YrsyItbP3/R9OcVSUR4D39tqj760xl5ukhR0= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail header.from= (p=none dis=none) header.from= Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 15762355684191017.2217405336423; Fri, 13 Dec 2019 03:12:48 -0800 (PST) Received: from localhost ([::1]:46842 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1ifisI-0002OO-Rr for importer@patchew.org; Fri, 13 Dec 2019 06:12:46 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:59206) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1ifirX-0001wn-BH for qemu-devel@nongnu.org; Fri, 13 Dec 2019 06:12:00 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1ifirW-0000Yz-Bf for qemu-devel@nongnu.org; Fri, 13 Dec 2019 06:11:59 -0500 Received: from us-smtp-delivery-1.mimecast.com ([207.211.31.120]:22790 helo=us-smtp-1.mimecast.com) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1ifirW-0000Y5-7v for qemu-devel@nongnu.org; Fri, 13 Dec 2019 06:11:58 -0500 Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-309-km6ISO6JOp2eqirXKCoUXw-1; Fri, 13 Dec 2019 06:11:56 -0500 Received: from smtp.corp.redhat.com (int-mx06.intmail.prod.int.phx2.redhat.com [10.5.11.16]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 6DDB6800D41; Fri, 13 Dec 2019 11:11:55 +0000 (UTC) Received: from x1w.redhat.com (ovpn-204-134.brq.redhat.com [10.40.204.134]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 54EC75C3FD; Fri, 13 Dec 2019 11:11:47 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1576235517; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=9m3dEZtdHZV4704oi8uUh8EJBV6qZdzh2uIOy9D2PN0=; b=cUZUvd4JQJ7yBiToLNGdTXrI9QpAmJTgCm+IXsGx9diLUvT6rjDwP3VVhstYqMqdnVT7HJ sb9cJEWpbA3bh+/gwj80ApxFbHxD9pmTyya48xF0sxD0RtNz6qkXBzVwRRS5lSHRbJOPaw yRseOFptLsYRq6ZXHu809IDUA7/aCPc= From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Subject: [PATCH] hw/i386/pc: Simplify ioapic_init_gsi() Date: Fri, 13 Dec 2019 12:11:45 +0100 Message-Id: <20191213111145.11288-1-philmd@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.16 X-MC-Unique: km6ISO6JOp2eqirXKCoUXw-1 X-Mimecast-Spam-Score: 0 Content-Transfer-Encoding: quoted-printable X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] [fuzzy] X-Received-From: 207.211.31.120 X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Eduardo Habkost , "Michael S. Tsirkin" , qemu-trivial@nongnu.org, Paolo Bonzini , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Richard Henderson Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) Content-Type: text/plain; charset="utf-8" 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=C3=A9 --- hw/i386/pc.c | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/hw/i386/pc.c b/hw/i386/pc.c index ac08e63604..234945d328 100644 --- a/hw/i386/pc.c +++ b/hw/i386/pc.c @@ -1488,15 +1488,14 @@ void ioapic_init_gsi(GSIState *gsi_state, const cha= r *parent_name) SysBusDevice *d; unsigned int i; =20 + assert(parent_name); if (kvm_ioapic_in_kernel()) { dev =3D qdev_create(NULL, TYPE_KVM_IOAPIC); } else { dev =3D 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 =3D SYS_BUS_DEVICE(dev); sysbus_mmio_map(d, 0, IO_APIC_DEFAULT_ADDRESS); --=20 2.21.0