summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAvi Kivity <avi@redhat.com>2009-02-08 10:57:31 +0200
committerAvi Kivity <avi@redhat.com>2009-02-08 12:01:36 +0200
commit387d250558fc7cf9c501fedd8dce8500d1bf949d (patch)
treeeecfda34983985735136a5f03f079d7980782980 /gdbstub.c
parentMerge branch 'qemu-cvs' (diff)
parentFix bug in omap_sx1.c introduced by r6344 (diff)
downloadqemu-kvm-387d250558fc7cf9c501fedd8dce8500d1bf949d.tar.gz
qemu-kvm-387d250558fc7cf9c501fedd8dce8500d1bf949d.tar.bz2
qemu-kvm-387d250558fc7cf9c501fedd8dce8500d1bf949d.zip
Merge branch 'qemu-cvs'
* qemu-cvs: (33 commits) Fix bug in omap_sx1.c introduced by r6344 Fix tosa_dac_recv warning Fix cpu_arm_handle_mmu_fault warning SH4: fix TMU init SH7750/51: add register BCR3, BCR4, PCR, RTCOR, RTCNT, RTCSR, SDMR2, SDMR3 and fix BCR2 support Add it_shift Fix VGA RAM offsets Fix SIGSEGV crash in slirp networking code Add savevm and reset support for OpenPic Revert part of 6531, fix build failure Replace exit() in oom_check with abort() Revert changes to fmopl.c qemu:virtio-net: Add VLAN filtering (Alex Williamson) qemu:virtio-net: Add additional MACs via a filter table (Alex Williamson) qemu:virtio-net: Enable filtering based on MAC, promisc, broadcast and allmulti (Alex Williamson) qemu:virtio-net: Add promiscuous and all-multicast mode bits (Alex Williamson) qemu:virtio-net: Add a virtqueue for control commands from the guest (Alex Williamson) qemu:virtio-net: Define ETH_ALEN for use when manipulating MAC addresses (Alex Williamson) qemu:virtio-net: Allow setting the MAC address via set_config (Alex Williamson) qemu:virtio-net: Save status and add some save infrastructure (Alex Williamson) ... Conflicts: qemu/hw/virtio-net.c Signed-off-by: Avi Kivity <avi@redhat.com>
Diffstat (limited to 'gdbstub.c')
-rw-r--r--gdbstub.c8
1 files changed, 0 insertions, 8 deletions
diff --git a/gdbstub.c b/gdbstub.c
index e3d5bc9fa..c4d4361fa 100644
--- a/gdbstub.c
+++ b/gdbstub.c
@@ -2201,11 +2201,6 @@ static void gdb_accept(void)
setsockopt(fd, IPPROTO_TCP, TCP_NODELAY, (char *)&val, sizeof(val));
s = qemu_mallocz(sizeof(GDBState));
- if (!s) {
- errno = ENOMEM;
- perror("accept");
- return;
- }
memset (s, 0, sizeof (GDBState));
s->c_cpu = first_cpu;
@@ -2323,9 +2318,6 @@ int gdbserver_start(const char *port)
return -1;
s = qemu_mallocz(sizeof(GDBState));
- if (!s) {
- return -1;
- }
s->c_cpu = first_cpu;
s->g_cpu = first_cpu;
s->chr = chr;