From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43) id 1M2K59-0001AW-Vj for qemu-devel@nongnu.org; Fri, 08 May 2009 03:01:20 -0400 Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43) id 1M2K54-0001AK-7K for qemu-devel@nongnu.org; Fri, 08 May 2009 03:01:18 -0400 Received: from [199.232.76.173] (port=53544 helo=monty-python.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1M2K54-0001AH-0z for qemu-devel@nongnu.org; Fri, 08 May 2009 03:01:14 -0400 Received: from mx20.gnu.org ([199.232.41.8]:64126) by monty-python.gnu.org with esmtps (TLS-1.0:RSA_AES_256_CBC_SHA1:32) (Exim 4.60) (envelope-from ) id 1M2K53-0008IH-C6 for qemu-devel@nongnu.org; Fri, 08 May 2009 03:01:13 -0400 Received: from fmmailgate03.web.de ([217.72.192.234]) by mx20.gnu.org with esmtp (Exim 4.60) (envelope-from ) id 1M2K51-0000Nw-Du for qemu-devel@nongnu.org; Fri, 08 May 2009 03:01:11 -0400 Message-ID: <4A03D8AC.8030901@web.de> Date: Fri, 08 May 2009 09:01:00 +0200 From: Jan Kiszka MIME-Version: 1.0 Content-Type: multipart/signed; micalg=pgp-sha1; protocol="application/pgp-signature"; boundary="------------enig78C1FFAF3DAD18A83D025887" Sender: jan.kiszka@web.de Subject: [Qemu-devel] [PATCH] Drop CONFIG_GDBSTUB List-Id: qemu-devel.nongnu.org List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: Anthony Liguori Cc: Jes Sorensen , Avi Kivity , qemu-devel This is an OpenPGP/MIME signed message (RFC 2440 and 3156) --------------enig78C1FFAF3DAD18A83D025887 Content-Type: text/plain; charset=ISO-8859-15 Content-Transfer-Encoding: quoted-printable This is no user-flippable switch, and no arch makes use of disabling gdbstub support. So it's pointless to keep the related #ifdefs and configure hunks around - and risking breakages like 711c410fdd again. Signed-off-by: Jan Kiszka --- Makefile.target | 26 +++++++------------------- configure | 5 ----- monitor.c | 4 ---- vl.c | 8 -------- 4 files changed, 7 insertions(+), 36 deletions(-) diff --git a/Makefile.target b/Makefile.target index f735105..fe83837 100644 --- a/Makefile.target +++ b/Makefile.target @@ -317,7 +317,7 @@ CFLAGS+=3D-p endif =20 OBJS=3D main.o syscall.o strace.o mmap.o signal.o path.o thunk.o \ - elfload.o linuxload.o uaccess.o envlist.o + elfload.o linuxload.o uaccess.o envlist.o gdbstub.o gdbstub-xml.o LIBS+=3D $(PTHREADLIBS) LIBS+=3D $(CLOCKLIBS) ifdef TARGET_HAS_BFLT @@ -340,10 +340,6 @@ ifeq ($(TARGET_ARCH), m68k) OBJS+=3D m68k-sim.o m68k-semi.o endif =20 -ifdef CONFIG_GDBSTUB -OBJS+=3Dgdbstub.o gdbstub-xml.o -endif - OBJS+=3D libqemu.a =20 # Note: this is a workaround. The real fix is to avoid compiling @@ -373,14 +369,11 @@ LDFLAGS+=3D-Wl,-segaddr,__STD_PROG_ZONE,0x1000 -ima= ge_base 0x0e000000 =20 LIBS+=3D-lmx =20 -OBJS=3D main.o commpage.o machload.o mmap.o signal.o syscall.o thunk.o +OBJS=3D main.o commpage.o machload.o mmap.o signal.o syscall.o thunk.o \= + gdbstub.o gdbstub-xml.o =20 OBJS+=3D libqemu.a =20 -ifdef CONFIG_GDBSTUB -OBJS+=3Dgdbstub.o gdbstub-xml.o -endif - # Note: this is a workaround. The real fix is to avoid compiling # cpu_signal_handler() in cpu-exec.c. signal.o: CFLAGS +=3D $(HELPER_CFLAGS) @@ -476,15 +469,12 @@ LDFLAGS+=3D-Wl,-T,$(SRC_PATH)/$(ARCH)el.ld endif endif =20 -OBJS=3D main.o bsdload.o elfload.o mmap.o path.o signal.o strace.o sysca= ll.o +OBJS=3D main.o bsdload.o elfload.o mmap.o path.o signal.o strace.o sysca= ll.o \ + gdbstub.o gdbstub-xml.o OBJS+=3D uaccess.o =20 OBJS+=3D libqemu.a =20 -ifdef CONFIG_GDBSTUB -OBJS+=3Dgdbstub.o -endif - # Note: this is a workaround. The real fix is to avoid compiling # cpu_signal_handler() in cpu-exec.c. signal.o: CFLAGS +=3D $(HELPER_CFLAGS) @@ -498,7 +488,8 @@ endif #CONFIG_BSD_USER # System emulator target ifndef CONFIG_USER_ONLY =20 -OBJS=3Dvl.o osdep.o monitor.o pci.o loader.o isa_mmio.o machine.o dma-he= lpers.o +OBJS=3Dvl.o osdep.o monitor.o pci.o loader.o isa_mmio.o machine.o dma-he= lpers.o \ + gdbstub.o gdbstub-xml.o # virtio has to be here due to weird dependency between PCI and virtio-n= et. # need to fix this properly OBJS+=3Dvirtio.o virtio-blk.o virtio-balloon.o virtio-net.o virtio-conso= le.o @@ -686,9 +677,6 @@ ifeq ($(TARGET_BASE_ARCH), m68k) OBJS+=3D an5206.o mcf5206.o mcf_uart.o mcf_intc.o mcf5208.o mcf_fec.o OBJS+=3D m68k-semi.o dummy_m68k.o endif -ifdef CONFIG_GDBSTUB -OBJS+=3Dgdbstub.o gdbstub-xml.o -endif ifdef CONFIG_COCOA COCOA_LIBS=3D-F/System/Library/Frameworks -framework Cocoa -framework IO= Kit ifdef CONFIG_COREAUDIO diff --git a/configure b/configure index 82fb60a..b2a2540 100755 --- a/configure +++ b/configure @@ -159,7 +159,6 @@ strip_opt=3D"yes" bigendian=3D"no" mingw32=3D"no" EXESUF=3D"" -gdbstub=3D"yes" slirp=3D"yes" vde=3D"yes" fmod_lib=3D"" @@ -1526,10 +1525,6 @@ if test -n "$sparc_cpu"; then echo "CONFIG__sparc_${sparc_cpu}__=3Dyes" >> $config_mak echo "#define __sparc_${sparc_cpu}__ 1" >> $config_h fi -if test "$gdbstub" =3D "yes" ; then - echo "CONFIG_GDBSTUB=3Dyes" >> $config_mak - echo "#define CONFIG_GDBSTUB 1" >> $config_h -fi if test "$gprof" =3D "yes" ; then echo "TARGET_GPROF=3Dyes" >> $config_mak echo "#define HAVE_GPROF 1" >> $config_h diff --git a/monitor.c b/monitor.c index d64f459..0f38c71 100644 --- a/monitor.c +++ b/monitor.c @@ -581,7 +581,6 @@ static void encrypted_bdrv_it(void *opaque, BlockDriv= erState *bs) } } =20 -#ifdef CONFIG_GDBSTUB static void do_gdbserver(Monitor *mon, const char *device) { if (!device) @@ -596,7 +595,6 @@ static void do_gdbserver(Monitor *mon, const char *de= vice) device); } } -#endif =20 static void do_watchdog_action(Monitor *mon, const char *action) { @@ -1692,10 +1690,8 @@ static const mon_cmd_t mon_cmds[] =3D { "", "stop emulation", }, { "c|cont", "", do_cont, "", "resume emulation", }, -#ifdef CONFIG_GDBSTUB { "gdbserver", "s?", do_gdbserver, "[device]", "start gdbserver on given device (default 'tcp::1234')= , stop with 'none'", }, -#endif { "x", "/l", do_memory_dump, "/fmt addr", "virtual memory dump starting at 'addr'", }, { "xp", "/l", do_physical_memory_dump, diff --git a/vl.c b/vl.c index 867111c..846d798 100644 --- a/vl.c +++ b/vl.c @@ -4350,13 +4350,11 @@ static void tcg_cpu_exec(void) } if (cpu_can_run(env)) ret =3D qemu_cpu_exec(env); -#ifndef CONFIG_GDBSTUB if (ret =3D=3D EXCP_DEBUG) { gdb_set_stop_cpu(env); debug_requested =3D 1; break; } -#endif } } =20 @@ -4795,9 +4793,7 @@ static void termsig_setup(void) =20 int main(int argc, char **argv, char **envp) { -#ifdef CONFIG_GDBSTUB const char *gdbstub_dev =3D NULL; -#endif uint32_t boot_devices_bitmap =3D 0; int i; int snapshot, linux_boot, net_boot; @@ -5229,14 +5225,12 @@ int main(int argc, char **argv, char **envp) cpu_set_log(mask); } break; -#ifdef CONFIG_GDBSTUB case QEMU_OPTION_s: gdbstub_dev =3D "tcp::" DEFAULT_GDBSTUB_PORT; break; case QEMU_OPTION_gdb: gdbstub_dev =3D optarg; break; -#endif case QEMU_OPTION_L: bios_dir =3D optarg; break; @@ -6023,13 +6017,11 @@ int main(int argc, char **argv, char **envp) } } =20 -#ifdef CONFIG_GDBSTUB if (gdbstub_dev && gdbserver_start(gdbstub_dev) < 0) { fprintf(stderr, "qemu: could not open gdbserver on device '%s'\n= ", gdbstub_dev); exit(1); } -#endif =20 if (loadvm) do_loadvm(cur_mon, loadvm); --------------enig78C1FFAF3DAD18A83D025887 Content-Type: application/pgp-signature; name="signature.asc" Content-Description: OpenPGP digital signature Content-Disposition: attachment; filename="signature.asc" -----BEGIN PGP SIGNATURE----- Version: GnuPG v2.0.9 (GNU/Linux) Comment: Using GnuPG with SUSE - http://enigmail.mozdev.org iEYEARECAAYFAkoD2LMACgkQniDOoMHTA+kjzwCfWLzGVEVmaC8c6gxVQ01CKgcZ N4oAn3AwYiDHW8k190Skq9nfPRmq0/UU =kbZ4 -----END PGP SIGNATURE----- --------------enig78C1FFAF3DAD18A83D025887--