diff options
author | Marcelo Tosatti <mtosatti@redhat.com> | 2012-08-23 18:22:43 -0300 |
---|---|---|
committer | Marcelo Tosatti <mtosatti@redhat.com> | 2012-08-23 18:22:43 -0300 |
commit | fd21e9bba77fbe8516e6f7f2c634372611b942ec (patch) | |
tree | 7634979c847e919f5fcc74a7559318687be3d53d | |
parent | 4144fe9d48c290b390b4e2cdda91fea73036813d (diff) | |
parent | 94159135cb59684853dcd45ff70d6dbc54a29209 (diff) |
Merge commit '94159135cb59684853dcd45ff70d6dbc54a29209' into upstream-merge
* commit '94159135cb59684853dcd45ff70d6dbc54a29209':
target-mips: Enable access to required RDHWR hardware registers
monitor: move json init from OPEN event to init
boards: add a 'none' machine type to all platforms
Update version for 1.2.0-rc1 release
Signed-off-by: Marcelo Tosatti <mtosatti@redhat.com>
-rw-r--r-- | VERSION | 2 | ||||
-rw-r--r-- | hw/Makefile.objs | 2 | ||||
-rw-r--r-- | hw/null-machine.c | 40 | ||||
-rw-r--r-- | monitor.c | 4 | ||||
-rw-r--r-- | target-mips/translate.c | 5 |
5 files changed, 49 insertions, 4 deletions
@@ -1 +1 @@ -1.1.90 +1.1.91 diff --git a/hw/Makefile.objs b/hw/Makefile.objs index d4cf49d13..850b87b02 100644 --- a/hw/Makefile.objs +++ b/hw/Makefile.objs @@ -135,6 +135,8 @@ hw-obj-$(CONFIG_DP8393X) += dp8393x.o hw-obj-$(CONFIG_DS1225Y) += ds1225y.o hw-obj-$(CONFIG_MIPSNET) += mipsnet.o +hw-obj-y += null-machine.o + # Sound sound-obj-y = sound-obj-$(CONFIG_SB16) += sb16.o diff --git a/hw/null-machine.c b/hw/null-machine.c new file mode 100644 index 000000000..69910d399 --- /dev/null +++ b/hw/null-machine.c @@ -0,0 +1,40 @@ +/* + * Empty machine + * + * Copyright IBM, Corp. 2012 + * + * Authors: + * Anthony Liguori <aliguori@us.ibm.com> + * + * This work is licensed under the terms of the GNU GPL, version 2 or later. + * See the COPYING file in the top-level directory. + * + */ + +#include "qemu-common.h" +#include "hw/hw.h" +#include "hw/boards.h" + +static void machine_none_init(ram_addr_t ram_size, + const char *boot_device, + const char *kernel_filename, + const char *kernel_cmdline, + const char *initrd_filename, + const char *cpu_model) +{ +} + +static QEMUMachine machine_none = { + .name = "none", + .desc = "empty machine", + .init = machine_none_init, + .max_cpus = 0, +}; + +static void register_machines(void) +{ + qemu_register_machine(&machine_none); +} + +machine_init(register_machines); + @@ -4853,7 +4853,6 @@ static void monitor_control_event(void *opaque, int event) switch (event) { case CHR_EVENT_OPENED: mon->mc->command_mode = 0; - json_message_parser_init(&mon->mc->parser, handle_qmp_command); data = get_qmp_greeting(); monitor_json_emitter(mon, data); qobject_decref(data); @@ -4861,6 +4860,7 @@ static void monitor_control_event(void *opaque, int event) break; case CHR_EVENT_CLOSED: json_message_parser_destroy(&mon->mc->parser); + json_message_parser_init(&mon->mc->parser, handle_qmp_command); mon_refcount--; monitor_fdsets_cleanup(); break; @@ -4972,6 +4972,8 @@ void monitor_init(CharDriverState *chr, int flags) monitor_event, mon); } + json_message_parser_init(&mon->mc->parser, handle_qmp_command); + QLIST_INSERT_HEAD(&mon_list, mon, entry); if (!default_mon || (flags & MONITOR_IS_DEFAULT)) default_mon = mon; diff --git a/target-mips/translate.c b/target-mips/translate.c index 47daf8574..d643676e5 100644 --- a/target-mips/translate.c +++ b/target-mips/translate.c @@ -12768,8 +12768,9 @@ void cpu_state_reset(CPUMIPSState *env) #if defined(CONFIG_USER_ONLY) env->hflags = MIPS_HFLAG_UM; - /* Enable access to the SYNCI_Step register. */ - env->CP0_HWREna |= (1 << 1); + /* Enable access to the CPUNum, SYNCI_Step, CC, and CCRes RDHWR + hardware registers. */ + env->CP0_HWREna |= 0x0000000F; if (env->CP0_Config1 & (1 << CP0C1_FP)) { env->hflags |= MIPS_HFLAG_FPU; } |