Commit 287db79d authored by Peter Maydell's avatar Peter Maydell
Browse files

Merge remote-tracking branch 'remotes/ehabkost/tags/x86-pull-request' into staging 



X86 queue, 2016-05-23

# gpg: Signature made Mon 23 May 2016 23:48:27 BST using RSA key ID 984DC5A6
# gpg: Good signature from "Eduardo Habkost <ehabkost@redhat.com>"

* remotes/ehabkost/tags/x86-pull-request:
  target-i386: kvm: Eliminate kvm_msr_entry_set()
  target-i386: kvm: Simplify MSR setting functions
  target-i386: kvm: Simplify MSR array construction
  target-i386: kvm: Increase MSR_BUF_SIZE
  target-i386: kvm: Allocate kvm_msrs struct once per VCPU
  target-i386: Call cpu_exec_init() on realize
  target-i386: Move TCG initialization to realize time
  target-i386: Move TCG initialization check to tcg_x86_init()
  cpu: Eliminate cpudef_init(), cpudef_setup()
  target-i386: Set constant model_id for qemu64/qemu32/athlon
  pc: Set CPU model-id on compat_props for pc <= 2.4
  osdep: Move default qemu_hw_version() value to a macro
  target-i386: kvm: Use X86XSaveArea struct for xsave save/load
  target-i386: Use xsave structs for ext_save_area
  target-i386: Define structs for layout of xsave area

Signed-off-by: default avatarPeter Maydell <peter.maydell@linaro.org>
parents 99694362 1abc2cae

arch_init.c

+0 −7
Original line number Diff line number Diff line
@@ -274,13 +274,6 @@ void do_smbios_option(QemuOpts *opts) 
#endif

}



void cpudef_init(void)

{

#if defined(cpudef_setup)

    cpudef_setup(); /* parse cpu definitions in target config file */

#endif

}



int kvm_available(void)

{

#ifdef CONFIG_KVM

bsd-user/main.c

+0 −3
Original line number Diff line number Diff line
@@ -753,9 +753,6 @@ int main(int argc, char **argv) 
    }



    cpu_model = NULL;

#if defined(cpudef_setup)

    cpudef_setup(); /* parse cpu definitions in target config file (TBD) */

#endif



    optind = 1;

    for(;;) {

hw/i386/pc_piix.c

+13 −0
Original line number Diff line number Diff line
@@ -582,6 +582,7 @@ DEFINE_I440FX_MACHINE(v1_4, "pc-i440fx-1.4", pc_compat_1_4, 




#define PC_COMPAT_1_3 \

        PC_CPU_MODEL_IDS("1.3.0") \

        {\

            .driver   = "usb-tablet",\

            .property = "usb_version",\
@@ -613,6 +614,7 @@ DEFINE_I440FX_MACHINE(v1_3, "pc-1.3", pc_compat_1_3, 




#define PC_COMPAT_1_2 \

        PC_CPU_MODEL_IDS("1.2.0") \

        {\

            .driver   = "nec-usb-xhci",\

            .property = "msi",\
@@ -651,6 +653,7 @@ DEFINE_I440FX_MACHINE(v1_2, "pc-1.2", pc_compat_1_2, 




#define PC_COMPAT_1_1 \

        PC_CPU_MODEL_IDS("1.1.0") \

        {\

            .driver   = "virtio-scsi-pci",\

            .property = "hotplug",\
@@ -693,6 +696,7 @@ DEFINE_I440FX_MACHINE(v1_1, "pc-1.1", pc_compat_1_2, 




#define PC_COMPAT_1_0 \

        PC_CPU_MODEL_IDS("1.0") \

        {\

            .driver   = TYPE_ISA_FDC,\

            .property = "check_media_rate",\
@@ -722,10 +726,14 @@ DEFINE_I440FX_MACHINE(v1_0, "pc-1.0", pc_compat_1_2, 
                      pc_i440fx_1_0_machine_options);





#define PC_COMPAT_0_15 \

        PC_CPU_MODEL_IDS("0.15")



static void pc_i440fx_0_15_machine_options(MachineClass *m)

{

    pc_i440fx_1_0_machine_options(m);

    m->hw_version = "0.15";

    SET_MACHINE_COMPAT(m, PC_COMPAT_0_15);

}



DEFINE_I440FX_MACHINE(v0_15, "pc-0.15", pc_compat_1_2,
@@ -733,6 +741,7 @@ DEFINE_I440FX_MACHINE(v0_15, "pc-0.15", pc_compat_1_2, 




#define PC_COMPAT_0_14 \

        PC_CPU_MODEL_IDS("0.14") \

        {\

            .driver   = "virtio-blk-pci",\

            .property = "event_idx",\
@@ -771,6 +780,7 @@ DEFINE_I440FX_MACHINE(v0_14, "pc-0.14", pc_compat_1_2, 




#define PC_COMPAT_0_13 \

        PC_CPU_MODEL_IDS("0.13") \

        {\

            .driver   = TYPE_PCI_DEVICE,\

            .property = "command_serr_enable",\
@@ -807,6 +817,7 @@ DEFINE_I440FX_MACHINE(v0_13, "pc-0.13", pc_compat_0_13, 




#define PC_COMPAT_0_12 \

        PC_CPU_MODEL_IDS("0.12") \

        {\

            .driver   = "virtio-serial-pci",\

            .property = "max_ports",\
@@ -841,6 +852,7 @@ DEFINE_I440FX_MACHINE(v0_12, "pc-0.12", pc_compat_0_13, 




#define PC_COMPAT_0_11 \

        PC_CPU_MODEL_IDS("0.11") \

        {\

            .driver   = "virtio-blk-pci",\

            .property = "vectors",\
@@ -871,6 +883,7 @@ DEFINE_I440FX_MACHINE(v0_11, "pc-0.11", pc_compat_0_13, 




#define PC_COMPAT_0_10 \

    PC_CPU_MODEL_IDS("0.10") \

    {\

        .driver   = "virtio-blk-pci",\

        .property = "class",\

include/hw/i386/pc.h

+29 −0
Original line number Diff line number Diff line
@@ -359,8 +359,29 @@ bool e820_get_entry(int, uint32_t, uint64_t *, uint64_t *); 
#define PC_COMPAT_2_5 \

    HW_COMPAT_2_5



/* Helper for setting model-id for CPU models that changed model-id

 * depending on QEMU versions up to QEMU 2.4.

 */

#define PC_CPU_MODEL_IDS(v) \

    {\

        .driver   = "qemu32-" TYPE_X86_CPU,\

        .property = "model-id",\

        .value    = "QEMU Virtual CPU version " v,\

    },\

    {\

        .driver   = "qemu64-" TYPE_X86_CPU,\

        .property = "model-id",\

        .value    = "QEMU Virtual CPU version " v,\

    },\

    {\

        .driver   = "athlon-" TYPE_X86_CPU,\

        .property = "model-id",\

        .value    = "QEMU Virtual CPU version " v,\

    },



#define PC_COMPAT_2_4 \

    HW_COMPAT_2_4 \

    PC_CPU_MODEL_IDS("2.4.0") \

    {\

        .driver   = "Haswell-" TYPE_X86_CPU,\

        .property = "abm",\
@@ -431,6 +452,7 @@ bool e820_get_entry(int, uint32_t, uint64_t *, uint64_t *); 


#define PC_COMPAT_2_3 \

    HW_COMPAT_2_3 \

    PC_CPU_MODEL_IDS("2.3.0") \

    {\

        .driver   = TYPE_X86_CPU,\

        .property = "arat",\
@@ -511,6 +533,7 @@ bool e820_get_entry(int, uint32_t, uint64_t *, uint64_t *); 


#define PC_COMPAT_2_2 \

    HW_COMPAT_2_2 \

    PC_CPU_MODEL_IDS("2.3.0") \

    {\

        .driver = "kvm64" "-" TYPE_X86_CPU,\

        .property = "vme",\
@@ -604,6 +627,7 @@ bool e820_get_entry(int, uint32_t, uint64_t *, uint64_t *); 


#define PC_COMPAT_2_1 \

    HW_COMPAT_2_1 \

    PC_CPU_MODEL_IDS("2.1.0") \

    {\

        .driver = "coreduo" "-" TYPE_X86_CPU,\

        .property = "vmx",\
@@ -616,6 +640,7 @@ bool e820_get_entry(int, uint32_t, uint64_t *, uint64_t *); 
    },



#define PC_COMPAT_2_0 \

    PC_CPU_MODEL_IDS("2.0.0") \

    {\

        .driver   = "virtio-scsi-pci",\

        .property = "any_layout",\
@@ -675,6 +700,7 @@ bool e820_get_entry(int, uint32_t, uint64_t *, uint64_t *); 
    },



#define PC_COMPAT_1_7 \

    PC_CPU_MODEL_IDS("1.7.0") \

    {\

        .driver   = TYPE_USB_DEVICE,\

        .property = "msos-desc",\
@@ -692,6 +718,7 @@ bool e820_get_entry(int, uint32_t, uint64_t *, uint64_t *); 
    },



#define PC_COMPAT_1_6 \

    PC_CPU_MODEL_IDS("1.6.0") \

    {\

        .driver   = "e1000",\

        .property = "mitigation",\
@@ -715,6 +742,7 @@ bool e820_get_entry(int, uint32_t, uint64_t *, uint64_t *); 
    },



#define PC_COMPAT_1_5 \

    PC_CPU_MODEL_IDS("1.5.0") \

    {\

        .driver   = "Conroe-" TYPE_X86_CPU,\

        .property = "model",\
@@ -758,6 +786,7 @@ bool e820_get_entry(int, uint32_t, uint64_t *, uint64_t *); 
    },



#define PC_COMPAT_1_4 \

    PC_CPU_MODEL_IDS("1.4.0") \

    {\

        .driver   = "scsi-hd",\

        .property = "discard_granularity",\

include/qemu/osdep.h

+9 −0
Original line number Diff line number Diff line
@@ -327,6 +327,15 @@ static inline void qemu_timersub(const struct timeval *val1, 


void qemu_set_cloexec(int fd);



/* Starting on QEMU 2.5, qemu_hw_version() returns "2.5+" by default

 * instead of QEMU_VERSION, so setting hw_version on MachineClass

 * is no longer mandatory.

 *

 * Do NOT change this string, or it will break compatibility on all

 * machine classes that don't set hw_version.

 */

#define QEMU_HW_VERSION "2.5+"



/* QEMU "hardware version" setting. Used to replace code that exposed

 * QEMU_VERSION to guests in the past and need to keep compatibility.

 * Do not use qemu_hw_version() in new code.