diff --git a/src/qemu_conf.c b/src/qemu_conf.c index ba996525c24bd7640a760226a57ccccffc81692c..a9e5e4efa3ae92ee79938e8f24cc1adc7e870992 100644 --- a/src/qemu_conf.c +++ b/src/qemu_conf.c @@ -527,6 +527,9 @@ static unsigned int qemudComputeCmdFlags(const char *help, flags |= QEMUD_CMD_FLAG_MIGRATE_KVM_STDIO; } + if (version >= 10000) + flags |= QEMUD_CMD_FLAG_0_10; + return flags; } diff --git a/src/qemu_conf.h b/src/qemu_conf.h index fbf2ab91f620469af50f5ed58dd89655ad380e79..1b2d061605e5619305db5c2070fa92d2a07861ca 100644 --- a/src/qemu_conf.h +++ b/src/qemu_conf.h @@ -58,6 +58,11 @@ enum qemud_cmd_flags { QEMUD_CMD_FLAG_KVM = (1 << 13), /* Whether KVM is compiled in */ QEMUD_CMD_FLAG_DRIVE_FORMAT = (1 << 14), /* Is -drive format= avail */ QEMUD_CMD_FLAG_VGA = (1 << 15), /* Is -vga avail */ + + /* features added in qemu-0.10.0 */ + QEMUD_CMD_FLAG_0_10 = (1 << 16), + QEMUD_CMD_FLAG_NET_NAME = QEMUD_CMD_FLAG_0_10, /* -net ...,name=str */ + QEMUD_CMD_FLAG_HOST_NET_ADD = QEMUD_CMD_FLAG_0_10, /* host_net_add monitor command */ }; /* Main driver state */ diff --git a/tests/qemuhelptest.c b/tests/qemuhelptest.c index 73eae542df3acfa287746a9121078903f11b0f30..1948bd1ed6480667b93eb195d6d802ee30480e83 100644 --- a/tests/qemuhelptest.c +++ b/tests/qemuhelptest.c @@ -118,7 +118,8 @@ mymain(int argc, char **argv) QEMUD_CMD_FLAG_MIGRATE_QEMU_EXEC | QEMUD_CMD_FLAG_DRIVE_CACHE_V2 | QEMUD_CMD_FLAG_DRIVE_FORMAT | - QEMUD_CMD_FLAG_VGA, + QEMUD_CMD_FLAG_VGA | + QEMUD_CMD_FLAG_0_10, 10005, 0, 0); DO_TEST("qemu-kvm-0.10.5", QEMUD_CMD_FLAG_VNC_COLON | @@ -133,7 +134,8 @@ mymain(int argc, char **argv) QEMUD_CMD_FLAG_DRIVE_CACHE_V2 | QEMUD_CMD_FLAG_KVM | QEMUD_CMD_FLAG_DRIVE_FORMAT | - QEMUD_CMD_FLAG_VGA, + QEMUD_CMD_FLAG_VGA | + QEMUD_CMD_FLAG_0_10, 10005, 1, 0); DO_TEST("kvm-86", QEMUD_CMD_FLAG_VNC_COLON | @@ -148,7 +150,8 @@ mymain(int argc, char **argv) QEMUD_CMD_FLAG_DRIVE_CACHE_V2 | QEMUD_CMD_FLAG_KVM | QEMUD_CMD_FLAG_DRIVE_FORMAT | - QEMUD_CMD_FLAG_VGA, + QEMUD_CMD_FLAG_VGA | + QEMUD_CMD_FLAG_0_10, 10050, 1, 0); return ret == 0 ? EXIT_SUCCESS : EXIT_FAILURE;