summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorcinap_lenrek <cinap_lenrek@felloff.net>2017-08-07 19:10:32 +0200
committercinap_lenrek <cinap_lenrek@felloff.net>2017-08-07 19:10:32 +0200
commitddf977d25c26d1cc3e83a08d9a3f19907dff35cc (patch)
tree6d8705a9eeb8cab3759a29e702e35f2911e789bb
parente0474599ddbeafb7f2734fead8cbba62c466990a (diff)
downloadplan9front-ddf977d25c26d1cc3e83a08d9a3f19907dff35cc.tar.xz
vmx: fix hlt idle problem
-rw-r--r--sys/src/cmd/vmx/exith.c2
-rw-r--r--sys/src/cmd/vmx/io.c2
2 files changed, 2 insertions, 2 deletions
diff --git a/sys/src/cmd/vmx/exith.c b/sys/src/cmd/vmx/exith.c
index 127b8f062..ff1bcdf1d 100644
--- a/sys/src/cmd/vmx/exith.c
+++ b/sys/src/cmd/vmx/exith.c
@@ -434,7 +434,7 @@ dbgexc(ExitInfo *ei)
static void
hlt(ExitInfo *ei)
{
- if(irqactive == 0)
+ if(irqactive < 0)
state = VMHALT;
skipinstr(ei);
}
diff --git a/sys/src/cmd/vmx/io.c b/sys/src/cmd/vmx/io.c
index b98d2f7ec..6d91b7503 100644
--- a/sys/src/cmd/vmx/io.c
+++ b/sys/src/cmd/vmx/io.c
@@ -282,7 +282,7 @@ picio(int isin, u16int port, u32int val, int sz, void *)
case 0x20:
case 0xa0:
if((val & 1<<4) != 0){ /* ICW1 */
- if(irqactive){
+ if(irqactive >= 0){
if(ctl("irq") < 0)
sysfatal("ctl: %r");
irqactive = -1;