Merge commit '6977dfe6af975d72a8140dbc91effe8b8f2a58f8' into upstream-merge

* commit '6977dfe6af975d72a8140dbc91effe8b8f2a58f8': (24 commits)
  exec: remove code duplication in qemu_ram_alloc() and qemu_ram_alloc_from_ptr()
  exec: replace tabs by spaces.
  arch_init: replace tabs by spaces.
  pckbd: support for commands 0xf0-0xff: Pulse output bit
  Replace qemu_malloc + memset with qemu_mallocz
  Use ARRAY_SIZE macro
  Remove useless NULL check for qemu_strdup return value
  Remove useless NULL checks for qemu_malloc return value
  savevm: Reset last block info at beginning of each save
  set proper migration status on ->write error (v5)
  rtc: Remove TARGET_I386 from qemu-config.c, enables driftfix
  QEMUFileBuffered: indicate that we're ready when the underlying file is ready
  sparc escc IUS improvements (SunOS 4.1.4 fix)
  Fix mingw32 build
  win32: Avoid compiler warning (WIN32_LEAN_AND_MEAN redefined)
  win32: Add missing function setenv
  Disable build of ivshmem on non-KVM systems
  Add kvm_set_ioeventfd_mmio_long definition for non-KVM systems
  TCG: Revert ppc64 tcg_out_movi32 change
  TCG: Fix Darwin/ppc calling convention recognition
  ...

Conflicts:
	exec.c

Signed-off-by: Marcelo Tosatti <mtosatti@redhat.com>

1 files changed, 0 insertions, 2 deletions

diff --git a/qemu-config.c b/qemu-config.c
index 08ee55375..562c91808 100644
--- a/qemu-config.c
+++ b/qemu-config.c
@@ -251,11 +251,9 @@ QemuOptsList qemu_rtc_opts = {
         },{
             .name = "clock",
             .type = QEMU_OPT_STRING,
-#ifdef TARGET_I386
         },{
             .name = "driftfix",
             .type = QEMU_OPT_STRING,
-#endif
         },
         { /* end if list */ }
     },