Update to 1.0, announce message is here:

	http://lists.nongnu.org/archive/html/qemu-devel/2011-12/msg00121.html

Feature safe:	yes

4 files changed, 15 insertions, 68 deletions

diff --git a/emulators/qemu-devel/files/patch-90_security b/emulators/qemu-devel/files/patch-90_security
index e62c64dedb32..12eb0301f4cd 100644
--- a/emulators/qemu-devel/files/patch-90_security
+++ b/emulators/qemu-devel/files/patch-90_security
@@ -35,18 +35,6 @@ Index: qemu/hw/fdc.c
                  FLOPPY_ERROR("writing sector %d\n", fd_sector(cur_drv));
                  return;
              }
-Index: qemu-0.8.2/hw/pc.c
-@@ -335,8 +336,9 @@ void bochs_bios_write(void *opaque, uint
-         /* LGPL'ed VGA BIOS messages */
-     case 0x501:
-     case 0x502:
-+        /* according to documentation, these can be safely ignored */
-         fprintf(stderr, "VGA BIOS panic, line %d\n", val);
--        exit(1);
-+        break;
-     case 0x500:
-     case 0x503:
- #ifdef DEBUG_BIOS
 Index: qemu-0.8.2/hw/sb16.c
 ===================================================================
 --- qemu-0.8.2.orig/hw/sb16.c	2006-07-22 20:23:34.000000000 +0300
@@ -65,13 +53,13 @@ Index: qemu-0.8.2/hw/sb16.c
  
      return dma_pos;
 Index: qemu/hw/i8259.c
-@@ -302,7 +302,8 @@
+@@ -291,7 +291,8 @@ static void pic_ioport_write(void *opaqu
              s->init4 = val & 1;
              s->single_mode = val & 2;
-             if (val & 0x08)
+             if (val & 0x08) {
 -                hw_error("level sensitive irq not supported");
 +                /* hw_error("level sensitive irq not supported"); */
-+		return;
++                return;
+             }
          } else if (val & 0x08) {
-             if (val & 0x04)
-                 s->poll = 1;
+             if (val & 0x04) {
diff --git a/emulators/qemu-devel/files/patch-Makefile.objs b/emulators/qemu-devel/files/patch-Makefile.objs
deleted file mode 100644
index bed3e56759a2..000000000000
--- a/emulators/qemu-devel/files/patch-Makefile.objs
+++ /dev/null
@@ -1,10 +0,0 @@
---- a/Makefile.objs
-+++ b/Makefile.objs
-@@ -166,6 +166,7 @@ user-obj-y =
- user-obj-y += envlist.o path.o
- user-obj-y += tcg-runtime.o host-utils.o
- user-obj-y += cutils.o cache-utils.o
-+user-obj-y += qemu-thread-posix.o
- 
- ######################################################################
- # libhw
diff --git a/emulators/qemu-devel/files/patch-hw-ide-ahci.c b/emulators/qemu-devel/files/patch-hw-ide-ahci.c
deleted file mode 100644
index 4b539d5e711a..000000000000
--- a/emulators/qemu-devel/files/patch-hw-ide-ahci.c
+++ /dev/null
@@ -1,31 +0,0 @@
---- qemu/hw/ide/ahci.c.prev	2011-09-11 16:39:53.000000000 +0300
-+++ qemu/hw/ide/ahci.c	2011-09-11 16:39:48.000000000 +0300
-@@ -505,10 +505,7 @@ static void ahci_reset_port(AHCIState *s
-     ide_bus_reset(&d->port);
-     ide_state->ncq_queues = AHCI_MAX_CMDS;
- 
--    pr->irq_stat = 0;
--    pr->irq_mask = 0;
-     pr->scr_stat = 0;
--    pr->scr_ctl = 0;
-     pr->scr_err = 0;
-     pr->scr_act = 0;
-     d->busy_slot = -1;
-@@ -1157,12 +1154,17 @@ void ahci_uninit(AHCIState *s)
- void ahci_reset(void *opaque)
- {
-     struct AHCIPCIState *d = opaque;
-+    AHCIPortRegs *pr;
-     int i;
- 
-     d->ahci.control_regs.irqstatus = 0;
-     d->ahci.control_regs.ghc = 0;
- 
-     for (i = 0; i < d->ahci.ports; i++) {
-+        pr = &d->ahci.dev[i].port_regs;
-+        pr->irq_stat = 0;
-+        pr->irq_mask = 0;
-+        pr->scr_ctl = 0;
-         ahci_reset_port(&d->ahci, i);
-     }
- }
diff --git a/emulators/qemu-devel/files/pcap-patch b/emulators/qemu-devel/files/pcap-patch
index 42873b6f8d49..59a3fd9e4871 100644
--- a/emulators/qemu-devel/files/pcap-patch
+++ b/emulators/qemu-devel/files/pcap-patch
@@ -1,16 +1,16 @@
 --- configure.orig	2010-01-29 14:36:00.000000000 -0500
 +++ configure	2010-01-29 14:36:00.000000000 -0500
-@@ -180,6 +180,9 @@ smartcard_nss=""
- usb_redir=""
- opengl=""
+@@ -185,6 +185,9 @@ opengl=""
+ zlib="yes"
  guest_agent="yes"
+ libiscsi=""
 +pcap="no"
 +pcap_create="no"
 +bpf="no"
  
  # parse CC options first
  for opt do
-@@ -611,6 +614,8 @@ for opt do
+@@ -638,6 +641,8 @@ for opt do
    ;;
    --enable-vnc-thread) vnc_thread="yes"
    ;;
@@ -19,7 +19,7 @@
    --disable-slirp) slirp="no"
    ;;
    --disable-uuid) uuid="no"
-@@ -1438,6 +1443,49 @@ EOF
+@@ -1529,6 +1534,49 @@ EOF
  fi
  
  ##########################################
@@ -69,8 +69,8 @@
  # VNC TLS detection
  if test "$vnc" = "yes" -a "$vnc_tls" != "no" ; then
    cat > $TMPC <<EOF
-@@ -2797,6 +2845,15 @@ fi
- if test $profiler = "yes" ; then
+@@ -2950,6 +2998,15 @@ fi
+ if test "$profiler" = "yes" ; then
    echo "CONFIG_PROFILER=y" >> $config_host_mak
  fi
 +if test "$pcap" = "yes" ; then
@@ -84,7 +84,7 @@
 +fi
  if test "$slirp" = "yes" ; then
    echo "CONFIG_SLIRP=y" >> $config_host_mak
-   QEMU_INCLUDES="-I\$(SRC_PATH)/slirp $QEMU_INCLUDES"
+   echo "CONFIG_SMBD_COMMAND=\"$smbd\"" >> $config_host_mak
 Index: net.c
 @@ -37,6 +37,11 @@
  #include "hw/qdev.h"
@@ -175,7 +175,7 @@ Index: net.c
 +#endif
 +    int i;
 +
-+    s = qemu_mallocz(sizeof(PCAPState));
++    s = g_malloc0(sizeof(PCAPState));
 +    nc = qemu_new_net_client(&net_pcap_info, vlan, NULL, model, name);
 +
 +    s = DO_UPCAST(PCAPState, nc, nc);
@@ -299,7 +299,7 @@ Index: net.c
 +    if (s) {
 +        if (s->handle)
 +            pcap_close(s->handle);
-+        qemu_free(s);
++        g_free(s);
 +    }
 +
 +    return -1;