From patchwork Tue Jun 16 05:46:05 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Peter Crosthwaite X-Patchwork-Id: 484793 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org 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 B6F001401F0 for ; Tue, 16 Jun 2015 15:46:56 +1000 (AEST) Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b=Yo6D+aCV; dkim-atps=neutral Received: from localhost ([::1]:37888 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Z4jhz-0005Sv-4t for incoming@patchwork.ozlabs.org; Tue, 16 Jun 2015 01:46:51 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:34170) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Z4jhZ-0004jv-6h for qemu-devel@nongnu.org; Tue, 16 Jun 2015 01:46:26 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1Z4jhV-0006cY-5m for qemu-devel@nongnu.org; Tue, 16 Jun 2015 01:46:25 -0400 Received: from mail-pa0-x236.google.com ([2607:f8b0:400e:c03::236]:36123) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Z4jhU-0006cS-UK for qemu-devel@nongnu.org; Tue, 16 Jun 2015 01:46:21 -0400 Received: by pabqy3 with SMTP id qy3so5735179pab.3 for ; Mon, 15 Jun 2015 22:46:20 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=from:to:cc:subject:date:message-id:in-reply-to:references :in-reply-to:references; bh=A1LAMe0v1ETVR9QTChbEV4VtZG5i6Oix6wGoNviBCEc=; b=Yo6D+aCV1wwAonUJgJyGgTpBiWABoFS0yr9QvBXjNBXCv0iY2ef1B5Q+NXoZ/wc5B2 4AJgobSUmy0C9VmOMdsac7xFrUUyH/MHNDn4alHrIKmcOYDPFSWhoHR9OQHcpAo2Z1ov FKYx7zfJZHTconFcPTrPvwqMJTyacr6+ZBW6eriikiqnWQaWJuw4HBDUpTL/p4tfAvUY W9obqZKMhLehor41YpsUFOQgaM0IjLI4NfFZZ1m8Q39k4qq4Vg6ZmoTc5uksJVNg0sKw SyvUaUcv1uCzXuNbMcgdAEI5SPGWDvtr76JYwcoqO0oEuA7J2A1eZS4W0Y3p+mgaKMvy OmWg== X-Received: by 10.70.118.5 with SMTP id ki5mr55798505pdb.6.1434433580215; Mon, 15 Jun 2015 22:46:20 -0700 (PDT) Received: from pcrost-laptop.hsd1.ca.comcast.net (c-73-15-58-35.hsd1.ca.comcast.net. [73.15.58.35]) by mx.google.com with ESMTPSA id ng13sm14067588pdb.82.2015.06.15.22.46.17 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Mon, 15 Jun 2015 22:46:18 -0700 (PDT) From: Peter Crosthwaite X-Google-Original-From: Peter Crosthwaite To: qemu-devel@nongnu.org Date: Mon, 15 Jun 2015 22:46:05 -0700 Message-Id: X-Mailer: git-send-email 1.9.1 In-Reply-To: References: In-Reply-To: References: X-detected-operating-system: by eggs.gnu.org: Error: Malformed IPv6 address (bad octet value). X-Received-From: 2607:f8b0:400e:c03::236 Cc: peter.maydell@linaro.org, Peter Crosthwaite , afaerber@suse.de, edgar.iglesias@gmail.com Subject: [Qemu-devel] [PATCH v2 1/4] qom: cpu: Add wrapper to the set-pc hook X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Add a wrapper around the CPUClass::set_pc hook. Accepts an error pointer to report the case where the hook is not set. Signed-off-by: Peter Crosthwaite --- include/qom/cpu.h | 21 +++++++++++++++++++++ 1 file changed, 21 insertions(+) diff --git a/include/qom/cpu.h b/include/qom/cpu.h index 7db310e..97d4edf 100644 --- a/include/qom/cpu.h +++ b/include/qom/cpu.h @@ -600,6 +600,27 @@ static inline void cpu_unaligned_access(CPUState *cpu, vaddr addr, #endif /** + * cpu_set_pc: + * @cpu: The CPU to set the program counter for. + * @addr: Program counter value. + * @errp: Error pointer to populate in case of error. + * + * Set the program counter for a CPU. If there is no available implementation + * an error is raised. + */ + +static inline void cpu_set_pc(CPUState *cpu, vaddr addr, Error **errp) +{ + CPUClass *cc = CPU_GET_CLASS(cpu); + + if (cc->set_pc) { + cc->set_pc(cpu, addr); + } else { + error_setg(errp, "CPU does not implement set PC"); + } +} + +/** * cpu_reset_interrupt: * @cpu: The CPU to clear the interrupt on. * @mask: The interrupt mask to clear.