From mboxrd@z Thu Jan 1 00:00:00 1970 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) From: Peter Crosthwaite Date: Mon, 15 Jun 2015 22:46:05 -0700 Message-Id: In-Reply-To: References: In-Reply-To: References: Subject: [Qemu-devel] [PATCH v2 1/4] qom: cpu: Add wrapper to the set-pc hook List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: peter.maydell@linaro.org, Peter Crosthwaite , afaerber@suse.de, edgar.iglesias@gmail.com 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. -- 1.9.1