From nobody Mon Feb 9 06:49:19 2026 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) client-ip=208.118.235.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zoho.com; spf=pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; Return-Path: Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) by mx.zohomail.com with SMTPS id 1489508694784861.5291197718582; Tue, 14 Mar 2017 09:24:54 -0700 (PDT) Received: from localhost ([::1]:60584 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1cnpFk-0008G0-4A for importer@patchew.org; Tue, 14 Mar 2017 12:24:52 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:36626) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1cnp9c-0003RF-QS for qemu-devel@nongnu.org; Tue, 14 Mar 2017 12:18:33 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1cnp9b-0006as-UA for qemu-devel@nongnu.org; Tue, 14 Mar 2017 12:18:32 -0400 Received: from mail-wm0-x242.google.com ([2a00:1450:400c:c09::242]:36130) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1cnp9b-0006Zp-Nx for qemu-devel@nongnu.org; Tue, 14 Mar 2017 12:18:31 -0400 Received: by mail-wm0-x242.google.com with SMTP id v190so583018wme.3 for ; Tue, 14 Mar 2017 09:18:31 -0700 (PDT) Received: from 640k.lan (94-39-132-181.adsl-ull.clienti.tiscali.it. [94.39.132.181]) by smtp.gmail.com with ESMTPSA id k195sm408197wmd.7.2017.03.14.09.18.29 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 14 Mar 2017 09:18:29 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references; bh=BtzzJncUfGBJ06quNs0C9Jbyj2g16+0dD7H9es1iXUI=; b=E/hUX7DYW7I2ue8KgnJ4ZLwqkJ7tGJlM9/Jp1XtxLUFRRugEgmxaVTinQSQ5/k5UpX OT0aPj6AFaz3SkA43HkLeg7PSvAnlFZgJK1Z0mgxLwcQX4a/9duhxYCzCj4iWASpR4ui n+4JEeqPVWEnZALpsmICnKoFj7B1SR9KYLdbfLUbxCbdAUnYC3CjZyJUBTS2vBDMgDjk TgoXuwz11pguAiFEXLqC7Aoe/1F6x3G6fxCzOJPXfZuNEi2tfxg5Mb8yVX8tIo5FDfAV /3K6btLw5awmom/kmG8UE6hVxGk9JKuYOPjQ4TghAtoi5uNdZ+WfJy4Oa4drzq3FeVlk N3jQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :in-reply-to:references; bh=BtzzJncUfGBJ06quNs0C9Jbyj2g16+0dD7H9es1iXUI=; b=W+gUUdaRJlIqAudlPgEXpYLyopBJwx/7K4AnZXrHAXXFRjv2mm0C5jvPimdR6viUx7 W686IP72g0ahoIvizynN8iB0gT11DDswZnYa6iLFIz68AfsNoMVu4h/vfJJMsksi2jCp Y6AMiHq818Dj+kKVKfR9x/+KpxOmredNTKxZ4kDiKbOkgfQyWyHVDJnF7m9h/o6Yt47C G8y9g4R27kJh5UBPKE2pNYYEj09ixF70LReKFxSErMhV02PyUIfFjqaawA7rc+YyA/rx PTmuXfbFQkH+v1Wg6nG5dAW2I1DM1RXuZtnRCYRixLYiyNwSfNGLkNE0jrhrN067XNid sIVg== X-Gm-Message-State: AFeK/H38u+s+Q01O8fUhIWtUYzbKCCyLvd7yhtmbBsnlWIGOc0QU8qObDRP6YxrndnWEJA== X-Received: by 10.28.51.140 with SMTP id z134mr538989wmz.55.1489508310594; Tue, 14 Mar 2017 09:18:30 -0700 (PDT) From: Paolo Bonzini To: qemu-devel@nongnu.org Date: Tue, 14 Mar 2017 17:18:08 +0100 Message-Id: <1489508300-48184-7-git-send-email-pbonzini@redhat.com> X-Mailer: git-send-email 1.8.3.1 In-Reply-To: <1489508300-48184-1-git-send-email-pbonzini@redhat.com> References: <1489508300-48184-1-git-send-email-pbonzini@redhat.com> X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 2a00:1450:400c:c09::242 Subject: [Qemu-devel] [PULL 06/18] kvmclock: Don't crash QEMU if KVM is disabled X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Eduardo Habkost Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail: RSF_0 Z_629925259 SPT_0 Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" From: Eduardo Habkost Most machines don't allow sysbus devices like "kvmclock" to be created from the command-line, but some of them do (the ones with has_dynamic_sysbus=3Dtrue). In those cases, it's possible to manually create a kvmclock device without KVM being enabled, making QEMU crash: $ qemu-system-x86_64 -machine q35,accel=3Dtcg -device kvmclock Segmentation fault (core dumped) This changes kvmclock's realize method to return an error if KVM is disabled, to ensure it won't crash QEMU. Signed-off-by: Eduardo Habkost Message-Id: <20170309185046.17555-1-ehabkost@redhat.com> Signed-off-by: Paolo Bonzini --- hw/i386/kvm/clock.c | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/hw/i386/kvm/clock.c b/hw/i386/kvm/clock.c index ef9d560..13eca37 100644 --- a/hw/i386/kvm/clock.c +++ b/hw/i386/kvm/clock.c @@ -22,6 +22,7 @@ #include "kvm_i386.h" #include "hw/sysbus.h" #include "hw/kvm/clock.h" +#include "qapi/error.h" =20 #include #include @@ -208,6 +209,11 @@ static void kvmclock_realize(DeviceState *dev, Error *= *errp) { KVMClockState *s =3D KVM_CLOCK(dev); =20 + if (!kvm_enabled()) { + error_setg(errp, "kvmclock device requires KVM"); + return; + } + kvm_update_clock(s); =20 qemu_add_vm_change_state_handler(kvmclock_vm_state_change, s); --=20 1.8.3.1