Merge commit 'v0.12.4' into stable-0.12qemu-kvm-0.12.4

* commit 'v0.12.4': (49 commits)
  Update for 0.12.4 release
  Workaround for broken OSS_GETVERSION on FreeBSD, part two
  oss: fix fragment setting
  oss: issue OSS_GETVERSION ioctl only when needed
  oss: refactor code around policy setting
  oss: workaround for cases when OSS_GETVERSION is not defined
  block: Free iovec arrays allocated by multiwrite_merge()
  lsi: fix segfault in lsi_command_complete
  lsi: pass lsi_request to lsi_reselect
  lsi: move dma_len+dma_buf into lsi_request
  lsi: move current_dev into lsi_request
  lsi: have lsi_request for the whole life time of the request.
  lsi: use QTAILQ for lsi_queue
  tcp/mips: Change TCG_AREG0 (fp -> s0)
  sh_pci: fix memory and I/O access
  Fix incoming migration with iothread
  Fix SIGFPE for vnc display of width/height = 1
  net: remove broken net_set_boot_mask() boot device validation
  qcow2: Remove request from in-flight list after error
  qcow2: Don't ignore immediate read/write failures
  ...

Signed-off-by: Avi Kivity <avi@redhat.com>

1 files changed, 1 insertions, 0 deletions

diff --git a/hw/ide/internal.h b/hw/ide/internal.h
index 8869a0834..8615d1a1f 100644
--- a/hw/ide/internal.h
+++ b/hw/ide/internal.h
@@ -481,6 +481,7 @@ struct BMDMAState {
     uint8_t status;
     uint32_t addr;
 
+    struct PCIIDEState *pci_dev;
     IDEBus *bus;
     /* current transfer state */
     uint32_t cur_addr;