← Back to branch summary

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

« back to all changes in this revision

Viewing changes to hw/arm_pic.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:
hw/arm_pic.c
8
8
 */
9
9
 
10
10
#include "hw.h"
 
11
#include "pc.h"
11
12
#include "arm-misc.h"
12
13
 
13
14
/* Stub functions for hardware that doesn't exist.  */
14
 
void pic_info(void)
 
15
void pic_info(Monitor *mon)
15
16
{
16
17
}
17
18
 
18
 
void irq_info(void)
 
19
void irq_info(Monitor *mon)
19
20
{
20
21
}
21
22
 
38
39
            cpu_reset_interrupt(env, CPU_INTERRUPT_FIQ);
39
40
        break;
40
41
    default:
41
 
        cpu_abort(env, "arm_pic_cpu_handler: Bad interrput line %d\n", irq);
 
42
        hw_error("arm_pic_cpu_handler: Bad interrput line %d\n", irq);
42
43
    }
43
44
}
44
45