From nobody Sat Nov 15 19:32:08 2025 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; 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=pass(p=quarantine dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1748592290; cv=none; d=zohomail.com; s=zohoarc; b=lBBd2BgII424fuxXRfhKP1nJybWqNb5iGvKXezNDrI4AdqslcMqfKemcw1NLl+RyTBfirGypMuOtwIPkBelzQEeIK3lBq89QI5uKNgNaz3qmfbBDlmQEjcQEI/Hn1ULHZuIsn7peek2RGpOQR4kFe8Zjg0oDDpcMQRNT7C08Knc= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1748592290; h=Content-Transfer-Encoding:Cc:Cc:Date:Date:From:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:Subject:To:To:Message-Id:Reply-To; bh=VTevlSH5ZQkYyW+Mm1Gr4K/vGmq39vmXxviFGBBggFI=; b=fNcsywZ/02n0Rd6/TfU/jy2jq8Qv/LYcalANG4SjNYYWkyZ/E0Cpoy2/d6/QyGIKZJLBOBgYtQ8L4iDRd+eOAvJ0+M3DFlRjnViwYwCTfZfdaw4gPVag0t1OSbC6ps0dDHFwTzhimnJKUr4Dbv7/+PasyrW1Si7mnJw+iCCGvcM= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; 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=pass header.from= (p=quarantine dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1748592290128708.9068863656103; Fri, 30 May 2025 01:04:50 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1uKuiY-0002f4-SF; Fri, 30 May 2025 04:03:54 -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 1uKuiO-0002Yx-EJ for qemu-devel@nongnu.org; Fri, 30 May 2025 04:03:45 -0400 Received: from us-smtp-delivery-124.mimecast.com ([170.10.129.124]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1uKuiL-0004e8-Ge for qemu-devel@nongnu.org; Fri, 30 May 2025 04:03:43 -0400 Received: from mail-ej1-f72.google.com (mail-ej1-f72.google.com [209.85.218.72]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-75-MWJoTG4SNw6SXHKAAg9pKw-1; Fri, 30 May 2025 04:03:39 -0400 Received: by mail-ej1-f72.google.com with SMTP id a640c23a62f3a-ad556f5f1a9so131907666b.3 for ; Fri, 30 May 2025 01:03:39 -0700 (PDT) Received: from [192.168.122.1] ([151.49.64.79]) by smtp.gmail.com with ESMTPSA id a640c23a62f3a-ada5d82ccedsm283858666b.48.2025.05.30.01.03.35 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 30 May 2025 01:03:35 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1748592220; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=VTevlSH5ZQkYyW+Mm1Gr4K/vGmq39vmXxviFGBBggFI=; b=gVsPpSwsYFhRC2DlWsochc1nYu0nEnc7+AwWavoEyCwBR2Vdeuqhon/dGSZwRsODREUP1R ygtQSlqWIdcetg/YhxuD+cWA9w9/gPbcc3JWJ+8yFp8LpbWyhwxSSXZo6TJUno4il1WEKT BXzS7707dP9T+F6HZP5P9+0PeF7gCrw= X-MC-Unique: MWJoTG4SNw6SXHKAAg9pKw-1 X-Mimecast-MFC-AGG-ID: MWJoTG4SNw6SXHKAAg9pKw_1748592218 X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1748592218; x=1749197018; 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=VTevlSH5ZQkYyW+Mm1Gr4K/vGmq39vmXxviFGBBggFI=; b=rHLUR+cBWSLB2nI2yDnW/rN0zZs4CAzA2AyUqYB0JdHwDWvm8Gb/KHJd0YDYWlphZJ drkbBn9u+AXW0/aZQHXeTFT3el+WHqvK7bWBrqgV+KDE/Epa5LC1klJd5xpwzYZYkTZZ Jy4eprZt50PndWXSg9YEbeDLSDRXmrktv+OgJns0QzELx0MIbzPT1c0ey0YC19VV2iFe IJQ88JtKD3Cp085d4o78vfAxyzbHkwhS2ltOydzsKcokv3Biq9/3TpBXy9YuDKBiDJed Sgp5ZdzlZT7jRljLpQf8uwP18qvJDQa144Hv64I10bwLkI8etjhhUMCrdZub3N9iNrls 8m8A== X-Gm-Message-State: AOJu0YzJS8Xkl1DkfPXVUpCIl2SmxemaT1s7WjLbqfLya2+cknI1vDEA 2DjuzSs5+y8jQ63iXvmqEdrgXirEtB5Hy+hSuIC3+aWV8AXQvTZmbvuuW1TquOBrWO49E7Zhx42 PgolxdhFKU6Y/fENmW4rpma7VITFmOSl7zI56zd7Eetmt1gCXuobaD4k6lCjYn9MRQr6OIFQD/R ZJXSNmDnVm8CgizA7Xmn6r0Ie/FNK4XD6KGpjyo2Ad X-Gm-Gg: ASbGncsqzAQy7fF/C0akjsJ+MbG6Dg726TaG7Nr634nqe3kNC6sxpuzc69A4bXnUZYg uFPTc0s4nbqaMQTeUCfO/VlvMMdCMVSiCG4aFLx7tB778MUvhcz1v1ZFZ0tddLsglwQeRc3Gmmd P/UOcdmroNz2R8HPz+cXLxGhQAMae4luJL8T2wy9LJYSBhRO9iZgKa5S6WNgRuodj9tB5n1uxVi TYPah9Kb9LGsuD4TuLPGOGOd2zIGoERnUbdUoGPAe+cVtOIQB0c+Jbk9l9nMBseIK9ll+AmzOGf YCbICYq2gRPwyArx2Ya43MuB X-Received: by 2002:a17:906:c110:b0:ad8:a935:b908 with SMTP id a640c23a62f3a-adb322ace09mr198482366b.30.1748592217962; Fri, 30 May 2025 01:03:37 -0700 (PDT) X-Google-Smtp-Source: AGHT+IEQGKio6NRXHsSIQTnkeXtmtHWiIdsWF3pF0J1K64iq//5rjyAERQNoX6NCZ32Oegrk6NwjPA== X-Received: by 2002:a17:906:c110:b0:ad8:a935:b908 with SMTP id a640c23a62f3a-adb322ace09mr198478966b.30.1748592217461; Fri, 30 May 2025 01:03:37 -0700 (PDT) From: Paolo Bonzini To: qemu-devel@nongnu.org Cc: qemu-rust@nongnu.org, Markus Armbruster , Zhao Liu Subject: [PATCH 11/14] hpet: return errors from realize if properties are incorrect Date: Fri, 30 May 2025 10:03:03 +0200 Message-ID: <20250530080307.2055502-12-pbonzini@redhat.com> X-Mailer: git-send-email 2.49.0 In-Reply-To: <20250530080307.2055502-1-pbonzini@redhat.com> References: <20250530080307.2055502-1-pbonzini@redhat.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable 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; Received-SPF: pass client-ip=170.10.129.124; envelope-from=pbonzini@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-Spam_score_int: -49 X-Spam_score: -5.0 X-Spam_bar: ----- X-Spam_report: (-5.0 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-2.902, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, RCVD_IN_MSPIKE_H5=0.001, RCVD_IN_MSPIKE_WL=0.001, RCVD_IN_VALIDITY_CERTIFIED_BLOCKED=0.001, RCVD_IN_VALIDITY_RPBL_BLOCKED=0.001, 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+importer=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @redhat.com) X-ZM-MESSAGEID: 1748592291783116600 Content-Type: text/plain; charset="utf-8" Do not silently adjust num_timers, and fail if intcap is 0. Reviewed-by: Markus Armbruster Reviewed-by: Zhao Liu Signed-off-by: Paolo Bonzini --- hw/timer/hpet.c | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) diff --git a/hw/timer/hpet.c b/hw/timer/hpet.c index 9db027cf76f..cb48cc151f1 100644 --- a/hw/timer/hpet.c +++ b/hw/timer/hpet.c @@ -691,8 +691,14 @@ static void hpet_realize(DeviceState *dev, Error **err= p) int i; HPETTimer *timer; =20 + if (s->num_timers < HPET_MIN_TIMERS || s->num_timers > HPET_MAX_TIMERS= ) { + error_setg(errp, "hpet.num_timers must be between %d and %d", + HPET_MIN_TIMERS, HPET_MAX_TIMERS); + return; + } if (!s->intcap) { - warn_report("Hpet's intcap not initialized"); + error_setg(errp, "hpet.hpet-intcap not initialized"); + return; } if (hpet_fw_cfg.count =3D=3D UINT8_MAX) { /* first instance */ @@ -700,7 +706,7 @@ static void hpet_realize(DeviceState *dev, Error **errp) } =20 if (hpet_fw_cfg.count =3D=3D 8) { - error_setg(errp, "Only 8 instances of HPET is allowed"); + error_setg(errp, "Only 8 instances of HPET are allowed"); return; } =20 @@ -710,11 +716,6 @@ static void hpet_realize(DeviceState *dev, Error **err= p) sysbus_init_irq(sbd, &s->irqs[i]); } =20 - if (s->num_timers < HPET_MIN_TIMERS) { - s->num_timers =3D HPET_MIN_TIMERS; - } else if (s->num_timers > HPET_MAX_TIMERS) { - s->num_timers =3D HPET_MAX_TIMERS; - } for (i =3D 0; i < HPET_MAX_TIMERS; i++) { timer =3D &s->timer[i]; timer->qemu_timer =3D timer_new_ns(QEMU_CLOCK_VIRTUAL, hpet_timer,= timer); --=20 2.49.0