Revision 7d932dfd hw/pc.c

b/hw/pc.c
943 943
    int i;
944 944
    DriveInfo *fd[MAX_FD];
945 945
    PITState *pit;
946
    qemu_irq rtc_irq = NULL;
946 947
    qemu_irq *a20_line;
947 948
    ISADevice *i8042;
948 949
    qemu_irq *cpu_exit_irq;
......
951 952

  
952 953
    register_ioport_write(0xf0, 1, 1, ioportF0_write, NULL);
953 954

  
954
    *rtc_state = rtc_init(2000);
955

  
956
    qemu_register_boot_set(pc_boot_set, *rtc_state);
957

  
958
    pit = pit_init(0x40, isa_reserve_irq(0));
959
    pcspk_init(pit);
960 955
    if (!no_hpet) {
961 956
        DeviceState *hpet = sysbus_create_simple("hpet", HPET_BASE, NULL);
962 957

  
963 958
        for (i = 0; i < 24; i++) {
964 959
            sysbus_connect_irq(sysbus_from_qdev(hpet), i, isa_irq[i]);
965 960
        }
961
        rtc_irq = qdev_get_gpio_in(hpet, 0);
966 962
    }
963
    *rtc_state = rtc_init(2000, rtc_irq);
964

  
965
    qemu_register_boot_set(pc_boot_set, *rtc_state);
966

  
967
    pit = pit_init(0x40, isa_reserve_irq(0));
968
    pcspk_init(pit);
967 969

  
968 970
    for(i = 0; i < MAX_SERIAL_PORTS; i++) {
969 971
        if (serial_hds[i]) {

Also available in: Unified diff