diff --git a/cpu-all.h b/cpu-all.h
index 387030e54c..7e77f7656f 100644
--- a/cpu-all.h
+++ b/cpu-all.h
@@ -743,7 +743,6 @@ void cpu_abort(CPUState *env, const char *fmt, ...)
     __attribute__ ((__noreturn__));
 extern CPUState *first_cpu;
 extern CPUState *cpu_single_env;
-extern int code_copy_enabled;
 
 #define CPU_INTERRUPT_EXIT   0x01 /* wants exit from main loop */
 #define CPU_INTERRUPT_HARD   0x02 /* hardware interrupt pending */
diff --git a/exec-all.h b/exec-all.h
index ba05af22b0..d8c6c3371e 100644
--- a/exec-all.h
+++ b/exec-all.h
@@ -77,8 +77,6 @@ int cpu_gen_code(CPUState *env, struct TranslationBlock *tb,
 int cpu_restore_state(struct TranslationBlock *tb,
                       CPUState *env, unsigned long searched_pc,
                       void *puc);
-int cpu_gen_code_copy(CPUState *env, struct TranslationBlock *tb,
-                      int max_code_size, int *gen_code_size_ptr);
 int cpu_restore_state_copy(struct TranslationBlock *tb,
                            CPUState *env, unsigned long searched_pc,
                            void *puc);
@@ -158,7 +156,6 @@ typedef struct TranslationBlock {
     uint16_t size;      /* size of target code for this block (1 <=
                            size <= TARGET_PAGE_SIZE) */
     uint16_t cflags;    /* compile flags */
-#define CF_CODE_COPY   0x0001 /* block was generated in code copy mode */
 #define CF_TB_FP_USED  0x0002 /* fp ops are used in the TB */
 #define CF_FP_USED     0x0004 /* fp ops are used in the TB or in a chained TB */
 #define CF_SINGLE_INSN 0x0008 /* compile only a single instruction */
diff --git a/tests/qruncom.c b/tests/qruncom.c
index 7b25fcdedc..6bc0b2b2d4 100644
--- a/tests/qruncom.c
+++ b/tests/qruncom.c
@@ -199,9 +199,6 @@ int main(int argc, char **argv)
 
     env = cpu_init("qemu32");
 
-    /* disable code copy to simplify debugging */
-    code_copy_enabled = 0;
-
     /* set user mode state (XXX: should be done automatically by
        cpu_init ?) */
     env->user_mode_only = 1;
diff --git a/translate-all.c b/translate-all.c
index cf8cc9bff0..e0479a8150 100644
--- a/translate-all.c
+++ b/translate-all.c
@@ -48,8 +48,6 @@ target_ulong gen_opc_jump_pc[2];
 uint32_t gen_opc_hflags[OPC_BUF_SIZE];
 #endif
 
-int code_copy_enabled = 1;
-
 #ifdef CONFIG_PROFILER
 int64_t dyngen_tb_count1;
 int64_t dyngen_tb_count;
diff --git a/vl.c b/vl.c
index d8e9ef8c6b..67712f0ce3 100644
--- a/vl.c
+++ b/vl.c
@@ -7343,7 +7343,6 @@ enum {
     QEMU_OPTION_hdachs,
     QEMU_OPTION_L,
     QEMU_OPTION_bios,
-    QEMU_OPTION_no_code_copy,
     QEMU_OPTION_k,
     QEMU_OPTION_localtime,
     QEMU_OPTION_cirrusvga,
@@ -7440,7 +7439,6 @@ const QEMUOption qemu_options[] = {
     { "hdachs", HAS_ARG, QEMU_OPTION_hdachs },
     { "L", HAS_ARG, QEMU_OPTION_L },
     { "bios", HAS_ARG, QEMU_OPTION_bios },
-    { "no-code-copy", 0, QEMU_OPTION_no_code_copy },
 #ifdef USE_KQEMU
     { "no-kqemu", 0, QEMU_OPTION_no_kqemu },
     { "kernel-kqemu", 0, QEMU_OPTION_kernel_kqemu },
@@ -7978,9 +7976,6 @@ int main(int argc, char **argv)
                 fd_bootchk = 0;
                 break;
 #endif
-            case QEMU_OPTION_no_code_copy:
-                code_copy_enabled = 0;
-                break;
             case QEMU_OPTION_net:
                 if (nb_net_clients >= MAX_NET_CLIENTS) {
                     fprintf(stderr, "qemu: too many network clients\n");