[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PULL 14/17] vmxcap: port to Python 3
From: |
Paolo Bonzini |
Subject: |
[Qemu-devel] [PULL 14/17] vmxcap: port to Python 3 |
Date: |
Fri, 24 Feb 2017 18:40:27 +0100 |
Signed-off-by: Paolo Bonzini <address@hidden>
---
scripts/kvm/vmxcap | 14 +++++++-------
1 file changed, 7 insertions(+), 7 deletions(-)
diff --git a/scripts/kvm/vmxcap b/scripts/kvm/vmxcap
index 2220255..af8de15 100755
--- a/scripts/kvm/vmxcap
+++ b/scripts/kvm/vmxcap
@@ -27,9 +27,9 @@ MSR_IA32_VMX_VMFUNC = 0x491
class msr(object):
def __init__(self):
try:
- self.f = open('/dev/cpu/0/msr', 'r', 0)
+ self.f = open('/dev/cpu/0/msr', 'rb', 0)
except:
- self.f = open('/dev/msr0', 'r', 0)
+ self.f = open('/dev/msr0', 'rb', 0)
def read(self, index, default = None):
import struct
self.f.seek(index)
@@ -49,7 +49,7 @@ class Control(object):
val = m.read(nr, 0)
return (val & 0xffffffff, val >> 32)
def show(self):
- print self.name
+ print(self.name)
mbz, mb1 = self.read2(self.cap_msr)
tmbz, tmb1 = 0, 0
if self.true_cap_msr:
@@ -69,7 +69,7 @@ class Control(object):
s = 'forced'
elif one and zero:
s = 'yes'
- print ' %-40s %s' % (self.bits[bit], s)
+ print(' %-40s %s' % (self.bits[bit], s))
class Misc(object):
def __init__(self, name, bits, msr):
@@ -77,9 +77,9 @@ class Misc(object):
self.bits = bits
self.msr = msr
def show(self):
- print self.name
+ print(self.name)
value = msr().read(self.msr, 0)
- print ' Hex: 0x%x' % (value)
+ print(' Hex: 0x%x' % (value))
def first_bit(key):
if type(key) is tuple:
return key[0]
@@ -94,7 +94,7 @@ class Misc(object):
def fmt(x):
return { True: 'yes', False: 'no' }[x]
v = (value >> lo) & ((1 << (hi - lo + 1)) - 1)
- print ' %-40s %s' % (self.bits[bits], fmt(v))
+ print(' %-40s %s' % (self.bits[bits], fmt(v)))
controls = [
Misc(
--
1.8.3.1
- [Qemu-devel] [PULL 04/17] update-linux-headers: update for 4.11, (continued)
- [Qemu-devel] [PULL 04/17] update-linux-headers: update for 4.11, Paolo Bonzini, 2017/02/24
- [Qemu-devel] [PULL 06/17] cpus: remove ugly cast on sigbus_handler, Paolo Bonzini, 2017/02/24
- [Qemu-devel] [PULL 07/17] KVM: x86: cleanup SIGBUS handlers, Paolo Bonzini, 2017/02/24
- [Qemu-devel] [PULL 08/17] cpus: reorganize signal handling code, Paolo Bonzini, 2017/02/24
- [Qemu-devel] [PULL 09/17] KVM: remove kvm_arch_on_sigbus, Paolo Bonzini, 2017/02/24
- [Qemu-devel] [PULL 12/17] kvm: use atomic_read/atomic_set to access cpu->exit_request, Paolo Bonzini, 2017/02/24
- [Qemu-devel] [PULL 13/17] KVM: use KVM_CAP_IMMEDIATE_EXIT, Paolo Bonzini, 2017/02/24
- [Qemu-devel] [PULL 15/17] vmxcap: update for September 2016 SDM, Paolo Bonzini, 2017/02/24
- [Qemu-devel] [PULL 11/17] KVM: move SIG_IPI handling to kvm-all.c, Paolo Bonzini, 2017/02/24
- [Qemu-devel] [PULL 05/17] update Linux headers to 4.11, Paolo Bonzini, 2017/02/24
- [Qemu-devel] [PULL 14/17] vmxcap: port to Python 3,
Paolo Bonzini <=
- [Qemu-devel] [PULL 17/17] qmp-events: fix GUEST_PANICKED description formatting, Paolo Bonzini, 2017/02/24
- [Qemu-devel] [PULL 10/17] KVM: do not use sigtimedwait to catch SIGBUS, Paolo Bonzini, 2017/02/24
- [Qemu-devel] [PULL 16/17] qapi: flatten GuestPanicInformation union, Paolo Bonzini, 2017/02/24
- Re: [Qemu-devel] [PULL 00/17] KVM and cpu-exec patches for 2.9 soft freeze, no-reply, 2017/02/24
- Re: [Qemu-devel] [PULL 00/17] KVM and cpu-exec patches for 2.9 soft freeze, Peter Maydell, 2017/02/25