From cb11558b75bc84cf6c824c94aad9b343fea1224b Mon Sep 17 00:00:00 2001
From: Muhammad Moinur Rahman <bofh@FreeBSD.org>
Date: Wed, 16 Dec 2015 14:15:19 +0000
Subject: emulators/qemu: Update version 0.11.1=>2.4.1

- MASTER_SITES has been changed from SAVANNAH and local repo of nox@
  to new wiki.qemu.org
- Take MAINTAINERSHIP
- Updated to maintain version release with UPSTREAM. qemu-devel will be
updated to maintain with SNAPSHOTS
- Some of the patches has been converted to OPTIONSNG with post-patch
- Most of the patches are now makepatch compatible
- Converted most of the LEGACY OPTIONS to OPTIONSNG
---
 emulators/qemu/files/patch-iopl-workaround | 64 ------------------------------
 1 file changed, 64 deletions(-)
 delete mode 100644 emulators/qemu/files/patch-iopl-workaround

(limited to 'emulators/qemu/files/patch-iopl-workaround')

diff --git a/emulators/qemu/files/patch-iopl-workaround b/emulators/qemu/files/patch-iopl-workaround
deleted file mode 100644
index b123bd600976..000000000000
--- a/emulators/qemu/files/patch-iopl-workaround
+++ /dev/null
@@ -1,64 +0,0 @@
-Index: qemu/target-i386/op_helper.c
-@@ -517,6 +517,12 @@
- #endif
- }
- 
-+#if 1
-+#define IOPL_WORKAROUND
-+#define VMPORT 0x5658
-+int vmware_svga_io_base;
-+#endif
-+
- /* check if Port I/O is allowed in TSS */
- static inline void check_io(int addr, int size)
- {
-@@ -527,6 +533,27 @@
-         ((env->tr.flags >> DESC_TYPE_SHIFT) & 0xf) != 9 ||
-         env->tr.limit < 103)
-         goto fail;
-+#ifdef IOPL_WORKAROUND
-+    if (addr == VMPORT) {
-+        static int last_vmport_iopl = -1;
-+        int iopl = (env->eflags >> IOPL_SHIFT) & 3;
-+        if (iopl != last_vmport_iopl) {
-+            printf("check_io: vmport workaround: iopl = %d\n", iopl);
-+            last_vmport_iopl = iopl;
-+        }
-+        return;
-+    }
-+    if (vmware_svga_io_base &&
-+        addr >= vmware_svga_io_base && addr < vmware_svga_io_base + 3) {
-+        static int last_svga_iopl = -1;
-+        int iopl = (env->eflags >> IOPL_SHIFT) & 3;
-+        if (iopl != last_svga_iopl) {
-+            printf("check_io: vmware svga workaround: iopl = %d\n", iopl);
-+            last_svga_iopl = iopl;
-+        }
-+        return;
-+    }
-+#endif
-     io_offset = lduw_kernel(env->tr.base + 0x66);
-     io_offset += (addr >> 3);
-     /* Note: the check needs two bytes */
-Index: qemu/hw/vmware_vga.c
-@@ -1175,12 +1175,20 @@
-     return 0;
- }
- 
-+#if 1 && defined(TARGET_I386)
-+#define IOPL_WORKAROUND
-+extern int vmware_svga_io_base;
-+#endif
-+
- static void pci_vmsvga_map_ioport(PCIDevice *pci_dev, int region_num,
-                 uint32_t addr, uint32_t size, int type)
- {
-     struct pci_vmsvga_state_s *d = (struct pci_vmsvga_state_s *) pci_dev;
-     struct vmsvga_state_s *s = &d->chip;
- 
-+#ifdef IOPL_WORKAROUND
-+    vmware_svga_io_base = addr + SVGA_IO_MUL * SVGA_INDEX_PORT;
-+#endif
-     register_ioport_read(addr + SVGA_IO_MUL * SVGA_INDEX_PORT,
-                     1, 4, vmsvga_index_read, s);
-     register_ioport_write(addr + SVGA_IO_MUL * SVGA_INDEX_PORT,
-- 
cgit v1.2.3