From patchwork Tue Oct 3 08:27:25 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= X-Patchwork-Id: 728719 Delivered-To: patch@linaro.org Received: by 2002:a5d:60c8:0:b0:31d:da82:a3b4 with SMTP id x8csp2032589wrt; Tue, 3 Oct 2023 01:28:38 -0700 (PDT) X-Google-Smtp-Source: AGHT+IG52nk/FH8yEkICXiq9Y8oVp3RQ+OCpqwPZaRBZWDQU3O8N33+jkFDDo1eag1rHfa86y8VJ X-Received: by 2002:a0c:e30e:0:b0:655:da42:b92a with SMTP id s14-20020a0ce30e000000b00655da42b92amr13836813qvl.13.1696321718049; Tue, 03 Oct 2023 01:28:38 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1696321718; cv=none; d=google.com; s=arc-20160816; b=h00LE2EO0urPg9/FnBx8iO+FpK8lAbP/zGT+Spyvk410kEE1Z/p9RoxfuFmUL8br72 2VGDckmEaFDJ0iD3RbN2TBhWW1tUotTBPeGYCd12AXnUQ7ojFsq66rFcC0PPFCEuMtty bs8XEfzYjcQF/+ddv5v6wf4XkhM9uKu67XWc5AvTxyqZ3f5XDmONNBR9LMcB3XvuDxKu 6mp7DFZrx6TD7wZZOHjo9dGmq2A+Y/99hSAAy4G1y3LKlauKm2I/s1Z4qY4BhPZeUdrb vfPydP23lfJ8IGscm3k+2cDLgXmbFpqAtmNzJRekGJlQZIFZK/I60lubIribW8PiDyHD StQA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:content-transfer-encoding :mime-version:references:in-reply-to:message-id:date:subject:cc:to :from:dkim-signature; bh=+NncaZm4Rq7ypawzJ8HayEn0g0SZFapHip8wBEcGgdE=; fh=biB0OdKYuvljSiUGLVdYZIMuRed58bIG1HesIB1fX9c=; b=RZLx0ekfqEQs7F+vGRBFt6nkTzyUB4qiFpwC4QUdDeP3zt0KIF6KeZ/sMXJ8MbPAIx kVomzTO4f+HKW/JhOeUbV8Bs09ph+AGeExhgUK4NoYCPKhdYa7nF1e9OIv79Mb4ZYipP UWi2PCQILF9DEKzz4Lzr4GC3rc67XBUKfNhMr3aTcy1PrWMUymJSq3H/OXpqSJ8YzKy2 ryQudhu8+0uxU4oyLw22Eb1tGY1vGrapKWYgeLny5Gt5nsimGgY31N0+LwgkAS6Db7cz zTBnGZWq8WH4ay6r3Y9NUO629nzl3H+xGEIG9X2kXtr9CGOdlyxVSvBRXmRb3WaPQZ5a YkVA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b="t82/BKoJ"; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from lists.gnu.org (lists.gnu.org. [209.51.188.17]) by mx.google.com with ESMTPS id o18-20020a0cf4d2000000b00655e32a568csi301304qvm.282.2023.10.03.01.28.37 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Tue, 03 Oct 2023 01:28:38 -0700 (PDT) Received-SPF: pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; Authentication-Results: mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b="t82/BKoJ"; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1qnakz-0005Ss-L7; Tue, 03 Oct 2023 04:27:53 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1qnakw-0005Rn-Ay for qemu-devel@nongnu.org; Tue, 03 Oct 2023 04:27:50 -0400 Received: from mail-wm1-x32c.google.com ([2a00:1450:4864:20::32c]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1qnakt-00080X-VC for qemu-devel@nongnu.org; Tue, 03 Oct 2023 04:27:50 -0400 Received: by mail-wm1-x32c.google.com with SMTP id 5b1f17b1804b1-40666aa674fso6071415e9.0 for ; Tue, 03 Oct 2023 01:27:47 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1696321666; x=1696926466; darn=nongnu.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=+NncaZm4Rq7ypawzJ8HayEn0g0SZFapHip8wBEcGgdE=; b=t82/BKoJiCOAT3Ux6+Y4iWfkliIsjP7A/D9QISA1mQjQtvLiqYxQW6lkb7Ij4VallT xIvHGPe7A7qT1vq2oSF8OdbMuxZlH0SaWceDclQFvoTRNRK9jb+h2Ji2GYAUFC3eoKut WM/vAZOhewKO2LaPtvZqorBeo1MKxmxx8WgYorVJ4BsQptJ5Gg0E/k06ZXNq0bMyxUpt +iFtm5+qFdT/t13P7QB7AQmIQYCY/XtYt8Tp19Sq25coFpm35b8LWaAG3s+cmj4frWC1 9c3nH9cXQkV065atXsFYfUbFj4JQbPX2bXKEFSuLNqcURT6Np9oIhQuM/hI1ylYoeHRr OfKg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1696321666; x=1696926466; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=+NncaZm4Rq7ypawzJ8HayEn0g0SZFapHip8wBEcGgdE=; b=rF1LVuMkh+DEdWP50baGaHzvpILpLY6DD3X7qa0MVF9HT88V39Wv4IC3yl4xRao4mZ Nx2DmukPCeMeQ3khkEo4EIcUKPZr4GcjFKqMFFwbJ4aCc2iKeWcQimshDkJYlcrkYYmb b/tKra6PwNBNBaaw+woTUgAKeX1qjpgKrbBqSlmFeQa0gmk+lvCLJOMU3wXoZdc94qjk DXQStCTP+kUz4V3B/IPQMu2ukYf2xy2nzKh7rEfonhosgq5oZpwgYtS06jaNs0K4oEfw xYRujAI91/rb32gpPa7M4HyZqKhB4iStBT733yIoLfll+aRT9/fBi4Cmw7YCFWds/74F 3BWg== X-Gm-Message-State: AOJu0YyOHNuXp4EiwTTgfA5E+ihkzhJGkqnLUyTJ0nlVSNQxabdaR1a0 Ew0buduFSIGtfzM6wxSjnPlsRa3uvJ7cSC7T40O5DA== X-Received: by 2002:a7b:cbd4:0:b0:3fe:d1e9:e6b8 with SMTP id n20-20020a7bcbd4000000b003fed1e9e6b8mr12338088wmi.12.1696321666116; Tue, 03 Oct 2023 01:27:46 -0700 (PDT) Received: from m1x-phil.lan (176-131-222-246.abo.bbox.fr. [176.131.222.246]) by smtp.gmail.com with ESMTPSA id p8-20020a1c7408000000b003fefcbe7fa8sm707360wmc.28.2023.10.03.01.27.44 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Tue, 03 Oct 2023 01:27:45 -0700 (PDT) From: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: Bernhard Beschow , Marcel Apfelbaum , Markus Armbruster , Richard Henderson , Peter Xu , Jason Wang , "Michael S. Tsirkin" , Eduardo Habkost , Paolo Bonzini , =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= Subject: [PATCH v2 2/5] hw/i386/apic: Defer error check from apic_get_class to kvm_apic_realize Date: Tue, 3 Oct 2023 10:27:25 +0200 Message-ID: <20231003082728.83496-3-philmd@linaro.org> X-Mailer: git-send-email 2.41.0 In-Reply-To: <20231003082728.83496-1-philmd@linaro.org> References: <20231003082728.83496-1-philmd@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::32c; envelope-from=philmd@linaro.org; helo=mail-wm1-x32c.google.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: qemu-devel-bounces+patch=linaro.org@nongnu.org apic_get_class() isn't supposed to fail. kvm_apic_realize() is DeviceRealize() handler, which can fail. Defer the error check to the latter. Signed-off-by: Philippe Mathieu-Daudé --- hw/i386/kvm/apic.c | 5 +++++ target/i386/cpu-sysemu.c | 8 -------- 2 files changed, 5 insertions(+), 8 deletions(-) diff --git a/hw/i386/kvm/apic.c b/hw/i386/kvm/apic.c index 1e89ca0899..4883308247 100644 --- a/hw/i386/kvm/apic.c +++ b/hw/i386/kvm/apic.c @@ -228,6 +228,11 @@ static void kvm_apic_realize(DeviceState *dev, Error **errp) { APICCommonState *s = APIC_COMMON(dev); + if (!kvm_irqchip_in_kernel()) { + error_setg(errp, "KVM does not support userspace APIC"); + return; + } + memory_region_init_io(&s->io_memory, OBJECT(s), &kvm_apic_io_ops, s, "kvm-apic-msi", APIC_SPACE_SIZE); diff --git a/target/i386/cpu-sysemu.c b/target/i386/cpu-sysemu.c index 2375e48178..6a228c9178 100644 --- a/target/i386/cpu-sysemu.c +++ b/target/i386/cpu-sysemu.c @@ -253,10 +253,6 @@ APICCommonClass *apic_get_class(Error **errp) /* TODO: in-kernel irqchip for hvf */ if (kvm_enabled()) { - if (!kvm_irqchip_in_kernel()) { - error_setg(errp, "KVM does not support userspace APIC"); - return NULL; - } apic_type = "kvm-apic"; } else if (xen_enabled()) { apic_type = "xen-apic"; @@ -272,10 +268,6 @@ void x86_cpu_apic_create(X86CPU *cpu, Error **errp) APICCommonState *apic; APICCommonClass *apic_class = apic_get_class(errp); - if (!apic_class) { - return; - } - cpu->apic_state = DEVICE(object_new_with_class(OBJECT_CLASS(apic_class))); object_property_add_child(OBJECT(cpu), "lapic", OBJECT(cpu->apic_state));