qemu-devel.nongnu.org archive mirror
 help / color / mirror / Atom feed
From: Paolo Bonzini <pbonzini@redhat.com>
To: qemu-devel@nongnu.org
Subject: [PULL 26/29] vmxcap: correct the name of the variables
Date: Fri,  4 Oct 2019 18:59:20 +0200	[thread overview]
Message-ID: <1570208363-11948-6-git-send-email-pbonzini@redhat.com> (raw)
In-Reply-To: <1570208363-11948-1-git-send-email-pbonzini@redhat.com>

The low bits are 1 if the control must be one, the high bits
are 1 if the control can be one.  Correct the variable names
as they are very confusing.

Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
---
 scripts/kvm/vmxcap | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/scripts/kvm/vmxcap b/scripts/kvm/vmxcap
index d8c7d6d..5dfeb2e 100755
--- a/scripts/kvm/vmxcap
+++ b/scripts/kvm/vmxcap
@@ -51,15 +51,15 @@ class Control(object):
         return (val & 0xffffffff, val >> 32)
     def show(self):
         print(self.name)
-        mbz, mb1 = self.read2(self.cap_msr)
-        tmbz, tmb1 = 0, 0
+        mb1, cb1 = self.read2(self.cap_msr)
+        tmb1, tcb1 = 0, 0
         if self.true_cap_msr:
-            tmbz, tmb1 = self.read2(self.true_cap_msr)
+            tmb1, tcb1 = self.read2(self.true_cap_msr)
         for bit in sorted(self.bits.keys()):
-            zero = not (mbz & (1 << bit))
-            one = mb1 & (1 << bit)
-            true_zero = not (tmbz & (1 << bit))
-            true_one = tmb1 & (1 << bit)
+            zero = not (mb1 & (1 << bit))
+            one = cb1 & (1 << bit)
+            true_zero = not (tmb1 & (1 << bit))
+            true_one = tcb1 & (1 << bit)
             s= '?'
             if (self.true_cap_msr and true_zero and true_one
                 and one and not zero):
-- 
1.8.3.1




  parent reply	other threads:[~2019-10-04 17:10 UTC|newest]

Thread overview: 10+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2019-10-04 16:59 [PULL v3 00/29] Misc patches for 2019-10-02 Paolo Bonzini
2019-10-04 16:59 ` [PULL 22/29] target/i386: handle filtered_features in a new function mark_unavailable_features Paolo Bonzini
2019-10-04 16:59 ` [PULL 23/29] target/i386: introduce generic feature dependency mechanism Paolo Bonzini
2019-10-04 16:59 ` [PULL 24/29] target/i386: expand feature words to 64 bits Paolo Bonzini
2019-10-04 16:59 ` [PULL 25/29] target/i386: add VMX definitions Paolo Bonzini
2019-10-04 16:59 ` Paolo Bonzini [this message]
2019-10-04 16:59 ` [PULL 27/29] target/i386: add VMX features Paolo Bonzini
2019-10-04 16:59 ` [PULL 28/29] target/i386: work around KVM_GET_MSRS bug for secondary execution controls Paolo Bonzini
2019-10-04 16:59 ` [PULL 29/29] target/i386/kvm: Silence warning from Valgrind about uninitialized bytes Paolo Bonzini
2019-10-07 10:28 ` [PULL v3 00/29] Misc patches for 2019-10-02 Peter Maydell

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1570208363-11948-6-git-send-email-pbonzini@redhat.com \
    --to=pbonzini@redhat.com \
    --cc=qemu-devel@nongnu.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).