diff options
| author | Juergen Lock <nox@FreeBSD.org> | 2013-03-29 17:40:38 +0000 |
|---|---|---|
| committer | Juergen Lock <nox@FreeBSD.org> | 2013-03-29 17:40:38 +0000 |
| commit | 45aa9370f03dfaf05a98af04f0addd7e3998d771 (patch) | |
| tree | d33294058708ce0ec0faa156a7ed184dea6cdc1d /emulators/qemu-devel/files/patch-90_security | |
| parent | - (force commit to note) add new port: games/chessx (diff) | |
- Update net/usbredir to 0.6 .
- Update emulators/qemu-devel to 1.4.0 with preliminary bsd-user patches.
Thanx to: sson, cognet, and others for much improved bsd-user support -
it now runs at least quite a few mips64 and single-threaded
arm binaries, see:
https://wiki.freebsd.org/QemuUserModeHowTo
Notes
Notes:
svn path=/head/; revision=315552
Diffstat (limited to 'emulators/qemu-devel/files/patch-90_security')
| -rw-r--r-- | emulators/qemu-devel/files/patch-90_security | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/emulators/qemu-devel/files/patch-90_security b/emulators/qemu-devel/files/patch-90_security index 12eb0301f4cd..6ce41640d374 100644 --- a/emulators/qemu-devel/files/patch-90_security +++ b/emulators/qemu-devel/files/patch-90_security @@ -15,7 +15,7 @@ Index: qemu/hw/dma.c } Index: qemu/hw/fdc.c -@@ -1322,7 +1322,8 @@ +@@ -1445,7 +1445,8 @@ static uint32_t fdctrl_read_data(FDCtrl fd_sector(cur_drv)); return 0; } @@ -25,16 +25,16 @@ Index: qemu/hw/fdc.c FLOPPY_DPRINTF("error getting sector %d\n", fd_sector(cur_drv)); /* Sure, image size is too small... */ -@@ -1776,7 +1777,8 @@ +@@ -1905,7 +1906,8 @@ static void fdctrl_write_data(FDCtrl *fd if (pos == FD_SECTOR_LEN - 1 || fdctrl->data_pos == fdctrl->data_len) { cur_drv = get_cur_drv(fdctrl); - if (bdrv_write(cur_drv->bs, fd_sector(cur_drv), fdctrl->fifo, 1) < 0) { + if (cur_drv->bs == NULL || + bdrv_write(cur_drv->bs, fd_sector(cur_drv), fdctrl->fifo, 1) < 0) { - FLOPPY_ERROR("writing sector %d\n", fd_sector(cur_drv)); + FLOPPY_DPRINTF("error writing sector %d\n", + fd_sector(cur_drv)); return; - } Index: qemu-0.8.2/hw/sb16.c =================================================================== --- qemu-0.8.2.orig/hw/sb16.c 2006-07-22 20:23:34.000000000 +0300 |