sim-card
/
qemu
Archived
10
0
Fork 0
Code Releases Activity

monitor: Convert do_cont() to QObject 

Appropriate error handling support will be needed to have
encrypted images working under the future machine protocol,
but this initial conversion will work with the current
user protocol.

Patchworks-ID: 35348
Signed-off-by: Luiz Capitulino <lcapitulino@redhat.com>
Signed-off-by: Anthony Liguori <aliguori@us.ibm.com>
This commit is contained in:
Luiz Capitulino 2009-10-07 13:42:00 -03:00 committed by Anthony Liguori
parent 4307666463
commit a1f896a041
2 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
monitor.c
View File

@ -614,7 +614,10 @@ struct bdrv_iterate_context {
int err;
};
static void do_cont(Monitor *mon, const QDict *qdict)
/**
* do_cont(): Resume emulation.
*/
static void do_cont(Monitor *mon, const QDict *qdict, QObject **ret_data)
{
struct bdrv_iterate_context context = { mon, 0 };
@ -630,7 +633,7 @@ static void bdrv_key_cb(void *opaque, int err)
/* another key was set successfully, retry to continue */
if (!err)
do_cont(mon, NULL);
do_cont(mon, NULL, NULL);
}
static void encrypted_bdrv_it(void *opaque, BlockDriverState *bs)

3
qemu-monitor.hx
View File

@ -301,7 +301,8 @@ ETEXI
.args_type = "",
.params = "",
.help = "resume emulation",
.mhandler.cmd = do_cont,
.user_print = monitor_user_noop,
.mhandler.cmd_new = do_cont,
},
STEXI