← Back to branch summary

~jderose/ubuntu/raring/qemu/vde-again

« back to all changes in this revision

Viewing changes to target-sparc/machine.c

  • Committer: Bazaar Package Importer
  • Author(s): Riku Voipio, Josh Triplett, Riku Voipio
  • Date: 2009-07-29 13:28:05 UTC
  • mfrom: (1.4.1 upstream)
  • mto: (12.1.1 sid) (10.1.13 sid)
  • mto: This revision was merged to the branch mainline in revision 13.
  • Revision ID: james.westby@ubuntu.com-20090729132805-cau7rfexh7dawyb8
Tags: 0.10.50+git20090729-1
[ Josh Triplett ]
* Remove myself from Uploaders.

[ Riku Voipio ]
* new upstream RC version
* nuke all linux-user patches (applied upstream)
  06_exit_segfault
  12_signal_powerpc_support
  21_net_soopts
  30_syscall_ipc
  32_syscall_sysctl
  35_syscall_sockaddr
  48_signal_terminate
  55_unmux_socketcall
* nuke all other applied-upstream patches
  01_nostrip (better version upstream)
  07_i386_exec_name (can be reintroduced in debian/rules)
  50_linuxbios_isa_bios_ram (shouldn't be needed anymore)
  51_linuxbios_piix_ram_size (applied)
  56_dhcp (crap)
  60_ppc_ld (reintroduce if needed)
  64_ppc_asm_constraints (ditto)
  66_tls_ld.patch (ditto)
  81_compile_dtb.patch (applied upstream)
  82_qemu-img_decimal (ditto)
* move to git
* simplify build rules
* Correct my email address

Show diffs side-by-side

added added

removed removed

Lines of Context:
target-sparc/machine.c
4
4
 
5
5
#include "exec-all.h"
6
6
 
7
 
void register_machines(void)
8
 
{
9
 
#ifdef TARGET_SPARC64
10
 
    qemu_register_machine(&sun4u_machine);
11
 
    qemu_register_machine(&sun4v_machine);
12
 
    qemu_register_machine(&niagara_machine);
13
 
#else
14
 
    qemu_register_machine(&ss5_machine);
15
 
    qemu_register_machine(&ss10_machine);
16
 
    qemu_register_machine(&ss600mp_machine);
17
 
    qemu_register_machine(&ss20_machine);
18
 
    qemu_register_machine(&ss2_machine);
19
 
    qemu_register_machine(&voyager_machine);
20
 
    qemu_register_machine(&ss_lx_machine);
21
 
    qemu_register_machine(&ss4_machine);
22
 
    qemu_register_machine(&scls_machine);
23
 
    qemu_register_machine(&sbook_machine);
24
 
    qemu_register_machine(&ss1000_machine);
25
 
    qemu_register_machine(&ss2000_machine);
26
 
#endif
27
 
}
28
 
 
29
7
void cpu_save(QEMUFile *f, void *opaque)
30
8
{
31
9
    CPUState *env = opaque;
74
52
        qemu_put_be64s(f, &env->dmmuregs[i]);
75
53
    }
76
54
    for (i = 0; i < 64; i++) {
77
 
        qemu_put_be64s(f, &env->itlb_tag[i]);
78
 
        qemu_put_be64s(f, &env->itlb_tte[i]);
79
 
        qemu_put_be64s(f, &env->dtlb_tag[i]);
80
 
        qemu_put_be64s(f, &env->dtlb_tte[i]);
 
55
        qemu_put_be64s(f, &env->itlb[i].tag);
 
56
        qemu_put_be64s(f, &env->itlb[i].tte);
 
57
        qemu_put_be64s(f, &env->dtlb[i].tag);
 
58
        qemu_put_be64s(f, &env->dtlb[i].tte);
81
59
    }
82
60
    qemu_put_be32s(f, &env->mmu_version);
83
61
    for (i = 0; i < MAXTL_MAX; i++) {
170
148
        qemu_get_be64s(f, &env->dmmuregs[i]);
171
149
    }
172
150
    for (i = 0; i < 64; i++) {
173
 
        qemu_get_be64s(f, &env->itlb_tag[i]);
174
 
        qemu_get_be64s(f, &env->itlb_tte[i]);
175
 
        qemu_get_be64s(f, &env->dtlb_tag[i]);
176
 
        qemu_get_be64s(f, &env->dtlb_tte[i]);
 
151
        qemu_get_be64s(f, &env->itlb[i].tag);
 
152
        qemu_get_be64s(f, &env->itlb[i].tte);
 
153
        qemu_get_be64s(f, &env->dtlb[i].tag);
 
154
        qemu_get_be64s(f, &env->dtlb[i].tte);
177
155
    }
178
156
    qemu_get_be32s(f, &env->mmu_version);
179
157
    for (i = 0; i < MAXTL_MAX; i++) {