Skip to contentSkip to conversation

fix kbd issue on 2.6 kernel in vmx guest.

PATCH In review Ling, Xiaofeng 2 participants 2 messages Nov 15, 2005

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 fix kbd issue on 2.6 kernel in vmx guest.

This patch fixed keyboard issue for linux kernel 2.6 in vmx guest. linux 2.6 kernel keyboard use a timer to poll the kbd state,in virtualization environment,the kbd interrupt injection is very likely to happend just after kbd state query in the kbd timer and thus will reverse sequence of scan code.
Also fix env->send_event SMP issue.

tools/ioemu/target-i386-dm/helper2.c +3 -2
diff -r 090e44133d40 tools/ioemu/target-i386-dm/helper2.c
@@ -416,6 +416,7 @@
 	FD_ZERO(&wakeup_rfds);
 	FD_SET(evtchn_fd, &wakeup_rfds);
 	highest_fds = evtchn_fd;
+	env->send_event = 0
 	while (1) {
                 if (vm_running) {
                     if (shutdown_requested) {
@@ -431,7 +432,6 @@
 		tv.tv_sec = 0;
 		tv.tv_usec = 100000;
 
-		env->send_event = 0;
 		retval = select(highest_fds+1, &wakeup_rfds, NULL, NULL, &tv);
 		if (retval == -1) {
 			perror("select");
@@ -447,12 +447,13 @@
 #define ULONGLONG_MAX   ULONG_MAX
 #endif
 
-		main_loop_wait(0);
         tun_receive_handler(&rfds);
         if ( FD_ISSET(evtchn_fd, &rfds) ) {
             cpu_handle_ioreq(env);
         }
+		main_loop_wait(0);
 		if (env->send_event) {
+		    env->send_event = 0;
 			struct ioctl_evtchn_notify notify;
 			notify.port = ioreq_local_port;
 			(void)ioctl(evtchn_fd, IOCTL_EVTCHN_NOTIFY, &notify);

# HG changeset patch
# User Xiaofeng Ling<[email protected]>
# Node ID 23df47d825f17e22f7af0deea53d9423d1717731
# Parent 090e44133d40247bc3ccbb565b644d02fdac6829
This patch fixed keyboard issue for linux kernel 2.6 in vmx guest. linux 2.6 kernel keyboard use a timer to poll the kbd state,in virtualization environment,the kbd interrupt injection is very likely to happend just after kbd state query in the kbd timer and thus will reverse sequence of scan code.
Also fix env->send_event SMP issue.

tools/ioemu/target-i386-dm/helper2.c +3 -2
diff -r 090e44133d40 tools/ioemu/target-i386-dm/helper2.c
@@ -416,6 +416,7 @@
 	FD_ZERO(&wakeup_rfds);
 	FD_SET(evtchn_fd, &wakeup_rfds);
 	highest_fds = evtchn_fd;
+	env->send_event = 0
 	while (1) {
                 if (vm_running) {
                     if (shutdown_requested) {
@@ -431,7 +432,6 @@
 		tv.tv_sec = 0;
 		tv.tv_usec = 100000;
 
-		env->send_event = 0;
 		retval = select(highest_fds+1, &wakeup_rfds, NULL, NULL, &tv);
 		if (retval == -1) {
 			perror("select");
@@ -447,12 +447,13 @@
 #define ULONGLONG_MAX   ULONG_MAX
 #endif
 
-		main_loop_wait(0);
         tun_receive_handler(&rfds);
         if ( FD_ISSET(evtchn_fd, &rfds) ) {
             cpu_handle_ioreq(env);
         }
+		main_loop_wait(0);
 		if (env->send_event) {
+		    env->send_event = 0;
 			struct ioctl_evtchn_notify notify;
 			notify.port = ioreq_local_port;
 			(void)ioctl(evtchn_fd, IOCTL_EVTCHN_NOTIFY, &notify);

_______________________________________________
Xen-devel mailing list
[email protected]
http://lists.xensource.com/xen-devel

#1 lore raw
Quoted 6 lines · Xiaofeng

This patch fixed keyboard issue for linux kernel 2.6 in vmx guest. linux 2.6 kernel keyboard use a timer to poll the kbd state,in virtualization environment,the kbd interrupt injection is very likely to happend just after kbd state query in the kbd timer and thus will reverse sequence of scan code.
Also fix env->send_event SMP issue.

Applied, but the patch as sent doesn't compile (missing semi-colon). It doesn't inspire confidence!

-- Keir