diff options
| author | Peter Maydell | 2014-05-28 19:38:38 +0200 |
|---|---|---|
| committer | Peter Maydell | 2014-05-28 19:38:39 +0200 |
| commit | d7d3d6092cb7edc75dc49fb90c86dd5425ab4805 (patch) | |
| tree | ea3820e7a4e5f51bd1b7b51003546ebb70486b70 /hw/sh4/shix.c | |
| parent | Merge remote-tracking branch 'remotes/rth/tcg-next' into staging (diff) | |
| parent | ssi: Name the CS GPIO (diff) | |
| download | qemu-d7d3d6092cb7edc75dc49fb90c86dd5425ab4805.tar.gz qemu-d7d3d6092cb7edc75dc49fb90c86dd5425ab4805.tar.xz qemu-d7d3d6092cb7edc75dc49fb90c86dd5425ab4805.zip | |
Merge remote-tracking branch 'remotes/afaerber/tags/qom-devices-for-peter' into staging
QOM/QTest infrastructure fixes and device conversions
* qom-test extension
* QEMUMachineInitArgs conversion to MachineState
* -machine options turned into /machine properties
* Named GPIO IRQs for devices
# gpg: Signature made Wed 28 May 2014 18:24:04 BST using RSA key ID 3E7E013F
# gpg: Can't check signature: public key not found
* remotes/afaerber/tags/qom-devices-for-peter:
ssi: Name the CS GPIO
qdev: Implement named GPIOs
machine: Make -machine opts properties of MachineState
tests: Check empty QMP output visitor
qapi: Avoid output visitor crashing if it encounters a NULL value
vl.c: Do not set 'type' property in obj_set_property()
machine: Conversion of QEMUMachineInitArgs to MachineState
qom-test: Test qom-list on link<> properties
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Diffstat (limited to 'hw/sh4/shix.c')
| -rw-r--r-- | hw/sh4/shix.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/hw/sh4/shix.c b/hw/sh4/shix.c index 904a966700..7c152b4a3a 100644 --- a/hw/sh4/shix.c +++ b/hw/sh4/shix.c @@ -39,9 +39,9 @@ #define BIOS_FILENAME "shix_bios.bin" #define BIOS_ADDRESS 0xA0000000 -static void shix_init(QEMUMachineInitArgs *args) +static void shix_init(MachineState *machine) { - const char *cpu_model = args->cpu_model; + const char *cpu_model = machine->cpu_model; int ret; SuperHCPU *cpu; struct SH7750State *s; |