{"id":2223363,"url":"http://patchwork.ozlabs.org/api/1.1/patches/2223363/?format=json","web_url":"http://patchwork.ozlabs.org/project/qemu-devel/patch/20260415063835.85540-1-anisinha@redhat.com/","project":{"id":14,"url":"http://patchwork.ozlabs.org/api/1.1/projects/14/?format=json","name":"QEMU Development","link_name":"qemu-devel","list_id":"qemu-devel.nongnu.org","list_email":"qemu-devel@nongnu.org","web_url":"","scm_url":"","webscm_url":""},"msgid":"<20260415063835.85540-1-anisinha@redhat.com>","date":"2026-04-15T06:38:35","name":"[for-11.1] accel/kvm: refactor and clean up do_kvm_irqchip_create","commit_ref":null,"pull_url":null,"state":"new","archived":false,"hash":"481b10b5c19f4c19fdd435b078aa068c21eb708f","submitter":{"id":86030,"url":"http://patchwork.ozlabs.org/api/1.1/people/86030/?format=json","name":"Ani Sinha","email":"anisinha@redhat.com"},"delegate":null,"mbox":"http://patchwork.ozlabs.org/project/qemu-devel/patch/20260415063835.85540-1-anisinha@redhat.com/mbox/","series":[{"id":499930,"url":"http://patchwork.ozlabs.org/api/1.1/series/499930/?format=json","web_url":"http://patchwork.ozlabs.org/project/qemu-devel/list/?series=499930","date":"2026-04-15T06:38:35","name":"[for-11.1] accel/kvm: refactor and clean up do_kvm_irqchip_create","version":1,"mbox":"http://patchwork.ozlabs.org/series/499930/mbox/"}],"comments":"http://patchwork.ozlabs.org/api/patches/2223363/comments/","check":"pending","checks":"http://patchwork.ozlabs.org/api/patches/2223363/checks/","tags":{},"headers":{"Return-Path":"","X-Original-To":"incoming@patchwork.ozlabs.org","Delivered-To":"patchwork-incoming@legolas.ozlabs.org","Authentication-Results":["legolas.ozlabs.org;\n\tdkim=pass (1024-bit key;\n unprotected) header.d=redhat.com header.i=@redhat.com header.a=rsa-sha256\n header.s=mimecast20190719 header.b=IghixYFU;\n\tdkim=pass (2048-bit key;\n unprotected) header.d=redhat.com header.i=@redhat.com header.a=rsa-sha256\n header.s=google header.b=gSDrdWtH;\n\tdkim-atps=neutral","legolas.ozlabs.org;\n spf=pass (sender SPF authorized) smtp.mailfrom=nongnu.org\n (client-ip=209.51.188.17; helo=lists1p.gnu.org;\n envelope-from=qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org;\n receiver=patchwork.ozlabs.org)"],"Received":["from lists1p.gnu.org (lists1p.gnu.org [209.51.188.17])\n\t(using TLSv1.2 with cipher ECDHE-ECDSA-AES256-GCM-SHA384 (256/256 bits))\n\t(No client certificate requested)\n\tby legolas.ozlabs.org (Postfix) with ESMTPS id 4fwWhr0wf1z1yCv\n\tfor ; Wed, 15 Apr 2026 16:39:38 +1000 (AEST)","from localhost ([::1] helo=lists1p.gnu.org)\n\tby lists1p.gnu.org with esmtp (Exim 4.90_1)\n\t(envelope-from )\n\tid 1wCttx-0007rs-3k; Wed, 15 Apr 2026 02:39:05 -0400","from eggs.gnu.org ([2001:470:142:3::10])\n by lists1p.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256)\n (Exim 4.90_1) (envelope-from )\n id 1wCttt-0007ra-Sj\n for qemu-devel@nongnu.org; Wed, 15 Apr 2026 02:39:03 -0400","from us-smtp-delivery-124.mimecast.com ([170.10.129.124])\n by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256)\n (Exim 4.90_1) (envelope-from )\n id 1wCttr-0007fQ-E2\n for qemu-devel@nongnu.org; Wed, 15 Apr 2026 02:39:01 -0400","from mail-pj1-f70.google.com (mail-pj1-f70.google.com\n [209.85.216.70]) by relay.mimecast.com with ESMTP with STARTTLS\n (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id\n us-mta-653-rstIY0MsMqGXZWqKnUNZHw-1; Wed, 15 Apr 2026 02:38:54 -0400","by mail-pj1-f70.google.com with SMTP id\n 98e67ed59e1d1-358f058973fso6676243a91.1\n for ; Tue, 14 Apr 2026 23:38:54 -0700 (PDT)","from localhost.localdomain ([122.163.114.34])\n by smtp.googlemail.com with ESMTPSA id\n 98e67ed59e1d1-35fd07a972esm596362a91.4.2026.04.14.23.38.49\n (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256);\n Tue, 14 Apr 2026 23:38:52 -0700 (PDT)"],"DKIM-Signature":["v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com;\n s=mimecast20190719; t=1776235135;\n h=from:from:reply-to:subject:subject:date:date:message-id:message-id:\n to:to:cc:cc:mime-version:mime-version:\n content-transfer-encoding:content-transfer-encoding;\n bh=TlUvblGUZFmpowKcYrdITWRBi4imocF9Ym6v0uJYyp0=;\n b=IghixYFUoxBL34KDOsaSezbNYCC3fOJI/8XbSMRV2K/WZ0QhHMDLWZn6r8hgHkaiLie6Fz\n MIJJIxV0iNacarX3LbbgSk0u1NrxC7a5JRW9c0qtQ2K1EyiNac8QCdNtswLVZWjcX0iQDD\n 2sjV12H6vENrRRv8CprYc85rd5R7m8s=","v=1; a=rsa-sha256; c=relaxed/relaxed;\n d=redhat.com; s=google; t=1776235133; x=1776839933; darn=nongnu.org;\n h=content-transfer-encoding:mime-version:message-id:date:subject:cc\n :to:from:from:to:cc:subject:date:message-id:reply-to;\n bh=TlUvblGUZFmpowKcYrdITWRBi4imocF9Ym6v0uJYyp0=;\n b=gSDrdWtHG1IVw7T6GD1SVoFrIMInC3zgdSH6DqoDreeW8pYi9MYkslp6apJ2JMuwxS\n nj41UVm4QY4nAJiXN7YUDkcMBQJRtdaXG/aTqf8DcLfWsgOu7RK5+gwDwh4stMIhdJcq\n TYTenQ7mf1RJVGY8F6saZgQLRuo31zWkh4bz4nlnLnIjgOyskJxu46eM+vnXd4ZneFE/\n +4QrasKifUiJGH5civICZx9gEzdCXdK/vvpzsKgmlwiCjz6eF8TMsay/6po1CpE/LbXv\n FZu5pfi7mdm5H0FJ+j447n8vxfcmw16NZrQAX+6Zl0SVgumS1J/J/VxwGXYnUFvgZsNE\n zzeA=="],"X-MC-Unique":"rstIY0MsMqGXZWqKnUNZHw-1","X-Mimecast-MFC-AGG-ID":"rstIY0MsMqGXZWqKnUNZHw_1776235133","X-Google-DKIM-Signature":"v=1; a=rsa-sha256; c=relaxed/relaxed;\n d=1e100.net; s=20251104; t=1776235133; x=1776839933;\n h=content-transfer-encoding:mime-version:message-id:date:subject:cc\n :to:from:x-gm-gg:x-gm-message-state:from:to:cc:subject:date\n :message-id:reply-to;\n bh=TlUvblGUZFmpowKcYrdITWRBi4imocF9Ym6v0uJYyp0=;\n b=eOoK6eb14VRo/9AuXCLe0q+8nvGiwcHSEFaFWymxqB23TrUZ35dIRnA4Ja3L3MHJdw\n /LjnZOLWAgGXYRfOs0PPM3cuyG47Eh3DoywSO64neCb/Lxb5bVmgZ4lcgFO5SWdxxtkG\n gxa9IZaGxo3vGpx5Yay2z5nVHq5bgUb4KsTr2VNpIIM5JKPHJV0Z/igs8PQAbbskrtbY\n SlJiNsYwCwS8FE3XsSvBdNONX3eX/tlxp+TIejqjUTFl2ACRArvFaNatbqmqbv0aAJ1T\n o3ksb8d+CwTFUell4a/sp5K9kUn0K6REOGjGmf6QeX7qcYXeYMEVq4IMrzOkjtYvo8/T\n 4s9Q==","X-Forwarded-Encrypted":"i=1;\n AFNElJ9VufpyXZKnZXmf1Q6K1J7KQ2r6Shy0r4f5m4cY1MIQRiVNl3tSG/fcqhXBJX1vnQXYh0Kgl8mcXl7y@nongnu.org","X-Gm-Message-State":"AOJu0YwMdxX6HqSbT10nvciQ/4vOWrBOypIiqRH9X3U0NFz9sGxGmf80\n IW0mFNzmk2KOnag8dFiMUmVzCBDrCzjTPpLL+cJmwwOfr/6G8qg7mxNIqTCRFoKI42t/VoEcQWH\n ooHeEZTfOTwh1cbbMRK0qxKVEw5aPjhu4++bmbclLTd4mwkCJi7xWrpPd","X-Gm-Gg":"AeBDietSHc6Sf1FblEgmHy7QCxnX9dNr3ER624JwdKVpVffxqxxvn055LW+nnpMl8kU\n /wXPDmFLrVn9zyIgFpiaX83h8wIYRrstupKrtKPFJcM2eMCQu2PrUvZ2xfi0rbSt8BVBl9q3axx\n JK+3cveD5nG6+sXA+4XOfDpl8FNSIMr6+n5N+ySY5C5RPepkjKIgx92h3qgxnuqUAPykKBLYbxY\n Jx/TBK8RmWdAAEn2P3FQaBEnqKSiebC3Rmt6nVh8K+1HRN+aOnHsJGQsG33gqgdTCCiiB4/MWWT\n Ar6/J2diydlnkbF8v1Sm+7/4XYLaQYcG4koMsdmJ6uzKnJpaezMVElNbbsy8CWAriJIzUAMfcn+\n VYCzlbqe1ikfVfk2jfVaUDozym5fzVcBUS3ePuj03gzHZBrCTLXinCd63FNBzxyPjfE2vqgD/Ek\n lLnGUtDg==","X-Received":["by 2002:a17:90b:2e8c:b0:35f:d56d:1c45 with SMTP id\n 98e67ed59e1d1-35fd56d1c7emr382512a91.12.1776235133093;\n Tue, 14 Apr 2026 23:38:53 -0700 (PDT)","by 2002:a17:90b:2e8c:b0:35f:d56d:1c45 with SMTP id\n 98e67ed59e1d1-35fd56d1c7emr382485a91.12.1776235132490;\n Tue, 14 Apr 2026 23:38:52 -0700 (PDT)"],"From":"Ani Sinha ","To":"Paolo Bonzini ","Cc":"Ani Sinha , peter.maydell@linaro.org,\n philmd@linaro.org, kvm@vger.kernel.org, qemu-devel@nongnu.org","Subject":"[PATCH for-11.1] accel/kvm: refactor and clean up\n do_kvm_irqchip_create","Date":"Wed, 15 Apr 2026 12:08:35 +0530","Message-ID":"<20260415063835.85540-1-anisinha@redhat.com>","X-Mailer":"git-send-email 2.49.0","MIME-Version":"1.0","Content-Transfer-Encoding":"8bit","Received-SPF":"pass client-ip=170.10.129.124;\n envelope-from=anisinha@redhat.com;\n helo=us-smtp-delivery-124.mimecast.com","X-Spam_score_int":"-25","X-Spam_score":"-2.6","X-Spam_bar":"--","X-Spam_report":"(-2.6 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.54,\n DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1,\n RCVD_IN_DNSWL_NONE=-0.0001, RCVD_IN_MSPIKE_H4=0.001, RCVD_IN_MSPIKE_WL=0.001,\n RCVD_IN_VALIDITY_RPBL_BLOCKED=0.001, RCVD_IN_VALIDITY_SAFE_BLOCKED=0.001,\n SPF_HELO_PASS=-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":"qemu development ","List-Unsubscribe":",\n ","List-Archive":"","List-Post":"","List-Help":"","List-Subscribe":",\n ","Errors-To":"qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org","Sender":"qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org"},"content":"Refactor do_kvm_irqchip_create() so it has specific return codes for specific\ncases. Clean up the logic and add some clarifying comments. Adjust the\nfunction call logic accourdingly. Should be no material change.\n\nSigned-off-by: Ani Sinha \n---\n accel/kvm/kvm-all.c | 48 ++++++++++++++++++++++++++++-----------------\n 1 file changed, 30 insertions(+), 18 deletions(-)","diff":"diff --git a/accel/kvm/kvm-all.c b/accel/kvm/kvm-all.c\nindex 92af42503b..788cbf8693 100644\n--- a/accel/kvm/kvm-all.c\n+++ b/accel/kvm/kvm-all.c\n@@ -2575,6 +2575,13 @@ void kvm_irqchip_set_qemuirq_gsi(KVMState *s, qemu_irq irq, int gsi)\n g_hash_table_insert(s->gsimap, irq, GINT_TO_POINTER(gsi));\n }\n \n+/**\n+ * do_kvm_irqchip_create - create irqchip\n+ * @s: The KVMState pointer\n+ *\n+ * Returns: -errno on fatal errors, 0 on success and\n+ * non-negative on non-fatal errors.\n+ */\n static int do_kvm_irqchip_create(KVMState *s)\n {\n int ret;\n@@ -2583,32 +2590,34 @@ static int do_kvm_irqchip_create(KVMState *s)\n } else if (kvm_check_extension(s, KVM_CAP_S390_IRQCHIP)) {\n ret = kvm_vm_enable_cap(s, KVM_CAP_S390_IRQCHIP, 0);\n if (ret < 0) {\n- fprintf(stderr, \"Enable kernel irqchip failed: %s\\n\", strerror(-ret));\n- exit(1);\n+ error_report(\"Enable kernel irqchip failed: %s\", strerror(-ret));\n+ return ret;\n }\n } else {\n- return -EOPNOTSUPP;\n+ /*\n+ * neither KVM_CAP_IRQCHIP nor KVM_CAP_S390_IRQCHIP capabilities are\n+ * present. We can't proceed. Bail.\n+ */\n+ return 1;\n }\n \n- if (kvm_check_extension(s, KVM_CAP_IRQFD) <= 0) {\n- fprintf(stderr, \"kvm: irqfd not implemented\\n\");\n- exit(1);\n- }\n+ assert(kvm_check_extension(s, KVM_CAP_IRQFD));\n \n /* First probe and see if there's a arch-specific hook to create the\n * in-kernel irqchip for us */\n ret = kvm_arch_irqchip_create(s);\n if (ret == 0) {\n- if (s->kernel_irqchip_split == ON_OFF_AUTO_ON) {\n- error_report(\"Split IRQ chip mode not supported.\");\n- exit(1);\n- } else {\n- ret = kvm_vm_ioctl(s, KVM_CREATE_IRQCHIP);\n- }\n+ /*\n+ * If we are here, it means we are going to do an in-kernel irqchip.\n+ * Lets make sure that the kernel_irqchip_split setting is not set to\n+ * split mode.\n+ */\n+ assert(s->kernel_irqchip_split != ON_OFF_AUTO_ON);\n+ ret = kvm_vm_ioctl(s, KVM_CREATE_IRQCHIP);\n }\n if (ret < 0) {\n- fprintf(stderr, \"Create kernel irqchip failed: %s\\n\", strerror(-ret));\n- exit(1);\n+ error_report(\"Create kernel irqchip failed: %s\", strerror(-ret));\n+ return ret;\n }\n \n return 0;\n@@ -2616,9 +2625,13 @@ static int do_kvm_irqchip_create(KVMState *s)\n \n static void kvm_irqchip_create(KVMState *s)\n {\n+ int ret;\n assert(s->kernel_irqchip_split != ON_OFF_AUTO_AUTO);\n \n- if (do_kvm_irqchip_create(s) < 0) {\n+ ret = do_kvm_irqchip_create(s);\n+ assert(ret >= 0);\n+ if (ret) {\n+ /* required kvm capabilities missing, we can't proceed. */\n return;\n }\n kvm_kernel_irqchip = true;\n@@ -2839,8 +2852,7 @@ static int kvm_reset_vmfd(MachineState *ms)\n }\n \n if (s->kernel_irqchip_allowed) {\n- /* ignore return from this function */\n- do_kvm_irqchip_create(s);\n+ assert(do_kvm_irqchip_create(s) >= 0);\n }\n \n /*\n","prefixes":["for-11.1"]}