Check for KVM_GET/SET_REGS ioctl failures (and return -errno which the
caller of kvm_run will promptely ignore).
Signed-off-by: Muli Ben-Yehuda <[EMAIL PROTECTED]>
diff -r d116fd1b3260 -r 74c55612f99d user/kvmctl.c
--- a/user/kvmctl.c Tue Feb 06 21:26:46 2007 +0200
+++ b/user/kvmctl.c Tue Feb 06 23:29:49 2007 +0200
@@ -235,19 +235,21 @@ static int handle_io(kvm_context_t kvm,
int delta;
struct translation_cache tr;
int _in = (run->io.direction == KVM_EXIT_IO_IN);
+ int r;
translation_cache_init(&tr);
if (run->io.string || _in) {
regs.vcpu = run->vcpu;
- ioctl(kvm->fd, KVM_GET_REGS, ®s);
+ r = ioctl(kvm->fd, KVM_GET_REGS, ®s);
+ if (r == -1)
+ return -errno;
}
delta = run->io.string_down ? -run->io.size : run->io.size;
while (more_io(run, first_time)) {
void *value_addr;
- int r;
if (!run->io.string) {
if (_in)
@@ -327,13 +329,22 @@ static int handle_io(kvm_context_t kvm,
}
first_time = 0;
if (r) {
- ioctl(kvm->fd, KVM_SET_REGS, ®s);
- return r;
- }
- }
-
- if (run->io.string || _in)
- ioctl(kvm->fd, KVM_SET_REGS, ®s);
+ int savedret = r;
+ r = ioctl(kvm->fd, KVM_SET_REGS, ®s);
+ if (r == -1)
+ return -errno;
+
+ return savedret;
+ }
+ }
+
+ if (run->io.string || _in) {
+ r = ioctl(kvm->fd, KVM_SET_REGS, ®s);
+ if (r == -1)
+ return -errno;
+
+ }
+
run->emulated = 1;
return 0;
}
-------------------------------------------------------------------------
Using Tomcat but need to do more? Need to support web services, security?
Get stuff done quickly with pre-integrated technology to make your job easier.
Download IBM WebSphere Application Server v.1.0.1 based on Apache Geronimo
http://sel.as-us.falkag.net/sel?cmd=lnk&kid=120709&bid=263057&dat=121642
_______________________________________________
kvm-devel mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/kvm-devel