From patchwork Tue Oct 3 13:45:36 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Paolo Bonzini X-Patchwork-Id: 820886 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (mailfrom) smtp.mailfrom=nongnu.org (client-ip=2001:4830:134:3::11; helo=lists.gnu.org; envelope-from=qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org; receiver=) Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="hlmWaMsR"; dkim-atps=neutral Received: from lists.gnu.org (lists.gnu.org [IPv6:2001:4830:134:3::11]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 3y60hK0VFdz9t2Z for ; Wed, 4 Oct 2017 00:47:13 +1100 (AEDT) Received: from localhost ([::1]:58656 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1dzNXT-00024f-5w for incoming@patchwork.ozlabs.org; Tue, 03 Oct 2017 09:47:11 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:40117) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1dzNWd-0001zO-TA for qemu-devel@nongnu.org; Tue, 03 Oct 2017 09:46:25 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1dzNWc-00047w-W7 for qemu-devel@nongnu.org; Tue, 03 Oct 2017 09:46:19 -0400 Received: from mail-wr0-x242.google.com ([2a00:1450:400c:c0c::242]:35667) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1dzNWc-00047S-Oe for qemu-devel@nongnu.org; Tue, 03 Oct 2017 09:46:18 -0400 Received: by mail-wr0-x242.google.com with SMTP id y44so836440wry.2 for ; Tue, 03 Oct 2017 06:46:18 -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=RyFWSX8tsny0Vy03DcxhJIZVBarcsYRPYBofEi7+brU=; b=hlmWaMsR7U/P8I/Cc6JlIbaKbtYjy2IUvbnze76ABh5iSItOflGbAawxSQxDW4Ify4 o+2AghYs4p7p6sJIKl9XC7l2Vxgd37PkhkjbiLni7o/GicrXZJ3+En+pmUv2mpEGohTb ZfDFipyjMyI7RNYRBECZafxrozgPlDI93j1LmlKoQbqr7IegWNd1YFHSMkMtcst/39PX AyBqHC9lVfirEvJPLh2Oy69tt8Hw7qR/kQeHcqBWlb/ZBSiwNq6TYQQ7AeryatS2fHm0 uaFH0bZzzP424+T0qctYFkcZL9KXgmmy3f9lnvWrdluFjSKQUYL7VmdapY5OIV6I4CpP ZviA== 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=RyFWSX8tsny0Vy03DcxhJIZVBarcsYRPYBofEi7+brU=; b=BNbb+uhZGCZe1h4viPO6DQw9zh293lN/IMoAFeycGukpXWxK+I/Vu5JXEQT9PmJ5zj Mgoixp0DvcrSEbPcRys+G67tBxuVxQDXRDqRky3LdaWO3GFIQ3R9GygCkfGOxzQQ+NRu WCgxLRVNltgMPeWCmoazo3U46Ho+wAVTknRmAD2n5ljPfqsk6VHGChHuPkAn3sg5f7oX kQoEsQtnQMktZ239MxHNhICEF+LnJSNbpLz2nRRSdy9S+Jtou1/R4TkQH4MraJPQSkGZ sJoZIuDGur4PBFSBgQnrnqIuj4UwkcaYMALY5dfXbc+NOE/CE5boPdjMMICdFQe5fERc HWGw== X-Gm-Message-State: AMCzsaWJTNeVnKQu5HBp9aT7/ZwNMS8kP3EDVC3bnMYerU4zP06oHHXn 2KlBCNC7cXjPIfzuK685jKkxex7K X-Google-Smtp-Source: AOwi7QBuZbKVbRaJRAGEVcs+NbO+LNzG4HuoevvNOz3QlOY7vX/ZnJLm6Zc4Ms9k8xTGUdfj5f988w== X-Received: by 10.223.193.66 with SMTP id w2mr6649606wre.163.1507038377580; Tue, 03 Oct 2017 06:46:17 -0700 (PDT) Received: from donizetti.lan (dynamic-adsl-78-12-246-117.clienti.tiscali.it. [78.12.246.117]) by smtp.gmail.com with ESMTPSA id u52sm21724267wrb.23.2017.10.03.06.46.16 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Tue, 03 Oct 2017 06:46:16 -0700 (PDT) From: Paolo Bonzini To: qemu-devel@nongnu.org Date: Tue, 3 Oct 2017 15:45:36 +0200 Message-Id: <20171003134540.21625-7-pbonzini@redhat.com> X-Mailer: git-send-email 2.13.6 In-Reply-To: <20171003134540.21625-1-pbonzini@redhat.com> References: <20171003134540.21625-1-pbonzini@redhat.com> X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2a00:1450:400c:c0c::242 Subject: [Qemu-devel] [PATCH 06/10] i386: hvf: abort on decoding error 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: sergio.g.delreal@gmail.com, agraf@suse.de, alex@alex.org.uk Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: "Qemu-devel" Rather than unsupported situations, some VM_PANIC calls actually are caused by internal errors. Convert them to just abort. Signed-off-by: Paolo Bonzini --- target/i386/hvf/hvf.c | 2 +- target/i386/hvf/x86_emu.c | 10 ++++------ 2 files changed, 5 insertions(+), 7 deletions(-) diff --git a/target/i386/hvf/hvf.c b/target/i386/hvf/hvf.c index ae3ecad2a4..f2dc37d826 100644 --- a/target/i386/hvf/hvf.c +++ b/target/i386/hvf/hvf.c @@ -767,7 +767,7 @@ int hvf_vcpu_exec(CPUState *cpu) env->hvf_emul->fetch_rip = rip; decode_instruction(env, &decode); - VM_PANIC_ON(ins_len != decode.len); + assert(ins_len == decode.len); exec_instruction(env, &decode); store_regs(cpu); diff --git a/target/i386/hvf/x86_emu.c b/target/i386/hvf/x86_emu.c index 3a995fe687..63c2b5a54d 100644 --- a/target/i386/hvf/x86_emu.c +++ b/target/i386/hvf/x86_emu.c @@ -146,7 +146,7 @@ addr_t read_reg(CPUX86State *env, int reg, int size) case 8: return env->hvf_emul->regs[reg].rrx; default: - VM_PANIC_ON("read_reg size"); + abort(); } return 0; } @@ -167,7 +167,7 @@ void write_reg(CPUX86State *env, int reg, addr_t val, int size) env->hvf_emul->regs[reg].rrx = val; break; default: - VM_PANIC_ON("write_reg size"); + abort(); } } @@ -189,8 +189,7 @@ addr_t read_val_from_reg(addr_t reg_ptr, int size) val = *(uint64_t *)reg_ptr; break; default: - VM_PANIC_ON_EX(1, "read_val: Unknown size %d\n", size); - break; + abort(); } return val; } @@ -211,8 +210,7 @@ void write_val_to_reg(addr_t reg_ptr, addr_t val, int size) *(uint64_t *)reg_ptr = val; break; default: - VM_PANIC("write_val: Unknown size\n"); - break; + abort(); } }