[PATCH] symbol instead of constant in kvm_show_code()

[PATCH] symbol instead of constant in kvm_show_code()

[Nguyen Anh Quynh]

[-- Attachment #1: Type: text/plain, Size: 169 bytes --]

This patch uses symbol rather than a constant in kvm_show_code(), so
more readable :-)

Signed-off-by: Nguyen Anh Quynh <aquynh-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org>

[-- Attachment #2: patch7.patch --]
[-- Type: application/octet-stream, Size: 965 bytes --]

diff --git a/user/kvmctl.c b/user/kvmctl.c
index 82d1926..b97c7d2 100644
--- a/user/kvmctl.c
+++ b/user/kvmctl.c
@@ -666,6 +666,7 @@ void kvm_show_regs(kvm_context_t kvm, int vcpu)
 
 static void kvm_show_code(kvm_context_t kvm, int vcpu)
 {
+#define CR0_PE_MASK	(1ULL<<0)
 	int fd = kvm->vcpu_fd[vcpu];
 	struct kvm_regs regs;
 	struct kvm_sregs sregs;
@@ -674,18 +675,19 @@ static void kvm_show_code(kvm_context_t kvm, int vcpu)
 	char code_str[sizeof(code) * 3 + 1];
 	unsigned long rip;
 
-	r = ioctl(fd, KVM_GET_REGS, &regs);
-	if (r == -1) {
-		perror("KVM_GET_REGS");
-		return;
-	}
 	r = ioctl(fd, KVM_GET_SREGS, &sregs);
 	if (r == -1) {
 		perror("KVM_GET_SREGS");
 		return;
 	}
-	if (sregs.cr0 & 1)
+	if (sregs.cr0 & CR0_PE_MASK)
 		return;
+
+	r = ioctl(fd, KVM_GET_REGS, &regs);
+	if (r == -1) {
+		perror("KVM_GET_REGS");
+		return;
+	}
 	rip = sregs.cs.base * 16 + regs.rip;
 	memcpy(code, kvm->physical_memory + rip, sizeof code);
 	*code_str = 0;

[-- Attachment #3: Type: text/plain, Size: 286 bytes --]

-------------------------------------------------------------------------
This SF.net email is sponsored by DB2 Express
Download DB2 Express C - the FREE version of DB2 express and take
control of your XML. No limits. Just data. Click to get it now.
http://sourceforge.net/powerbar/db2/

[-- Attachment #4: Type: text/plain, Size: 186 bytes --]

_______________________________________________
kvm-devel mailing list
kvm-devel-5NWGOfrQmneRv+LV9MX5uipxlwaOVQ5f@public.gmane.org
https://lists.sourceforge.net/lists/listinfo/kvm-devel

Re: [PATCH] symbol instead of constant in kvm_show_code()

[Avi Kivity]

Nguyen Anh Quynh wrote:
> This patch uses symbol rather than a constant in kvm_show_code(), so
> more readable :-)

Applied, thanks.

-- 
error compiling committee.c: too many arguments to function


-------------------------------------------------------------------------
This SF.net email is sponsored by DB2 Express
Download DB2 Express C - the FREE version of DB2 express and take
control of your XML. No limits. Just data. Click to get it now.
http://sourceforge.net/powerbar/db2/