Revision f96fc8a0 monitor.c

b/monitor.c
426 426
}
427 427
#endif
428 428

  
429
static void do_quit(Monitor *mon)
429
static void do_quit(Monitor *mon, const QDict *qdict)
430 430
{
431 431
    exit(0);
432 432
}
......
559 559
    }
560 560
}
561 561

  
562
static void do_stop(Monitor *mon)
562
static void do_stop(Monitor *mon, const QDict *qdict)
563 563
{
564 564
    vm_stop(EXCP_INTERRUPT);
565 565
}
......
571 571
    int err;
572 572
};
573 573

  
574
static void do_cont(Monitor *mon)
574
static void do_cont(Monitor *mon, const QDict *qdict)
575 575
{
576 576
    struct bdrv_iterate_context context = { mon, 0 };
577 577

  
......
587 587

  
588 588
    /* another key was set successfully, retry to continue */
589 589
    if (!err)
590
        do_cont(mon);
590
        do_cont(mon, NULL);
591 591
}
592 592

  
593 593
static void encrypted_bdrv_it(void *opaque, BlockDriverState *bs)
......
1238 1238
    }
1239 1239
}
1240 1240

  
1241
static void do_system_reset(Monitor *mon)
1241
static void do_system_reset(Monitor *mon, const QDict *qdict)
1242 1242
{
1243 1243
    qemu_system_reset_request();
1244 1244
}
1245 1245

  
1246
static void do_system_powerdown(Monitor *mon)
1246
static void do_system_powerdown(Monitor *mon, const QDict *qdict)
1247 1247
{
1248 1248
    qemu_system_powerdown_request();
1249 1249
}
......
2554 2554
    QDict *qdict;
2555 2555
    void *str_allocated[MAX_ARGS];
2556 2556
    void *args[MAX_ARGS];
2557
    void (*handler_0)(Monitor *mon);
2557
    void (*handler_d)(Monitor *mon, const QDict *qdict);
2558 2558
    void (*handler_1)(Monitor *mon, void *arg0);
2559 2559
    void (*handler_2)(Monitor *mon, void *arg0, void *arg1);
2560 2560
    void (*handler_3)(Monitor *mon, void *arg0, void *arg1, void *arg2);
......
2848 2848
    qemu_errors_to_mon(mon);
2849 2849
    switch(nb_args) {
2850 2850
    case 0:
2851
        handler_0 = cmd->handler;
2852
        handler_0(mon);
2851
        handler_d = cmd->handler;
2852
        handler_d(mon, qdict);
2853 2853
        break;
2854 2854
    case 1:
2855 2855
        handler_1 = cmd->handler;

Also available in: Unified diff