diff mbox

PPC: KVM: suppress warnings about not supported SPRs

Message ID 1391487154-27825-1-git-send-email-aik@ozlabs.ru
State New
Headers show

Commit Message

Alexey Kardashevskiy Feb. 4, 2014, 4:12 a.m. UTC 
PR KVM lacks support of many SPRs in set/get one register API but it does
really break PR KVM. So convert them to switchable traces for now.

Signed-off-by: Alexey Kardashevskiy <aik@ozlabs.ru>
---

We use this patch internally for the same purpose.


---
 target-ppc/kvm.c | 7 +++----
 trace-events     | 2 ++
 2 files changed, 5 insertions(+), 4 deletions(-)

Comments

Alexander Graf Feb. 4, 2014, 7:38 a.m. UTC | #1 
On 04.02.2014, at 05:12, Alexey Kardashevskiy <aik@ozlabs.ru> wrote:

> PR KVM lacks support of many SPRs in set/get one register API but it does
> really break PR KVM. So convert them to switchable traces for now.
> 
> Signed-off-by: Alexey Kardashevskiy <aik@ozlabs.ru>

Thanks, applied this patch instead of mine.


Alex
Alexey Kardashevskiy Feb. 4, 2014, 7:44 a.m. UTC | #2 
On 02/04/2014 06:38 PM, Alexander Graf wrote:
> 
> On 04.02.2014, at 05:12, Alexey Kardashevskiy <aik@ozlabs.ru> wrote:
> 
>> PR KVM lacks support of many SPRs in set/get one register API but it does

s/does/does not/g

sorry 8-)


>> really break PR KVM. So convert them to switchable traces for now.
>>
>> Signed-off-by: Alexey Kardashevskiy <aik@ozlabs.ru>
> 
> Thanks, applied this patch instead of mine.
diff mbox

Patch

diff --git a/target-ppc/kvm.c b/target-ppc/kvm.c
index 3f85b8d..690bd51 100644
--- a/target-ppc/kvm.c
+++ b/target-ppc/kvm.c
@@ -36,6 +36,7 @@ 
 #include "hw/ppc/spapr.h"
 #include "hw/ppc/spapr_vio.h"
 #include "sysemu/watchdog.h"
+#include "trace.h"
 
 //#define DEBUG_KVM
 
@@ -480,8 +481,7 @@  static void kvm_get_one_spr(CPUState *cs, uint64_t id, int spr)
 
     ret = kvm_vcpu_ioctl(cs, KVM_GET_ONE_REG, &reg);
     if (ret != 0) {
-        fprintf(stderr, "Warning: Unable to retrieve SPR %d from KVM: %s\n",
-                spr, strerror(errno));
+        trace_kvm_failed_spr_get(spr, strerror(errno));
     } else {
         switch (id & KVM_REG_SIZE_MASK) {
         case KVM_REG_SIZE_U32:
@@ -529,8 +529,7 @@  static void kvm_put_one_spr(CPUState *cs, uint64_t id, int spr)
 
     ret = kvm_vcpu_ioctl(cs, KVM_SET_ONE_REG, &reg);
     if (ret != 0) {
-        fprintf(stderr, "Warning: Unable to set SPR %d to KVM: %s\n",
-                spr, strerror(errno));
+        trace_kvm_failed_spr_set(spr, strerror(errno));
     }
 }
 
diff --git a/trace-events b/trace-events
index 9f4456a..3bbcd51 100644
--- a/trace-events
+++ b/trace-events
@@ -1169,6 +1169,8 @@  kvm_ioctl(int type, void *arg) "type 0x%x, arg %p"
 kvm_vm_ioctl(int type, void *arg) "type 0x%x, arg %p"
 kvm_vcpu_ioctl(int cpu_index, int type, void *arg) "cpu_index %d, type 0x%x, arg %p"
 kvm_run_exit(int cpu_index, uint32_t reason) "cpu_index %d, reason %d"
+kvm_failed_spr_set(int str, const char *msg) "Warning: Unable to set SPR %d to KVM: %s"
+kvm_failed_spr_get(int str, const char *msg) "Warning: Unable to retrieve SPR %d from KVM: %s"
 
 # memory.c
 memory_region_ops_read(void *mr, uint64_t addr, uint64_t value, unsigned size) "mr %p addr %#"PRIx64" value %#"PRIx64" size %u"