summaryrefslogtreecommitdiff
path: root/linux-user
diff options
context:
space:
mode:
authorbellard <bellard@c046a42c-6fe2-441c-8c8c-71466251a162>2003-03-23 20:17:16 +0000
committerbellard <bellard@c046a42c-6fe2-441c-8c8c-71466251a162>2003-03-23 20:17:16 +0000
commit3ef693a03205217a5def9318b443c8cb6de17217 (patch)
treefa12f6de6be59ef2324b119ec0971ec28fa98266 /linux-user
parentb03c60f35194db4ba1f53673ab02ade29f54701e (diff)
distribution patches
git-svn-id: svn://svn.savannah.nongnu.org/qemu/trunk@44 c046a42c-6fe2-441c-8c8c-71466251a162
Diffstat (limited to 'linux-user')
-rw-r--r--linux-user/elfload.c2
-rw-r--r--linux-user/main.c10
-rw-r--r--linux-user/signal.c4
-rw-r--r--linux-user/syscall.c2
4 files changed, 8 insertions, 10 deletions
diff --git a/linux-user/elfload.c b/linux-user/elfload.c
index 285d8f5c73..44ac577c0c 100644
--- a/linux-user/elfload.c
+++ b/linux-user/elfload.c
@@ -10,7 +10,7 @@
#include <stdlib.h>
#include <string.h>
-#include "gemu.h"
+#include "qemu.h"
#include "linux_bin.h"
#include "elf.h"
diff --git a/linux-user/main.c b/linux-user/main.c
index fba23a0132..2899934266 100644
--- a/linux-user/main.c
+++ b/linux-user/main.c
@@ -1,5 +1,5 @@
/*
- * gemu main
+ * qemu main
*
* Copyright (c) 2003 Fabrice Bellard
*
@@ -24,11 +24,11 @@
#include <errno.h>
#include <unistd.h>
-#include "gemu.h"
+#include "qemu.h"
#include "cpu-i386.h"
-#define DEBUG_LOGFILE "/tmp/gemu.log"
+#define DEBUG_LOGFILE "/tmp/qemu.log"
FILE *logfile = NULL;
int loglevel;
@@ -171,8 +171,8 @@ void cpu_loop(struct CPUX86State *env)
void usage(void)
{
- printf("gemu version " GEMU_VERSION ", Copyright (c) 2003 Fabrice Bellard\n"
- "usage: gemu [-d] program [arguments...]\n"
+ printf("qemu version " QEMU_VERSION ", Copyright (c) 2003 Fabrice Bellard\n"
+ "usage: qemu [-d] program [arguments...]\n"
"Linux x86 emulator\n"
);
exit(1);
diff --git a/linux-user/signal.c b/linux-user/signal.c
index 3e792ae699..72b2f79927 100644
--- a/linux-user/signal.c
+++ b/linux-user/signal.c
@@ -25,9 +25,7 @@
#include <errno.h>
#include <sys/ucontext.h>
-#include "gemu.h"
-
-/* signal handling inspired from em86. */
+#include "qemu.h"
//#define DEBUG_SIGNAL
diff --git a/linux-user/syscall.c b/linux-user/syscall.c
index 8050e29a0b..5f02fb72e6 100644
--- a/linux-user/syscall.c
+++ b/linux-user/syscall.c
@@ -56,7 +56,7 @@
#include <linux/soundcard.h>
#include <linux/dirent.h>
-#include "gemu.h"
+#include "qemu.h"
//#define DEBUG