On 2012-10-05 19:28, Marcelo Tosatti wrote:
> On Fri, Oct 05, 2012 at 07:23:26PM +0200, Jan Kiszka wrote:
>> On 2012-10-05 19:13, Marcelo Tosatti wrote:
>>> From: Jan Kiszka <jan.kis...@siemens.com>
>>>
>>> Releases of qemu-kvm will be interrupted at qemu 1.3.0.
>>> Users should switch to plain qemu releases.
>>> To avoid breaking scenarios which are setup with command line
>>> options specific to qemu-kvm, port these switches from qemu-kvm
>>> to qemu.git.
>>>
>>> Port -no-kvm-pit option.
>>>
>>> Signed-off-by: Marcelo Tosatti <mtosa...@redhat.com>
>>>
>>> Index: qemu-compat-kvm/vl.c
>>> ===================================================================
>>> --- qemu-compat-kvm.orig/vl.c
>>> +++ qemu-compat-kvm/vl.c
>>> @@ -3066,6 +3066,11 @@ int main(int argc, char **argv, char **e
>>> machine = machine_parse(optarg);
>>> }
>>> break;
>>> + case QEMU_OPTION_no_kvm_pit: {
>>> + fprintf(stderr, "Warning: KVM PIT can no longer be
>>> disabled "
>>> + "separately.\n");
>>> + break;
>>> + }
>>> case QEMU_OPTION_usb:
>>> usb_enabled = 1;
>>> break;
>>> Index: qemu-compat-kvm/qemu-options.hx
>>> ===================================================================
>>> --- qemu-compat-kvm.orig/qemu-options.hx
>>> +++ qemu-compat-kvm/qemu-options.hx
>>> @@ -2838,6 +2838,9 @@ STEXI
>>> Enable FIPS 140-2 compliance mode.
>>> ETEXI
>>>
>>> +HXCOMM Deprecated (ignored)
>>> +DEF("no-kvm-pit", HAS_ARG, QEMU_OPTION_no_kvm_pit, "", QEMU_ARCH_I386)
>>> +
>>> HXCOMM Deprecated by -machine kernel_irqchip=on|off property
>>> DEF("no-kvm-irqchip", HAS_ARG, QEMU_OPTION_no_kvm_irqchip, "",
>>> QEMU_ARCH_I386)
>>>
>>>
>>>
>>
>> This doesn't emulate anything. It just adds a warning that some long
>> disabled option was used.
>>
>> Jan
>
> It emulates the command line switch. In my mind, "printing a warning"
> can be considered "emulating a command from qemu-kvm". If you prefer
> something else, please let me know the best wording.
>
"Use machine options to emulate..." makes no sense for those
warning-only switches. It makes sense where we translate them and
register the corresponding machine options.
So call this "Issue warning when deprecated -bla is used" or so.
Jan
--
Siemens AG, Corporate Technology, CT RTC ITP SDP-DE
Corporate Competence Center Embedded Linux
