aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAnthony Liguori <aliguori@us.ibm.com>2013-01-21 07:32:22 -0600
committerAnthony Liguori <aliguori@us.ibm.com>2013-01-21 07:32:22 -0600
commite0f01837e104517c7c511c79bb93c8792b7263e5 (patch)
tree3f9c556b4feb377938095ba8e92d563d9234754c
parentf2bdbd5bb4b7869ea48845d5a92979290df6f195 (diff)
parent09a021fb7ceb7255ab106999d7b38ffd92c3bdd6 (diff)
downloadqemu-arm-e0f01837e104517c7c511c79bb93c8792b7263e5.tar.gz
Merge remote-tracking branch 'stefanha/trivial-patches' into staging
# By Stefan Weil (2) and others # Via Stefan Hajnoczi * stefanha/trivial-patches: hw/tpci200: Fix compiler warning (redefined symbol with MinGW) configure: silence pkg-config's check for curses acpitable: open the data file in binary mode hw: Spelling fix in log message
-rwxr-xr-xconfigure2
-rw-r--r--hw/acpi.c2
-rw-r--r--hw/openrisc_sim.c2
-rw-r--r--hw/tpci200.c6
4 files changed, 6 insertions, 6 deletions
diff --git a/configure b/configure
index 4ebb60dedc..6211db9553 100755
--- a/configure
+++ b/configure
@@ -2039,7 +2039,7 @@ fi
if test "$mingw32" = "yes" ; then
curses_list="-lpdcurses"
else
- curses_list="-lncurses:-lcurses:$($pkg_config --libs ncurses)"
+ curses_list="-lncurses:-lcurses:$($pkg_config --libs ncurses 2>/dev/null)"
fi
if test "$curses" != "no" ; then
diff --git a/hw/acpi.c b/hw/acpi.c
index 97617c4ef5..8c9dcc51c4 100644
--- a/hw/acpi.c
+++ b/hw/acpi.c
@@ -104,7 +104,7 @@ int acpi_table_add(const char *t)
/* now read in the data files, reallocating buffer as needed */
for (f = strtok(buf, ":"); f; f = strtok(NULL, ":")) {
- int fd = open(f, O_RDONLY);
+ int fd = open(f, O_RDONLY | O_BINARY);
if (fd < 0) {
fprintf(stderr, "can't open file %s: %s\n", f, strerror(errno));
diff --git a/hw/openrisc_sim.c b/hw/openrisc_sim.c
index fb47cdc82d..6c443ba804 100644
--- a/hw/openrisc_sim.c
+++ b/hw/openrisc_sim.c
@@ -107,7 +107,7 @@ static void openrisc_sim_init(QEMUMachineInitArgs *args)
for (n = 0; n < smp_cpus; n++) {
cpu = cpu_openrisc_init(cpu_model);
if (cpu == NULL) {
- qemu_log("Unable to find CPU defineition!\n");
+ qemu_log("Unable to find CPU definition!\n");
exit(1);
}
qemu_register_reset(main_cpu_reset, cpu);
diff --git a/hw/tpci200.c b/hw/tpci200.c
index e082bca965..a4823fb9f2 100644
--- a/hw/tpci200.c
+++ b/hw/tpci200.c
@@ -31,7 +31,7 @@
#define IP_INT_SPACE_ADDR_MASK 0x3F
#define STATUS_INT(IP, INTNO) BIT((IP) * 2 + (INTNO))
-#define STATUS_TIMEOUT(IP) BIT((IP) + 12)
+#define STATUS_TIME(IP) BIT((IP) + 12)
#define STATUS_ERR_ANY 0xF00
#define CTRL_CLKRATE BIT(0)
@@ -279,9 +279,9 @@ static void tpci200_write_las0(void *opaque, hwaddr addr, uint64_t val,
}
}
- if (val & STATUS_TIMEOUT(i)) {
+ if (val & STATUS_TIME(i)) {
DPRINTF("Clear IP %c timeout\n", 'A' + i);
- s->status &= ~STATUS_TIMEOUT(i);
+ s->status &= ~STATUS_TIME(i);
}
}