From patchwork Thu Feb 22 11:25:31 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Michael Tokarev X-Patchwork-Id: 774857 Delivered-To: patch@linaro.org Received: by 2002:a5d:6ac2:0:b0:33b:4db1:f5b3 with SMTP id u2csp716951wrw; Thu, 22 Feb 2024 03:32:55 -0800 (PST) X-Forwarded-Encrypted: i=2; AJvYcCUGrbYa2fW+/TaSgh/ct7UcAPd0nCMEombN99XiKPa6LwFoVO+NPlFmFvl5YAKQp8gJAtDDkTtWW5dFWNPe6HHA X-Google-Smtp-Source: AGHT+IHVhQ/0By1ZTVE762OzPYlovxBQ5IPZ3D8mkfndzIDM+Wl3xrfJfSsBTZ1dhuVy+FhOhkl8 X-Received: by 2002:a05:600c:1392:b0:412:7eaf:c48f with SMTP id u18-20020a05600c139200b004127eafc48fmr1397442wmf.7.1708601575679; Thu, 22 Feb 2024 03:32:55 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1708601575; cv=none; d=google.com; s=arc-20160816; b=ZZyI1kVM3/iwHVPvVGoNFsNSJRERVxXPpGh3OMg6BxGAWrhDJt+OKgttEyv5628qML og2Rc9SL41k4AeuvDTBzBzq4cm5tcmyAodFEaVVGn3FDebRlzy/O6PhvRFNwtcTf+Um/ /ekNPIe38SnDlZx+8FFnaoK7e/cYfLe0wT/O0ijFKvLdzHRVKOTFTK7UK4MhvpyXOrrm Y5CNcIKeu/d3s+PxQWuPHdSAvUUuSLYC4DiQ27QpNq8UaYB8sdWt/Fnf/+MpBA9TIy+s HkpnotctH6ACPH/+Yk330EyU9WQXkRmlRDamUZzgydqUOcgihisDGoj95mLSx/V+4fDc Oklw== 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; bh=oM3jE0gAwHoYh9CPWLIp1n9EAwSi8ShKrDkAfHTOFcY=; fh=IMXbw0xx+6Q/2UEl1nyvDi1qBBGGml6rPCVUBtTSKyg=; b=w7wgEQ9vTwoQeAZFsHP7cTv9JLn+HkNnWykeCjW/RTlz9GNWtCV63tp1575zIGJ8PV 2jWfr1h65X2VzsMgiu7ufXkDtJ/lipUqInKo7uWCyPsCRcUN1m9EDbpxsVluDTcYp98l xMOAufTMi0MTmcmo0SWSa0mo2XabZOz8BnK85Zrht3051ir12vRbS9GkugQ5FZ4Yc6c4 6ByU/zWLyeF7DKhI3U/GapL3CNofFywo0Il+OtQpBhJWc6i1qSzoSdfOSQphhqJbhOhr LoD6kdLrJ6IKn+nn04xwpCdiAFcfZ44jPd2RK1MSpqNtNtJ/wr7kMRMjE7K5IYNVrMFU GSHQ==; dara=google.com ARC-Authentication-Results: i=1; mx.google.com; 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" Return-Path: Received: from lists.gnu.org (lists.gnu.org. [209.51.188.17]) by mx.google.com with ESMTPS id u5-20020a05600c138500b0040e49be48desi2090855wmf.73.2024.02.22.03.32.55 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Thu, 22 Feb 2024 03:32:55 -0800 (PST) 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; 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" Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1rd7E0-00088D-6p; Thu, 22 Feb 2024 06:26:49 -0500 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 1rd7De-00085l-6X; Thu, 22 Feb 2024 06:26:26 -0500 Received: from isrv.corpit.ru ([86.62.121.231]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1rd7DW-0004se-SJ; Thu, 22 Feb 2024 06:26:24 -0500 Received: from tsrv.corpit.ru (tsrv.tls.msk.ru [192.168.177.2]) by isrv.corpit.ru (Postfix) with ESMTP id 9DF174FB46; Thu, 22 Feb 2024 14:26:25 +0300 (MSK) Received: from tls.msk.ru (mjt.wg.tls.msk.ru [192.168.177.130]) by tsrv.corpit.ru (Postfix) with SMTP id 2474587172; Thu, 22 Feb 2024 14:26:02 +0300 (MSK) Received: (nullmailer pid 2526152 invoked by uid 1000); Thu, 22 Feb 2024 11:26:01 -0000 From: Michael Tokarev To: qemu-devel@nongnu.org Cc: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= , qemu-trivial@nongnu.org, Michael Tokarev Subject: [PULL 04/34] hw/i386/kvm/ioapic: Replace magic '24' value by proper definition Date: Thu, 22 Feb 2024 14:25:31 +0300 Message-Id: <20240222112601.2526057-5-mjt@tls.msk.ru> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20240222112601.2526057-1-mjt@tls.msk.ru> References: <20240222112601.2526057-1-mjt@tls.msk.ru> MIME-Version: 1.0 Received-SPF: pass client-ip=86.62.121.231; envelope-from=mjt@tls.msk.ru; helo=isrv.corpit.ru X-Spam_score_int: -68 X-Spam_score: -6.9 X-Spam_bar: ------ X-Spam_report: (-6.9 / 5.0 requ) BAYES_00=-1.9, RCVD_IN_DNSWL_HI=-5, SPF_HELO_NONE=0.001, SPF_PASS=-0.001, T_SCC_BODY_TEXT_LINE=-0.01 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 From: Philippe Mathieu-Daudé Replace '24' -> KVM_IOAPIC_NUM_PINS. Signed-off-by: Philippe Mathieu-Daudé Reviewed-by: Michael Tokarev Signed-off-by: Michael Tokarev --- hw/i386/kvm/ioapic.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/hw/i386/kvm/ioapic.c b/hw/i386/kvm/ioapic.c index 409d0c8c76..b96fe84eed 100644 --- a/hw/i386/kvm/ioapic.c +++ b/hw/i386/kvm/ioapic.c @@ -35,7 +35,7 @@ void kvm_pc_setup_irq_routing(bool pci_enabled) kvm_irqchip_add_irq_route(s, i, KVM_IRQCHIP_PIC_SLAVE, i - 8); } if (pci_enabled) { - for (i = 0; i < 24; ++i) { + for (i = 0; i < KVM_IOAPIC_NUM_PINS; ++i) { if (i == 0) { kvm_irqchip_add_irq_route(s, i, KVM_IRQCHIP_IOAPIC, 2); } else if (i != 2) {