- Update emulators/qemu-sbruno to latest github snapshot, fixing

  the bsd-user targets on 8 and 9.
- Switch emulators/qemu-user-static to be slave of emulators/qemu-sbruno.
- Update emulators/qemu-devel to latest upstream release 2.2.0, now
  w/o bsd-user patches and knob again.  (Or at least until the
  patches are merged upstream...) [1]
- Add appropriate CONFLICTS to emulators/qemu too and bump its
  PORTREVISION.

Suggested by:	andrew [1] (for the benefit of testing aarch64 guests)

1 files changed, 0 insertions, 53 deletions

diff --git a/emulators/qemu-devel/files/extra-patch-a3129eea10f188bfd39ce83b18b25dcefbc5bffc b/emulators/qemu-devel/files/extra-patch-a3129eea10f188bfd39ce83b18b25dcefbc5bffc
deleted file mode 100644
index 11056d010961..000000000000
--- a/emulators/qemu-devel/files/extra-patch-a3129eea10f188bfd39ce83b18b25dcefbc5bffc
+++ /dev/null
@@ -1,53 +0,0 @@
-diff --git a/bsd-user/signal.c b/bsd-user/signal.c
-index 3619b00..01374a6 100644
---- a/bsd-user/signal.c
-+++ b/bsd-user/signal.c
-@@ -283,7 +283,8 @@ static int core_dump_signal(int sig)
- /* Signal queue handling. */
- static inline struct qemu_sigqueue *alloc_sigqueue(CPUArchState *env)
- {
--    TaskState *ts = env->opaque;
-+    CPUState *cpu = thread_cpu;
-+    TaskState *ts = (TaskState *)cpu->opaque;
-     struct qemu_sigqueue *q = ts->first_free;
- 
-     if (!q) {
-@@ -296,7 +297,8 @@ static inline struct qemu_sigqueue *alloc_sigqueue(CPUArchState *env)
- static inline void free_sigqueue(CPUArchState *env, struct qemu_sigqueue *q)
- {
- 
--    TaskState *ts = env->opaque;
-+    CPUState *cpu = thread_cpu;
-+    TaskState *ts = (TaskState *)cpu->opaque;
-     q->next = ts->first_free;
-     ts->first_free = q;
- }
-@@ -305,7 +307,8 @@ static inline void free_sigqueue(CPUArchState *env, struct qemu_sigqueue *q)
- void QEMU_NORETURN force_sig(int target_sig)
- {
-     CPUArchState *env = thread_cpu->env_ptr;
--    TaskState *ts = (TaskState *)env->opaque;
-+    CPUState *cpu = thread_cpu;
-+    TaskState *ts = (TaskState *)cpu->opaque;
-     int core_dumped = 0;
-     int host_sig;
-     struct sigaction act;
-@@ -365,7 +368,8 @@ void QEMU_NORETURN force_sig(int target_sig)
-  */
- int queue_signal(CPUArchState *env, int sig, target_siginfo_t *info)
- {
--    TaskState *ts = env->opaque;
-+    CPUState *cpu = thread_cpu;
-+    TaskState *ts = (TaskState *)cpu->opaque;
-     struct emulated_sigtable *k;
-     struct qemu_sigqueue *q, **pq;
-     abi_ulong handler;
-@@ -826,7 +830,7 @@ void process_pending_signals(CPUArchState *cpu_env)
-     struct emulated_sigtable *k;
-     struct target_sigaction *sa;
-     struct qemu_sigqueue *q;
--    TaskState *ts = cpu_env->opaque;
-+    TaskState *ts = cpu->opaque;
- 
-     if (!ts->signal_pending) {
-         return;