diff options
author | Robert Mustacchi <rm@joyent.com> | 2012-11-19 18:24:59 +0000 |
---|---|---|
committer | Robert Mustacchi <rm@joyent.com> | 2012-11-19 18:26:03 +0000 |
commit | 67c6e40d7b25b6f5ed6230b2c5b30252109911f2 (patch) | |
tree | a9d4c0f2ea655fdca7cea9656926b361c233fc5e | |
parent | 13dfaebd3210f7ec17f040db63ed2bc09ab7f6e6 (diff) | |
download | illumos-kvm-cmd-67c6e40d7b25b6f5ed6230b2c5b30252109911f2.tar.gz |
-rw-r--r-- | monitor.c | 4 | ||||
-rw-r--r-- | sysemu.h | 1 | ||||
-rw-r--r-- | vl.c | 2 |
3 files changed, 5 insertions, 2 deletions
@@ -2617,8 +2617,8 @@ static void do_info_status_print(Monitor *mon, const QObject *data) static void do_info_status(Monitor *mon, QObject **ret_data) { - *ret_data = qobject_from_jsonf("{ 'running': %i, 'singlestep': %i }", - vm_running, singlestep); + *ret_data = qobject_from_jsonf("{ 'running': %i, 'singlestep': %i, 'hwsetup': %i }", + vm_running, singlestep, vm_setup); } static qemu_acl *find_acl(Monitor *mon, const char *name) @@ -25,6 +25,7 @@ extern const char *bios_name; char *qemu_find_file(int type, const char *name); extern int vm_running; +extern int vm_setup; extern const char *qemu_name; extern uint8_t qemu_uuid[]; int qemu_uuid_parse(const char *str, uint8_t *uuid); @@ -187,6 +187,7 @@ int mem_prealloc = 0; /* force preallocation of physical target memory */ int nb_nics; NICInfo nd_table[MAX_NICS]; int vm_running; +int vm_setup = 0; int autostart; int incoming_expected; /* Started with -incoming and waiting for incoming */ static int rtc_utc = 1; @@ -3169,6 +3170,7 @@ int main(int argc, char **argv, char **envp) } qdev_machine_creation_done(); + vm_setup = 1; if (rom_load_all() != 0) { fprintf(stderr, "rom loading failed\n"); |