Re: [Qemu-devel] [PATCH 2/2] qemu-config: convert all QemuOpts to use dashes instead of underscores

[Anthony Liguori]

Luiz Capitulino <address@hidden> writes:

> On Wed, 25 Jul 2012 11:25:43 -0500
> Anthony Liguori <address@hidden> wrote:
>
>> Signed-off-by: Anthony Liguori <address@hidden>
>
> What about the man page? Should it be updated or are we going to let it
> list options with "_"?

The man page is generated from qemu-options.hx which also generates the
help output.

Unfortunately, we're still stuck in the "everyone yells at Anthony when
he tries to change the help output because of libvirt" state.

So we need to keep the option names in --help with '_'s.

Regards,

Anthony Liguori

>
>> ---
>>  qemu-config.c |   38 +++++++++++++++++++-------------------
>>  1 files changed, 19 insertions(+), 19 deletions(-)
>> 
>> diff --git a/qemu-config.c b/qemu-config.c
>> index 5c3296b..1616547 100644
>> --- a/qemu-config.c
>> +++ b/qemu-config.c
>> @@ -91,11 +91,11 @@ static QemuOptsList qemu_drive_opts = {
>>              .type = QEMU_OPT_NUMBER,
>>              .help = "limit total I/O operations per second",
>>          },{
>> -            .name = "iops_rd",
>> +            .name = "iops-rd",
>>              .type = QEMU_OPT_NUMBER,
>>              .help = "limit read operations per second",
>>          },{
>> -            .name = "iops_wr",
>> +            .name = "iops-wr",
>>              .type = QEMU_OPT_NUMBER,
>>              .help = "limit write operations per second",
>>          },{
>> @@ -103,11 +103,11 @@ static QemuOptsList qemu_drive_opts = {
>>              .type = QEMU_OPT_NUMBER,
>>              .help = "limit total bytes per second",
>>          },{
>> -            .name = "bps_rd",
>> +            .name = "bps-rd",
>>              .type = QEMU_OPT_NUMBER,
>>              .help = "limit read bytes per second",
>>          },{
>> -            .name = "bps_wr",
>> +            .name = "bps-wr",
>>              .type = QEMU_OPT_NUMBER,
>>              .help = "limit write bytes per second",
>>          },{
>> @@ -230,7 +230,7 @@ QemuOptsList qemu_fsdev_opts = {
>>              .name = "path",
>>              .type = QEMU_OPT_STRING,
>>          }, {
>> -            .name = "security_model",
>> +            .name = "security-model",
>>              .type = QEMU_OPT_STRING,
>>          }, {
>>              .name = "writeout",
>> @@ -243,7 +243,7 @@ QemuOptsList qemu_fsdev_opts = {
>>              .name = "socket",
>>              .type = QEMU_OPT_STRING,
>>          }, {
>> -            .name = "sock_fd",
>> +            .name = "sock-fd",
>>              .type = QEMU_OPT_NUMBER,
>>          },
>>  
>> @@ -263,10 +263,10 @@ QemuOptsList qemu_virtfs_opts = {
>>              .name = "path",
>>              .type = QEMU_OPT_STRING,
>>          }, {
>> -            .name = "mount_tag",
>> +            .name = "mount-tag",
>>              .type = QEMU_OPT_STRING,
>>          }, {
>> -            .name = "security_model",
>> +            .name = "security-model",
>>              .type = QEMU_OPT_STRING,
>>          }, {
>>              .name = "writeout",
>> @@ -278,7 +278,7 @@ QemuOptsList qemu_virtfs_opts = {
>>              .name = "socket",
>>              .type = QEMU_OPT_STRING,
>>          }, {
>> -            .name = "sock_fd",
>> +            .name = "sock-fd",
>>              .type = QEMU_OPT_NUMBER,
>>          },
>>  
>> @@ -423,25 +423,25 @@ static QemuOptsList qemu_cpudef_opts = {
>>              .name = "stepping",
>>              .type = QEMU_OPT_NUMBER,
>>          },{
>> -            .name = "feature_edx",      /* cpuid 0000_0001.edx */
>> +            .name = "feature-edx",
>>              .type = QEMU_OPT_STRING,
>>          },{
>> -            .name = "feature_ecx",      /* cpuid 0000_0001.ecx */
>> +            .name = "feature-ecx",
>>              .type = QEMU_OPT_STRING,
>>          },{
>> -            .name = "extfeature_edx",   /* cpuid 8000_0001.edx */
>> +            .name = "extfeature-edx",
>>              .type = QEMU_OPT_STRING,
>>          },{
>> -            .name = "extfeature_ecx",   /* cpuid 8000_0001.ecx */
>> +            .name = "extfeature-ecx",
>>              .type = QEMU_OPT_STRING,
>>          },{
>>              .name = "xlevel",
>>              .type = QEMU_OPT_NUMBER,
>>          },{
>> -            .name = "model_id",
>> +            .name = "model-id",
>>              .type = QEMU_OPT_STRING,
>>          },{
>> -            .name = "vendor_override",
>> +            .name = "vendor-override",
>>              .type = QEMU_OPT_NUMBER,
>>          },
>>          { /* end of list */ }
>> @@ -560,11 +560,11 @@ static QemuOptsList qemu_machine_opts = {
>>              .type = QEMU_OPT_STRING,
>>              .help = "accelerator list",
>>          }, {
>> -            .name = "kernel_irqchip",
>> +            .name = "kernel-irqchip",
>>              .type = QEMU_OPT_BOOL,
>>              .help = "use KVM in-kernel irqchip",
>>          }, {
>> -            .name = "kvm_shadow_mem",
>> +            .name = "kvm_shadow-mem",
>>              .type = QEMU_OPT_SIZE,
>>              .help = "KVM shadow MMU size",
>>          }, {
>> @@ -588,11 +588,11 @@ static QemuOptsList qemu_machine_opts = {
>>              .type = QEMU_OPT_STRING,
>>              .help = "Dump current dtb to a file and quit",
>>          }, {
>> -            .name = "phandle_start",
>> +            .name = "phandle-start",
>>              .type = QEMU_OPT_STRING,
>>              .help = "The first phandle ID we may generate dynamically",
>>          }, {
>> -            .name = "dt_compatible",
>> +            .name = "dt-compatible",
>>              .type = QEMU_OPT_STRING,
>>              .help = "Overrides the \"compatible\" property of the dt root 
>> node",
>>          },