From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([209.51.188.92]:47646) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1hCOeN-0002WV-5r for qemu-devel@nongnu.org; Fri, 05 Apr 2019 09:12:56 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1hCOeL-00082s-5z for qemu-devel@nongnu.org; Fri, 05 Apr 2019 09:12:55 -0400 From: "Murilo Opsfelder =?utf-8?Q?Ara=C3=BAjo?=" In-Reply-To: <155445152490.302073.17033451726459859333.stgit@bahia.lan> References: <155445151931.302073.18436485925081597460.stgit@bahia.lan> <155445152490.302073.17033451726459859333.stgit@bahia.lan> Date: Fri, 05 Apr 2019 10:12:42 -0300 Message-ID: <87tvfc8uk5.fsf@kermit.br.ibm.com> MIME-Version: 1.0 Content-Type: text/plain Subject: Re: [Qemu-devel] [PATCH 2/2] target/ppc/kvm: Convert DPRINTF to traces List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: Greg Kurz , qemu-devel@nongnu.org Cc: Aravinda Prasad , qemu-ppc@nongnu.org, David Gibson Hi, Greg. Greg Kurz writes: > Signed-off-by: Greg Kurz > --- > target/ppc/kvm.c | 68 +++++++++++++++++++---------------------------- > target/ppc/trace-events | 25 +++++++++++++++++ > 2 files changed, 52 insertions(+), 41 deletions(-) > > diff --git a/target/ppc/kvm.c b/target/ppc/kvm.c > index 2427c8ee13ae..3a11d2e1060c 100644 > --- a/target/ppc/kvm.c > +++ b/target/ppc/kvm.c > @@ -49,16 +49,6 @@ > #include "elf.h" > #include "sysemu/kvm_int.h" > > -//#define DEBUG_KVM > - > -#ifdef DEBUG_KVM > -#define DPRINTF(fmt, ...) \ > - do { fprintf(stderr, fmt, ## __VA_ARGS__); } while (0) > -#else > -#define DPRINTF(fmt, ...) \ > - do { } while (0) > -#endif > - > #define PROC_DEVTREE_CPU "/proc/device-tree/cpus/" > > const KVMCapabilityInfo kvm_arch_required_capabilities[] = { > @@ -626,7 +616,7 @@ static int kvm_put_fp(CPUState *cs) > reg.addr = (uintptr_t)&fpscr; > ret = kvm_vcpu_ioctl(cs, KVM_SET_ONE_REG, ®); > if (ret < 0) { > - DPRINTF("Unable to set FPSCR to KVM: %s\n", strerror(errno)); > + trace_kvm_failed_fpscr_set(strerror(errno)); > return ret; > } > > @@ -647,8 +637,8 @@ static int kvm_put_fp(CPUState *cs) > > ret = kvm_vcpu_ioctl(cs, KVM_SET_ONE_REG, ®); > if (ret < 0) { > - DPRINTF("Unable to set %s%d to KVM: %s\n", vsx ? "VSR" : "FPR", > - i, strerror(errno)); > + trace_kvm_failed_fp_set(vsx ? "VSR" : "FPR", i, > + strerror(errno)); > return ret; > } > } > @@ -659,7 +649,7 @@ static int kvm_put_fp(CPUState *cs) > reg.addr = (uintptr_t)&env->vscr; > ret = kvm_vcpu_ioctl(cs, KVM_SET_ONE_REG, ®); > if (ret < 0) { > - DPRINTF("Unable to set VSCR to KVM: %s\n", strerror(errno)); > + trace_kvm_failed_vscr_set(strerror(errno)); > return ret; > } > > @@ -668,7 +658,7 @@ static int kvm_put_fp(CPUState *cs) > reg.addr = (uintptr_t)cpu_avr_ptr(env, i); > ret = kvm_vcpu_ioctl(cs, KVM_SET_ONE_REG, ®); > if (ret < 0) { > - DPRINTF("Unable to set VR%d to KVM: %s\n", i, strerror(errno)); > + trace_kvm_failed_vr_set(i, strerror(errno)); > return ret; > } > } > @@ -693,7 +683,7 @@ static int kvm_get_fp(CPUState *cs) > reg.addr = (uintptr_t)&fpscr; > ret = kvm_vcpu_ioctl(cs, KVM_GET_ONE_REG, ®); > if (ret < 0) { > - DPRINTF("Unable to get FPSCR from KVM: %s\n", strerror(errno)); > + trace_kvm_failed_fpscr_get(strerror(errno)); > return ret; > } else { > env->fpscr = fpscr; > @@ -709,8 +699,8 @@ static int kvm_get_fp(CPUState *cs) > > ret = kvm_vcpu_ioctl(cs, KVM_GET_ONE_REG, ®); > if (ret < 0) { > - DPRINTF("Unable to get %s%d from KVM: %s\n", > - vsx ? "VSR" : "FPR", i, strerror(errno)); > + trace_kvm_failed_fp_get(vsx ? "VSR" : "FPR", i, > + strerror(errno)); > return ret; > } else { > #ifdef HOST_WORDS_BIGENDIAN > @@ -733,7 +723,7 @@ static int kvm_get_fp(CPUState *cs) > reg.addr = (uintptr_t)&env->vscr; > ret = kvm_vcpu_ioctl(cs, KVM_GET_ONE_REG, ®); > if (ret < 0) { > - DPRINTF("Unable to get VSCR from KVM: %s\n", strerror(errno)); > + trace_kvm_failed_vscr_get(strerror(errno)); > return ret; > } > > @@ -742,8 +732,7 @@ static int kvm_get_fp(CPUState *cs) > reg.addr = (uintptr_t)cpu_avr_ptr(env, i); > ret = kvm_vcpu_ioctl(cs, KVM_GET_ONE_REG, ®); > if (ret < 0) { > - DPRINTF("Unable to get VR%d from KVM: %s\n", > - i, strerror(errno)); > + trace_kvm_failed_vr_get(i, strerror(errno)); > return ret; > } > } > @@ -764,7 +753,7 @@ static int kvm_get_vpa(CPUState *cs) > reg.addr = (uintptr_t)&spapr_cpu->vpa_addr; > ret = kvm_vcpu_ioctl(cs, KVM_GET_ONE_REG, ®); > if (ret < 0) { > - DPRINTF("Unable to get VPA address from KVM: %s\n", strerror(errno)); > + trace_kvm_failed_vpa_addr_get(strerror(errno)); > return ret; > } > > @@ -774,8 +763,7 @@ static int kvm_get_vpa(CPUState *cs) > reg.addr = (uintptr_t)&spapr_cpu->slb_shadow_addr; > ret = kvm_vcpu_ioctl(cs, KVM_GET_ONE_REG, ®); > if (ret < 0) { > - DPRINTF("Unable to get SLB shadow state from KVM: %s\n", > - strerror(errno)); > + trace_kvm_failed_slb_get(strerror(errno)); > return ret; > } > > @@ -785,8 +773,7 @@ static int kvm_get_vpa(CPUState *cs) > reg.addr = (uintptr_t)&spapr_cpu->dtl_addr; > ret = kvm_vcpu_ioctl(cs, KVM_GET_ONE_REG, ®); > if (ret < 0) { > - DPRINTF("Unable to get dispatch trace log state from KVM: %s\n", > - strerror(errno)); > + trace_kvm_failed_dtl_get(strerror(errno)); > return ret; > } > > @@ -812,7 +799,7 @@ static int kvm_put_vpa(CPUState *cs) > reg.addr = (uintptr_t)&spapr_cpu->vpa_addr; > ret = kvm_vcpu_ioctl(cs, KVM_SET_ONE_REG, ®); > if (ret < 0) { > - DPRINTF("Unable to set VPA address to KVM: %s\n", strerror(errno)); > + trace_kvm_failed_vpa_addr_set(strerror(errno)); > return ret; > } > } > @@ -823,7 +810,7 @@ static int kvm_put_vpa(CPUState *cs) > reg.addr = (uintptr_t)&spapr_cpu->slb_shadow_addr; > ret = kvm_vcpu_ioctl(cs, KVM_SET_ONE_REG, ®); > if (ret < 0) { > - DPRINTF("Unable to set SLB shadow state to KVM: %s\n", strerror(errno)); > + trace_kvm_failed_slb_set(strerror(errno)); > return ret; > } > > @@ -833,8 +820,7 @@ static int kvm_put_vpa(CPUState *cs) > reg.addr = (uintptr_t)&spapr_cpu->dtl_addr; > ret = kvm_vcpu_ioctl(cs, KVM_SET_ONE_REG, ®); > if (ret < 0) { > - DPRINTF("Unable to set dispatch trace log state to KVM: %s\n", > - strerror(errno)); > + trace_kvm_failed_dtl_set(strerror(errno)); > return ret; > } > > @@ -843,7 +829,7 @@ static int kvm_put_vpa(CPUState *cs) > reg.addr = (uintptr_t)&spapr_cpu->vpa_addr; > ret = kvm_vcpu_ioctl(cs, KVM_SET_ONE_REG, ®); > if (ret < 0) { > - DPRINTF("Unable to set VPA address to KVM: %s\n", strerror(errno)); > + trace_kvm_failed_null_vpa_addr_set(strerror(errno)); > return ret; > } > } > @@ -996,7 +982,7 @@ int kvm_arch_put_registers(CPUState *cs, int level) > > if (cap_papr) { > if (kvm_put_vpa(cs) < 0) { > - DPRINTF("Warning: Unable to set VPA information to KVM\n"); > + trace_kvm_failed_put_vpa(); > } > } > > @@ -1296,7 +1282,7 @@ int kvm_arch_get_registers(CPUState *cs) > > if (cap_papr) { > if (kvm_get_vpa(cs) < 0) { > - DPRINTF("Warning: Unable to get VPA information from KVM\n"); > + trace_kvm_failed_get_vpa(); > } > } > > @@ -1352,7 +1338,7 @@ void kvm_arch_pre_run(CPUState *cs, struct kvm_run *run) > */ > irq = KVM_INTERRUPT_SET; > > - DPRINTF("injected interrupt %d\n", irq); > + trace_kvm_injected_interrupt(irq); > r = kvm_vcpu_ioctl(cs, KVM_INTERRUPT, &irq); > if (r < 0) { > printf("cpu %d fail inject %x\n", cs->cpu_index, irq); > @@ -1697,20 +1683,20 @@ int kvm_arch_handle_exit(CPUState *cs, struct kvm_run *run) > switch (run->exit_reason) { > case KVM_EXIT_DCR: > if (run->dcr.is_write) { > - DPRINTF("handle dcr write\n"); > + trace_kvm_handle_dcr_write(); > ret = kvmppc_handle_dcr_write(env, run->dcr.dcrn, run->dcr.data); > } else { > - DPRINTF("handle dcr read\n"); > + trace_kvm_handle_drc_read(); > ret = kvmppc_handle_dcr_read(env, run->dcr.dcrn, &run->dcr.data); > } > break; > case KVM_EXIT_HLT: > - DPRINTF("handle halt\n"); > + trace_kvm_handle_halt(); > ret = kvmppc_handle_halt(cpu); > break; > #if defined(TARGET_PPC64) > case KVM_EXIT_PAPR_HCALL: > - DPRINTF("handle PAPR hypercall\n"); > + trace_kvm_handle_papr_hcall(); > run->papr_hcall.ret = spapr_hypercall(cpu, > run->papr_hcall.nr, > run->papr_hcall.args); > @@ -1718,18 +1704,18 @@ int kvm_arch_handle_exit(CPUState *cs, struct kvm_run *run) > break; > #endif > case KVM_EXIT_EPR: > - DPRINTF("handle epr\n"); > + trace_kvm_handle_epr(); > run->epr.epr = ldl_phys(cs->as, env->mpic_iack); > ret = 0; > break; > case KVM_EXIT_WATCHDOG: > - DPRINTF("handle watchdog expiry\n"); > + trace_kvm_handle_watchdog_expiry(); > watchdog_perform_action(); > ret = 0; > break; > > case KVM_EXIT_DEBUG: > - DPRINTF("handle debug exception\n"); > + trace_kvm_handle_debug_exception(); > if (kvm_handle_debug(cpu, run)) { > ret = EXCP_DEBUG; > break; > diff --git a/target/ppc/trace-events b/target/ppc/trace-events > index ed4d57c6d9c1..7b3cfe11fdfe 100644 > --- a/target/ppc/trace-events > +++ b/target/ppc/trace-events > @@ -3,3 +3,28 @@ > # kvm.c > kvm_failed_spr_set(int spr, const char *msg) "Warning: Unable to set SPR %d to KVM: %s" > kvm_failed_spr_get(int spr, const char *msg) "Warning: Unable to retrieve SPR %d from KVM: %s" > +kvm_failed_fpscr_set(const char *msg) "Unable to set FPSCR to KVM: %s" > +kvm_failed_fp_set(const char *fpname, int fpnum, const char *msg) "Unable to set %s%d to KVM: %s" > +kvm_failed_vscr_set(const char *msg) "Unable to set VSCR to KVM: %s" > +kvm_failed_vr_set(int vr, const char *msg) "Unable to set VR%d to KVM: %s" > +kvm_failed_fpscr_get(const char *msg) "Unable to get FPSCR from KVM: %s" > +kvm_failed_fp_get(const char *fpname, int fpnum, const char *msg) "Unable to get %s%d from KVM: %s" > +kvm_failed_vscr_get(const char *msg) "Unable to get VSCR from KVM: %s" > +kvm_failed_vr_get(int vr, const char *msg) "Unable to get VR%d from KVM: %s" > +kvm_failed_vpa_addr_get(const char *msg) "Unable to get VPA address from KVM: %s" > +kvm_failed_slb_get(const char *msg) "Unable to get SLB shadow state from KVM: %s" > +kvm_failed_dtl_get(const char *msg) "Unable to get dispatch trace log state from KVM: %s" > +kvm_failed_vpa_addr_set(const char *msg) "Unable to set VPA address to KVM: %s" > +kvm_failed_slb_set(const char *msg) "Unable to set SLB shadow state to KVM: %s" > +kvm_failed_dtl_set(const char *msg) "Unable to set dispatch trace log state to KVM: %s" > +kvm_failed_null_vpa_addr_set(const char *msg) "Unable to set VPA address to KVM: %s" > +kvm_failed_put_vpa(void) "Warning: Unable to set VPA information to KVM" > +kvm_failed_get_vpa(void) "Warning: Unable to get VPA information from KVM" Some messages have "Warning:" and some don't. Since these traces indicate some kind of failure, do you think adding the warning prefix would be welcome? Having it also facilitates when searching logs. Murilo > +kvm_injected_interrupt(int irq) "injected interrupt %d" > +kvm_handle_dcr_write(void) "handle dcr write" > +kvm_handle_drc_read(void) "handle dcr read" > +kvm_handle_halt(void) "handle halt" > +kvm_handle_papr_hcall(void) "handle PAPR hypercall" > +kvm_handle_epr(void) "handle epr" > +kvm_handle_watchdog_expiry(void) "handle watchdog expiry" > +kvm_handle_debug_exception(void) "handle debug exception" From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-6.5 required=3.0 tests=DKIM_ADSP_CUSTOM_MED, DKIM_INVALID,DKIM_SIGNED,FREEMAIL_FORGED_FROMDOMAIN,FREEMAIL_FROM, HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY, SPF_PASS autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 11069C4360F for ; Fri, 5 Apr 2019 13:13:48 +0000 (UTC) Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id BDF5121850 for ; Fri, 5 Apr 2019 13:13:47 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=fail reason="signature verification failed" (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="tnfG7k87" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org BDF5121850 Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=gmail.com Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Received: from localhost ([127.0.0.1]:41903 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1hCOfD-0002u7-0k for qemu-devel@archiver.kernel.org; Fri, 05 Apr 2019 09:13:47 -0400 Received: from eggs.gnu.org ([209.51.188.92]:47646) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1hCOeN-0002WV-5r for qemu-devel@nongnu.org; Fri, 05 Apr 2019 09:12:56 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1hCOeL-00082s-5z for qemu-devel@nongnu.org; Fri, 05 Apr 2019 09:12:55 -0400 Received: from mail-qt1-x841.google.com ([2607:f8b0:4864:20::841]:37323) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1hCOeJ-000809-AB; Fri, 05 Apr 2019 09:12:51 -0400 Received: by mail-qt1-x841.google.com with SMTP id z16so7278601qtn.4; Fri, 05 Apr 2019 06:12:48 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:cc:subject:in-reply-to:references:date:message-id :mime-version; bh=CbdIwHkOId0jPas2BbgqG5vcEY8mDwd6Fr7k2gal9A4=; b=tnfG7k87VEIv4ss6OPNKAV3lyQL3miKJrNRNRu2kNzSj4YwqPQV+Zh5Odrb3aKt5Vl 543bDP4pTLbXRKlf0Rz0wU5ucdrI9ZH93MRLwM/V4lyOsfTV7y/70fE9lqlooqaGUZf3 HR+aCSOo14jBi0L3Ob1hEBOKy9oYpjQrry/sc+7IQz4d5xB+k3euBmM7p71DDvlPubfA 91MTq5FxGrf80tXoS20MFBXGkbXaY5hrq1fHhe8KeaxemzEWe3KAI+a40+P5QCkgN+DW VxbM84U/AyzF52yInsnlHSXH9fuFneuLHH3NEvxAYwQ0CehEtJyX66hQdzG8Wpz7vmdc RAAw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:cc:subject:in-reply-to:references :date:message-id:mime-version; bh=CbdIwHkOId0jPas2BbgqG5vcEY8mDwd6Fr7k2gal9A4=; b=Xy/4bZNZ68W4khFOF3HHLD9sK+Avfgtu2D3U+fDut5NWQ60K/TFsAzK00SIha37Bzp LLo8wz+E2iCRp018YBpuVeZeCpk3/9CVy7MKVTAElYTUmRdXrPpygudVjBZgj9AeQVmj 0mVZsJfCpumIOE8Q6Kfe5XrAZGbkNJqoV8hu/ddymNWf/hVmKaGUBtGnZCxBVLgGoxeF sKfxXPbFVyGQf088hcSPjrX5dlYcIWu2hwAPUgpGp+es1TATtcfhLOaKIKzlC7+wlVR3 G8oc0daSjem83q75Zs1OjPOS+AE61HF0w02ZEBrrZ3McrFAU5u46o80VMOJ6CicuOhqt x41A== X-Gm-Message-State: APjAAAXJpXxljfBskGS/goIMX95cTWcPEPQYdP6Klh3BrMUpOxfxiFxO yd5J0CiWiTdlTrJVH1YHkd9xT/Wv X-Google-Smtp-Source: APXvYqyg7bPN5K17uYEnk2kWefNGnOURSUZ9Bot6ZumI4DeDt4QN9DVdtF9NkuXNP91XbVP3eU2/Xg== X-Received: by 2002:a0c:9dc1:: with SMTP id p1mr9641969qvf.60.1554469966990; Fri, 05 Apr 2019 06:12:46 -0700 (PDT) Received: from localhost ([2804:431:f724:d38b:768c:1ac5:c446:eadb]) by smtp.gmail.com with ESMTPSA id f20sm13711258qtk.14.2019.04.05.06.12.44 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Fri, 05 Apr 2019 06:12:45 -0700 (PDT) From: "Murilo Opsfelder =?utf-8?Q?Ara=C3=BAjo?=" X-Google-Original-From: Murilo Opsfelder =?utf-8?Q?Ara=C3=BAjo?= To: Greg Kurz , qemu-devel@nongnu.org In-Reply-To: <155445152490.302073.17033451726459859333.stgit@bahia.lan> References: <155445151931.302073.18436485925081597460.stgit@bahia.lan> <155445152490.302073.17033451726459859333.stgit@bahia.lan> Date: Fri, 05 Apr 2019 10:12:42 -0300 Message-ID: <87tvfc8uk5.fsf@kermit.br.ibm.com> MIME-Version: 1.0 Content-Type: text/plain; charset="UTF-8" X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2607:f8b0:4864:20::841 Subject: Re: [Qemu-devel] [PATCH 2/2] target/ppc/kvm: Convert DPRINTF to traces 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: , Aravinda Prasad , qemu-ppc@nongnu.org, David Gibson Errors-To: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Sender: "Qemu-devel" Message-ID: <20190405131242.7tXn29Rnk6-XCf8zt0bVHHaZLj1Rlo1jd8TBvAyPlEY@z> Hi, Greg. Greg Kurz writes: > Signed-off-by: Greg Kurz > --- > target/ppc/kvm.c | 68 +++++++++++++++++++---------------------------- > target/ppc/trace-events | 25 +++++++++++++++++ > 2 files changed, 52 insertions(+), 41 deletions(-) > > diff --git a/target/ppc/kvm.c b/target/ppc/kvm.c > index 2427c8ee13ae..3a11d2e1060c 100644 > --- a/target/ppc/kvm.c > +++ b/target/ppc/kvm.c > @@ -49,16 +49,6 @@ > #include "elf.h" > #include "sysemu/kvm_int.h" > > -//#define DEBUG_KVM > - > -#ifdef DEBUG_KVM > -#define DPRINTF(fmt, ...) \ > - do { fprintf(stderr, fmt, ## __VA_ARGS__); } while (0) > -#else > -#define DPRINTF(fmt, ...) \ > - do { } while (0) > -#endif > - > #define PROC_DEVTREE_CPU "/proc/device-tree/cpus/" > > const KVMCapabilityInfo kvm_arch_required_capabilities[] = { > @@ -626,7 +616,7 @@ static int kvm_put_fp(CPUState *cs) > reg.addr = (uintptr_t)&fpscr; > ret = kvm_vcpu_ioctl(cs, KVM_SET_ONE_REG, ®); > if (ret < 0) { > - DPRINTF("Unable to set FPSCR to KVM: %s\n", strerror(errno)); > + trace_kvm_failed_fpscr_set(strerror(errno)); > return ret; > } > > @@ -647,8 +637,8 @@ static int kvm_put_fp(CPUState *cs) > > ret = kvm_vcpu_ioctl(cs, KVM_SET_ONE_REG, ®); > if (ret < 0) { > - DPRINTF("Unable to set %s%d to KVM: %s\n", vsx ? "VSR" : "FPR", > - i, strerror(errno)); > + trace_kvm_failed_fp_set(vsx ? "VSR" : "FPR", i, > + strerror(errno)); > return ret; > } > } > @@ -659,7 +649,7 @@ static int kvm_put_fp(CPUState *cs) > reg.addr = (uintptr_t)&env->vscr; > ret = kvm_vcpu_ioctl(cs, KVM_SET_ONE_REG, ®); > if (ret < 0) { > - DPRINTF("Unable to set VSCR to KVM: %s\n", strerror(errno)); > + trace_kvm_failed_vscr_set(strerror(errno)); > return ret; > } > > @@ -668,7 +658,7 @@ static int kvm_put_fp(CPUState *cs) > reg.addr = (uintptr_t)cpu_avr_ptr(env, i); > ret = kvm_vcpu_ioctl(cs, KVM_SET_ONE_REG, ®); > if (ret < 0) { > - DPRINTF("Unable to set VR%d to KVM: %s\n", i, strerror(errno)); > + trace_kvm_failed_vr_set(i, strerror(errno)); > return ret; > } > } > @@ -693,7 +683,7 @@ static int kvm_get_fp(CPUState *cs) > reg.addr = (uintptr_t)&fpscr; > ret = kvm_vcpu_ioctl(cs, KVM_GET_ONE_REG, ®); > if (ret < 0) { > - DPRINTF("Unable to get FPSCR from KVM: %s\n", strerror(errno)); > + trace_kvm_failed_fpscr_get(strerror(errno)); > return ret; > } else { > env->fpscr = fpscr; > @@ -709,8 +699,8 @@ static int kvm_get_fp(CPUState *cs) > > ret = kvm_vcpu_ioctl(cs, KVM_GET_ONE_REG, ®); > if (ret < 0) { > - DPRINTF("Unable to get %s%d from KVM: %s\n", > - vsx ? "VSR" : "FPR", i, strerror(errno)); > + trace_kvm_failed_fp_get(vsx ? "VSR" : "FPR", i, > + strerror(errno)); > return ret; > } else { > #ifdef HOST_WORDS_BIGENDIAN > @@ -733,7 +723,7 @@ static int kvm_get_fp(CPUState *cs) > reg.addr = (uintptr_t)&env->vscr; > ret = kvm_vcpu_ioctl(cs, KVM_GET_ONE_REG, ®); > if (ret < 0) { > - DPRINTF("Unable to get VSCR from KVM: %s\n", strerror(errno)); > + trace_kvm_failed_vscr_get(strerror(errno)); > return ret; > } > > @@ -742,8 +732,7 @@ static int kvm_get_fp(CPUState *cs) > reg.addr = (uintptr_t)cpu_avr_ptr(env, i); > ret = kvm_vcpu_ioctl(cs, KVM_GET_ONE_REG, ®); > if (ret < 0) { > - DPRINTF("Unable to get VR%d from KVM: %s\n", > - i, strerror(errno)); > + trace_kvm_failed_vr_get(i, strerror(errno)); > return ret; > } > } > @@ -764,7 +753,7 @@ static int kvm_get_vpa(CPUState *cs) > reg.addr = (uintptr_t)&spapr_cpu->vpa_addr; > ret = kvm_vcpu_ioctl(cs, KVM_GET_ONE_REG, ®); > if (ret < 0) { > - DPRINTF("Unable to get VPA address from KVM: %s\n", strerror(errno)); > + trace_kvm_failed_vpa_addr_get(strerror(errno)); > return ret; > } > > @@ -774,8 +763,7 @@ static int kvm_get_vpa(CPUState *cs) > reg.addr = (uintptr_t)&spapr_cpu->slb_shadow_addr; > ret = kvm_vcpu_ioctl(cs, KVM_GET_ONE_REG, ®); > if (ret < 0) { > - DPRINTF("Unable to get SLB shadow state from KVM: %s\n", > - strerror(errno)); > + trace_kvm_failed_slb_get(strerror(errno)); > return ret; > } > > @@ -785,8 +773,7 @@ static int kvm_get_vpa(CPUState *cs) > reg.addr = (uintptr_t)&spapr_cpu->dtl_addr; > ret = kvm_vcpu_ioctl(cs, KVM_GET_ONE_REG, ®); > if (ret < 0) { > - DPRINTF("Unable to get dispatch trace log state from KVM: %s\n", > - strerror(errno)); > + trace_kvm_failed_dtl_get(strerror(errno)); > return ret; > } > > @@ -812,7 +799,7 @@ static int kvm_put_vpa(CPUState *cs) > reg.addr = (uintptr_t)&spapr_cpu->vpa_addr; > ret = kvm_vcpu_ioctl(cs, KVM_SET_ONE_REG, ®); > if (ret < 0) { > - DPRINTF("Unable to set VPA address to KVM: %s\n", strerror(errno)); > + trace_kvm_failed_vpa_addr_set(strerror(errno)); > return ret; > } > } > @@ -823,7 +810,7 @@ static int kvm_put_vpa(CPUState *cs) > reg.addr = (uintptr_t)&spapr_cpu->slb_shadow_addr; > ret = kvm_vcpu_ioctl(cs, KVM_SET_ONE_REG, ®); > if (ret < 0) { > - DPRINTF("Unable to set SLB shadow state to KVM: %s\n", strerror(errno)); > + trace_kvm_failed_slb_set(strerror(errno)); > return ret; > } > > @@ -833,8 +820,7 @@ static int kvm_put_vpa(CPUState *cs) > reg.addr = (uintptr_t)&spapr_cpu->dtl_addr; > ret = kvm_vcpu_ioctl(cs, KVM_SET_ONE_REG, ®); > if (ret < 0) { > - DPRINTF("Unable to set dispatch trace log state to KVM: %s\n", > - strerror(errno)); > + trace_kvm_failed_dtl_set(strerror(errno)); > return ret; > } > > @@ -843,7 +829,7 @@ static int kvm_put_vpa(CPUState *cs) > reg.addr = (uintptr_t)&spapr_cpu->vpa_addr; > ret = kvm_vcpu_ioctl(cs, KVM_SET_ONE_REG, ®); > if (ret < 0) { > - DPRINTF("Unable to set VPA address to KVM: %s\n", strerror(errno)); > + trace_kvm_failed_null_vpa_addr_set(strerror(errno)); > return ret; > } > } > @@ -996,7 +982,7 @@ int kvm_arch_put_registers(CPUState *cs, int level) > > if (cap_papr) { > if (kvm_put_vpa(cs) < 0) { > - DPRINTF("Warning: Unable to set VPA information to KVM\n"); > + trace_kvm_failed_put_vpa(); > } > } > > @@ -1296,7 +1282,7 @@ int kvm_arch_get_registers(CPUState *cs) > > if (cap_papr) { > if (kvm_get_vpa(cs) < 0) { > - DPRINTF("Warning: Unable to get VPA information from KVM\n"); > + trace_kvm_failed_get_vpa(); > } > } > > @@ -1352,7 +1338,7 @@ void kvm_arch_pre_run(CPUState *cs, struct kvm_run *run) > */ > irq = KVM_INTERRUPT_SET; > > - DPRINTF("injected interrupt %d\n", irq); > + trace_kvm_injected_interrupt(irq); > r = kvm_vcpu_ioctl(cs, KVM_INTERRUPT, &irq); > if (r < 0) { > printf("cpu %d fail inject %x\n", cs->cpu_index, irq); > @@ -1697,20 +1683,20 @@ int kvm_arch_handle_exit(CPUState *cs, struct kvm_run *run) > switch (run->exit_reason) { > case KVM_EXIT_DCR: > if (run->dcr.is_write) { > - DPRINTF("handle dcr write\n"); > + trace_kvm_handle_dcr_write(); > ret = kvmppc_handle_dcr_write(env, run->dcr.dcrn, run->dcr.data); > } else { > - DPRINTF("handle dcr read\n"); > + trace_kvm_handle_drc_read(); > ret = kvmppc_handle_dcr_read(env, run->dcr.dcrn, &run->dcr.data); > } > break; > case KVM_EXIT_HLT: > - DPRINTF("handle halt\n"); > + trace_kvm_handle_halt(); > ret = kvmppc_handle_halt(cpu); > break; > #if defined(TARGET_PPC64) > case KVM_EXIT_PAPR_HCALL: > - DPRINTF("handle PAPR hypercall\n"); > + trace_kvm_handle_papr_hcall(); > run->papr_hcall.ret = spapr_hypercall(cpu, > run->papr_hcall.nr, > run->papr_hcall.args); > @@ -1718,18 +1704,18 @@ int kvm_arch_handle_exit(CPUState *cs, struct kvm_run *run) > break; > #endif > case KVM_EXIT_EPR: > - DPRINTF("handle epr\n"); > + trace_kvm_handle_epr(); > run->epr.epr = ldl_phys(cs->as, env->mpic_iack); > ret = 0; > break; > case KVM_EXIT_WATCHDOG: > - DPRINTF("handle watchdog expiry\n"); > + trace_kvm_handle_watchdog_expiry(); > watchdog_perform_action(); > ret = 0; > break; > > case KVM_EXIT_DEBUG: > - DPRINTF("handle debug exception\n"); > + trace_kvm_handle_debug_exception(); > if (kvm_handle_debug(cpu, run)) { > ret = EXCP_DEBUG; > break; > diff --git a/target/ppc/trace-events b/target/ppc/trace-events > index ed4d57c6d9c1..7b3cfe11fdfe 100644 > --- a/target/ppc/trace-events > +++ b/target/ppc/trace-events > @@ -3,3 +3,28 @@ > # kvm.c > kvm_failed_spr_set(int spr, const char *msg) "Warning: Unable to set SPR %d to KVM: %s" > kvm_failed_spr_get(int spr, const char *msg) "Warning: Unable to retrieve SPR %d from KVM: %s" > +kvm_failed_fpscr_set(const char *msg) "Unable to set FPSCR to KVM: %s" > +kvm_failed_fp_set(const char *fpname, int fpnum, const char *msg) "Unable to set %s%d to KVM: %s" > +kvm_failed_vscr_set(const char *msg) "Unable to set VSCR to KVM: %s" > +kvm_failed_vr_set(int vr, const char *msg) "Unable to set VR%d to KVM: %s" > +kvm_failed_fpscr_get(const char *msg) "Unable to get FPSCR from KVM: %s" > +kvm_failed_fp_get(const char *fpname, int fpnum, const char *msg) "Unable to get %s%d from KVM: %s" > +kvm_failed_vscr_get(const char *msg) "Unable to get VSCR from KVM: %s" > +kvm_failed_vr_get(int vr, const char *msg) "Unable to get VR%d from KVM: %s" > +kvm_failed_vpa_addr_get(const char *msg) "Unable to get VPA address from KVM: %s" > +kvm_failed_slb_get(const char *msg) "Unable to get SLB shadow state from KVM: %s" > +kvm_failed_dtl_get(const char *msg) "Unable to get dispatch trace log state from KVM: %s" > +kvm_failed_vpa_addr_set(const char *msg) "Unable to set VPA address to KVM: %s" > +kvm_failed_slb_set(const char *msg) "Unable to set SLB shadow state to KVM: %s" > +kvm_failed_dtl_set(const char *msg) "Unable to set dispatch trace log state to KVM: %s" > +kvm_failed_null_vpa_addr_set(const char *msg) "Unable to set VPA address to KVM: %s" > +kvm_failed_put_vpa(void) "Warning: Unable to set VPA information to KVM" > +kvm_failed_get_vpa(void) "Warning: Unable to get VPA information from KVM" Some messages have "Warning:" and some don't. Since these traces indicate some kind of failure, do you think adding the warning prefix would be welcome? Having it also facilitates when searching logs. Murilo > +kvm_injected_interrupt(int irq) "injected interrupt %d" > +kvm_handle_dcr_write(void) "handle dcr write" > +kvm_handle_drc_read(void) "handle dcr read" > +kvm_handle_halt(void) "handle halt" > +kvm_handle_papr_hcall(void) "handle PAPR hypercall" > +kvm_handle_epr(void) "handle epr" > +kvm_handle_watchdog_expiry(void) "handle watchdog expiry" > +kvm_handle_debug_exception(void) "handle debug exception"