Commit d1048bef authored by Don Slutz's avatar Don Slutz Committed by Paolo Bonzini
Browse files

-machine vmport=auto: Fix handling of VMWare ioport emulation for xen 



c/s 9b23cfb7

or

c/s b154537a

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().

Changed vmport from a bool to an enum.  Added the value "auto" to do
the old way.  Move check of xen_enabled() back to pc_init1().

Acked-by: default avatarEric Blake <eblake@redhat.com>
Reviewed-by: default avatarEduardo Habkost <ehabkost@redhat.com>
Signed-off-by: default avatarDon Slutz <dslutz@verizon.com>
Signed-off-by: default avatarPaolo Bonzini <pbonzini@redhat.com>
parent 2528043f

hw/i386/pc.c

+13 −9
Original line number Diff line number Diff line
@@ -61,6 +61,7 @@ 
#include "hw/mem/pc-dimm.h"

#include "trace.h"

#include "qapi/visitor.h"

#include "qapi-visit.h"



/* debug PC/ISA interrupts */

//#define DEBUG_IRQ
@@ -1772,18 +1773,21 @@ static void pc_machine_set_max_ram_below_4g(Object *obj, Visitor *v, 
    pcms->max_ram_below_4g = value;

}



static bool pc_machine_get_vmport(Object *obj, Error **errp)

static void pc_machine_get_vmport(Object *obj, Visitor *v, void *opaque,

                                  const char *name, Error **errp)

{

    PCMachineState *pcms = PC_MACHINE(obj);

    OnOffAuto vmport = pcms->vmport;



    return pcms->vmport;

    visit_type_OnOffAuto(v, &vmport, name, errp);

}



static void pc_machine_set_vmport(Object *obj, bool value, Error **errp)

static void pc_machine_set_vmport(Object *obj, Visitor *v, void *opaque,

                                  const char *name, Error **errp)

{

    PCMachineState *pcms = PC_MACHINE(obj);



    pcms->vmport = value;

    visit_type_OnOffAuto(v, &pcms->vmport, name, errp);

}



static bool pc_machine_get_aligned_dimm(Object *obj, Error **errp)
@@ -1806,11 +1810,11 @@ static void pc_machine_initfn(Object *obj) 
                        pc_machine_set_max_ram_below_4g,

                        NULL, NULL, NULL);



    pcms->vmport = !xen_enabled();

    object_property_add_bool(obj, PC_MACHINE_VMPORT,

    pcms->vmport = ON_OFF_AUTO_AUTO;

    object_property_add(obj, PC_MACHINE_VMPORT, "OnOffAuto",

                        pc_machine_get_vmport,

                        pc_machine_set_vmport,

                             NULL);

                        NULL, NULL, NULL);



    pcms->enforce_aligned_dimm = true;

    object_property_add_bool(obj, PC_MACHINE_ENFORCE_ALIGNED_DIMM,

hw/i386/pc_piix.c

+6 −1
Original line number Diff line number Diff line
@@ -234,9 +234,14 @@ static void pc_init1(MachineState *machine, 


    pc_vga_init(isa_bus, pci_enabled ? pci_bus : NULL);



    assert(pc_machine->vmport != ON_OFF_AUTO_MAX);

    if (pc_machine->vmport == ON_OFF_AUTO_AUTO) {

        pc_machine->vmport = xen_enabled() ? ON_OFF_AUTO_OFF : ON_OFF_AUTO_ON;

    }



    /* init basic PC hardware */

    pc_basic_device_init(isa_bus, gsi, &rtc_state, &floppy,

                         !pc_machine->vmport, 0x4);

                         (pc_machine->vmport != ON_OFF_AUTO_ON), 0x4);



    pc_nic_init(isa_bus, pci_bus);

hw/i386/pc_q35.c

+6 −1
Original line number Diff line number Diff line
@@ -242,9 +242,14 @@ static void pc_q35_init(MachineState *machine) 


    pc_register_ferr_irq(gsi[13]);



    assert(pc_machine->vmport != ON_OFF_AUTO_MAX);

    if (pc_machine->vmport == ON_OFF_AUTO_AUTO) {

        pc_machine->vmport = xen_enabled() ? ON_OFF_AUTO_OFF : ON_OFF_AUTO_ON;

    }



    /* init basic PC hardware */

    pc_basic_device_init(isa_bus, gsi, &rtc_state, &floppy,

                         !pc_machine->vmport, 0xff0104);

                         (pc_machine->vmport != ON_OFF_AUTO_ON), 0xff0104);



    /* connect pm stuff to lpc */

    ich9_lpc_pm_init(lpc);

include/hw/i386/pc.h

+1 −1
Original line number Diff line number Diff line
@@ -39,7 +39,7 @@ struct PCMachineState { 
    ISADevice *rtc;



    uint64_t max_ram_below_4g;

    bool vmport;

    OnOffAuto vmport;

    bool enforce_aligned_dimm;

};

qapi/common.json

+15 −0
Original line number Diff line number Diff line
@@ -87,3 +87,18 @@ 
##

{ 'command': 'query-commands', 'returns': ['CommandInfo'] }



##

# @OnOffAuto

#

# An enumeration of three options: on, off, and auto

#

# @auto: QEMU selects the value between on and off

#

# @on: Enabled

#

# @off: Disabled

#

# Since: 2.2

##

{ 'enum': 'OnOffAuto',

  'data': [ 'auto', 'on', 'off' ] }