Re: [Qemu-devel] [BUGFIX][PATCH for 2.2 1/1] hw/i386/pc_piix.c: Also pass vmport=off for xenfv machine

[Don Slutz <dslutz@verizon.com>]

On 11/19/14 12:35, Paolo Bonzini wrote:
>
> On 19/11/2014 18:30, Don Slutz wrote:
>> c/s 9b23cfb76b3a5e9eb5cc899eaf2f46bc46d33ba4
>>
>> or
>>
>> c/s b154537ad07598377ebf98252fb7d2aff127983b
>>
>> moved the testing of xen_enabled() from pc_init1() to
>> pc_machine_initfn().
>>
>> xen_enabled() does not return the correct value in
>> pc_machine_initfn() so add vmport=off to xenfv machine to correctly
>> turn off vmport for xen.
>>
>> Drop the call to xen_enabled() in pc_machine_initfn() to reduce
>> potential confusion.
>>
>> Signed-off-by: Don Slutz <dslutz@verizon.com>
>> ---
>>
>> The 1st version of "-machine vmport=off: Allow..." patch did not
>> have this issue.  It was the adjusting to the QOM that introduced
>> it.
>>
>>   hw/i386/pc.c      | 2 +-
>>   hw/i386/pc_piix.c | 2 +-
>>   2 files changed, 2 insertions(+), 2 deletions(-)
>>
>> diff --git a/hw/i386/pc.c b/hw/i386/pc.c
>> index 1205db8..5bfece8 100644
>> --- a/hw/i386/pc.c
>> +++ b/hw/i386/pc.c
>> @@ -1737,7 +1737,7 @@ static void pc_machine_initfn(Object *obj)
>>                           pc_machine_get_max_ram_below_4g,
>>                           pc_machine_set_max_ram_below_4g,
>>                           NULL, NULL, NULL);
>> -    pcms->vmport = !xen_enabled();
>> +    pcms->vmport = true;
>>       object_property_add_bool(obj, PC_MACHINE_VMPORT,
>>                                pc_machine_get_vmport,
>>                                pc_machine_set_vmport,
>> diff --git a/hw/i386/pc_piix.c b/hw/i386/pc_piix.c
>> index 7bb97a4..3268c29 100644
>> --- a/hw/i386/pc_piix.c
>> +++ b/hw/i386/pc_piix.c
>> @@ -914,7 +914,7 @@ static QEMUMachine xenfv_machine = {
>>       .desc = "Xen Fully-virtualized PC",
>>       .init = pc_xen_hvm_init,
>>       .max_cpus = HVM_MAX_VCPUS,
>> -    .default_machine_opts = "accel=xen",
>> +    .default_machine_opts = "accel=xen,vmport=off",
>>       .hot_add_cpu = pc_hot_add_cpu,
>>   };
>>   #endif
>>
> "-M pc -machine accel=xen" should work and, if that's what you want,
> disable the vmport device.  I think this patch is wrong.
>
> Paolo

Well, I also want "-M pc -machine accel=xen,vmport=on" to work. However you
bring up a good point and I will see if I can quickly handled it.

    -Don Slutz