Commit 3ef4ebcc authored by Peter Maydell's avatar Peter Maydell
Browse files

Merge remote-tracking branch 'remotes/bonzini/tags/for-upstream' into staging 



The final 2.2 patches from me.

# gpg: Signature made Wed 26 Nov 2014 11:12:25 GMT using RSA key ID 78C7AE83
# gpg: Good signature from "Paolo Bonzini <bonzini@gnu.org>"
# gpg:                 aka "Paolo Bonzini <pbonzini@redhat.com>"
# gpg: WARNING: This key is not certified with sufficiently trusted signatures!
# gpg:          It is not certain that the signature belongs to the owner.
# Primary key fingerprint: 46F5 9FBD 57D6 12E7 BFD4  E2F7 7E15 100C CD36 69B1
#      Subkey fingerprint: F133 3857 4B66 2389 866C  7682 BFFB D25F 78C7 AE83

* remotes/bonzini/tags/for-upstream:
  s390x/kvm: Fix compile error
  fw_cfg: fix boot order bug when dynamically modified via QOM
  -machine vmport=auto: Fix handling of VMWare ioport emulation for xen

Signed-off-by: default avatarPeter Maydell <peter.maydell@linaro.org>
parents 2528043f dc622deb

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);

hw/nvram/fw_cfg.c

+5 −2
Original line number Diff line number Diff line
@@ -523,6 +523,7 @@ void *fw_cfg_modify_file(FWCfgState *s, const char *filename, 
                        void *data, size_t len)

{

    int i, index;

    void *ptr = NULL;



    assert(s->files);
@@ -531,8 +532,10 @@ void *fw_cfg_modify_file(FWCfgState *s, const char *filename, 


    for (i = 0; i < index; i++) {

        if (strcmp(filename, s->files->f[i].name) == 0) {

            return fw_cfg_modify_bytes_read(s, FW_CFG_FILE_FIRST + i,

            ptr = fw_cfg_modify_bytes_read(s, FW_CFG_FILE_FIRST + i,

                                           data, len);

            s->files->f[i].size   = cpu_to_be32(len);

            return ptr;

        }

    }

    /* add new one */

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;

};