Code Review
/
kvmfornfv.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
These changes are the raw update to qemu-2.6.
[kvmfornfv.git]
/
qemu
/
roms
/
seabios
/
src
/
disk.c
diff --git
a/qemu/roms/seabios/src/disk.c
b/qemu/roms/seabios/src/disk.c
index
0e0af24
..
3854d00
100644
(file)
--- a/
qemu/roms/seabios/src/disk.c
+++ b/
qemu/roms/seabios/src/disk.c
@@
-407,6
+407,9
@@
disk_1344(struct bregs *regs, struct drive_s *drive_gf)
extended_access(regs, drive_gf, CMD_VERIFY);
}
extended_access(regs, drive_gf, CMD_VERIFY);
}
+// Locks for removable devices
+u8 CDRom_locks[BUILD_MAX_EXTDRIVE] VARLOW;
+
// lock
static void
disk_134500(struct bregs *regs, struct drive_s *drive_gf)
// lock
static void
disk_134500(struct bregs *regs, struct drive_s *drive_gf)
@@
-519,7
+522,7
@@
disk_1347(struct bregs *regs, struct drive_s *drive_gf)
static void
disk_1348(struct bregs *regs, struct drive_s *drive_gf)
{
static void
disk_1348(struct bregs *regs, struct drive_s *drive_gf)
{
- int ret = fill_edd(
regs->ds, (void*)(regs->si+0
), drive_gf);
+ int ret = fill_edd(
SEGOFF(regs->ds, regs->si
), drive_gf);
disk_ret(regs, ret);
}
disk_ret(regs, ret);
}