Commit 43552994 authored by Anthony Liguori's avatar Anthony Liguori
Browse files

Merge remote-tracking branch 'qemu-kvm/uq/master' into staging 



* qemu-kvm/uq/master: (28 commits)
  update-linux-headers.sh: Handle new kernel uapi/ directories
  target-i386: kvm_cpu_fill_host: use GET_SUPPORTED_CPUID
  target-i386: cpu: make -cpu host/check/enforce code KVM-specific
  target-i386: make cpu_x86_fill_host() void
  Emulate qemu-kvms -no-kvm option
  Issue warning when deprecated -tdf option is used
  Issue warning when deprecated drive parameter boot=on|off is used
  Use global properties to emulate -no-kvm-pit-reinjection
  Issue warning when deprecated -no-kvm-pit is used
  Use machine options to emulate -no-kvm-irqchip
  cirrus_vga: allow configurable vram size
  target-i386: Add missing kvm cpuid feature name
  i386: cpu: add missing CPUID[EAX=7,ECX=0] flag names
  i386: kvm: filter CPUID leaf 7 based on GET_SUPPORTED_CPUID, too
  i386: kvm: reformat filter_features_for_kvm() code
  i386: kvm: filter CPUID feature words earlier, on cpu.c
  i386: kvm: mask cpuid_ext4_features bits earlier
  i386: kvm: mask cpuid_kvm_features earlier
  i386: kvm: x2apic is not supported without in-kernel irqchip
  i386: kvm: set CPUID_EXT_TSC_DEADLINE_TIMER on kvm_arch_get_supported_cpuid()
  ...

Signed-off-by: default avatarAnthony Liguori <aliguori@us.ibm.com>
parents 98c8a73b b55f546e

blockdev.c

+6 −0
Original line number Diff line number Diff line
@@ -433,6 +433,12 @@ DriveInfo *drive_init(QemuOpts *opts, int default_to_scsi) 
        return NULL;

    }



    if (qemu_opt_get(opts, "boot") != NULL) {

        fprintf(stderr, "qemu-kvm: boot=on|off is deprecated and will be "

                "ignored. Future versions will reject this parameter. Please "

                "update your scripts.\n");

    }



    on_write_error = BLOCKDEV_ON_ERROR_ENOSPC;

    if ((buf = qemu_opt_get(opts, "werror")) != NULL) {

        if (type != IF_IDE && type != IF_SCSI && type != IF_VIRTIO && type != IF_NONE) {

hw/cirrus_vga.c

+16 −5
Original line number Diff line number Diff line
@@ -42,8 +42,6 @@ 
//#define DEBUG_CIRRUS

//#define DEBUG_BITBLT



#define VGA_RAM_SIZE (8192 * 1024)



/***************************************

 *

 *  definitions
@@ -2856,7 +2854,8 @@ static void cirrus_init_common(CirrusVGAState * s, int device_id, int is_pci, 


    /* I/O handler for LFB */

    memory_region_init_io(&s->cirrus_linear_io, &cirrus_linear_io_ops, s,

                          "cirrus-linear-io", VGA_RAM_SIZE);

                          "cirrus-linear-io", s->vga.vram_size_mb

                                              * 1024 * 1024);

    memory_region_set_flush_coalesced(&s->cirrus_linear_io);



    /* I/O handler for LFB */
@@ -2899,7 +2898,6 @@ static int vga_initfn(ISADevice *dev) 
    ISACirrusVGAState *d = DO_UPCAST(ISACirrusVGAState, dev, dev);

    VGACommonState *s = &d->cirrus_vga.vga;



    s->vram_size_mb = VGA_RAM_SIZE >> 20;

    vga_common_init(s);

    cirrus_init_common(&d->cirrus_vga, CIRRUS_ID_CLGD5430, 0,

                       isa_address_space(dev));
@@ -2912,6 +2910,12 @@ static int vga_initfn(ISADevice *dev) 
    return 0;

}



static Property isa_vga_cirrus_properties[] = {

    DEFINE_PROP_UINT32("vgamem_mb", struct ISACirrusVGAState,

                       cirrus_vga.vga.vram_size_mb, 8),

    DEFINE_PROP_END_OF_LIST(),

};



static void isa_cirrus_vga_class_init(ObjectClass *klass, void *data)

{

    ISADeviceClass *k = ISA_DEVICE_CLASS(klass);
@@ -2919,6 +2923,7 @@ static void isa_cirrus_vga_class_init(ObjectClass *klass, void *data) 


    dc->vmsd  = &vmstate_cirrus_vga;

    k->init   = vga_initfn;

    dc->props = isa_vga_cirrus_properties;

}



static TypeInfo isa_cirrus_vga_info = {
@@ -2942,7 +2947,6 @@ static int pci_cirrus_vga_initfn(PCIDevice *dev) 
     int16_t device_id = pc->device_id;



     /* setup VGA */

     s->vga.vram_size_mb = VGA_RAM_SIZE >> 20;

     vga_common_init(&s->vga);

     cirrus_init_common(s, device_id, 1, pci_address_space(dev));

     s->vga.ds = graphic_console_init(s->vga.update, s->vga.invalidate,
@@ -2969,6 +2973,12 @@ static int pci_cirrus_vga_initfn(PCIDevice *dev) 
     return 0;

}



static Property pci_vga_cirrus_properties[] = {

    DEFINE_PROP_UINT32("vgamem_mb", struct PCICirrusVGAState,

                       cirrus_vga.vga.vram_size_mb, 8),

    DEFINE_PROP_END_OF_LIST(),

};



static void cirrus_vga_class_init(ObjectClass *klass, void *data)

{

    DeviceClass *dc = DEVICE_CLASS(klass);
@@ -2982,6 +2992,7 @@ static void cirrus_vga_class_init(ObjectClass *klass, void *data) 
    k->class_id = PCI_CLASS_DISPLAY_VGA;

    dc->desc = "Cirrus CLGD 54xx VGA";

    dc->vmsd = &vmstate_pci_cirrus_vga;

    dc->props = pci_vga_cirrus_properties;

}



static TypeInfo cirrus_vga_info = {

kvm.h

+1 −0
Original line number Diff line number Diff line
@@ -20,6 +20,7 @@ 


#ifdef CONFIG_KVM

#include <linux/kvm.h>

#include <linux/kvm_para.h>

#endif



extern int kvm_allowed;

qemu-config.c

+4 −0
Original line number Diff line number Diff line
@@ -114,6 +114,10 @@ static QemuOptsList qemu_drive_opts = { 
            .name = "copy-on-read",

            .type = QEMU_OPT_BOOL,

            .help = "copy read data from backing file into image file",

        },{

            .name = "boot",

            .type = QEMU_OPT_BOOL,

            .help = "(deprecated, ignored)",

        },

        { /* end of list */ }

    },

qemu-options.hx

+16 −0
Original line number Diff line number Diff line
@@ -2888,6 +2888,22 @@ STEXI 
Enable FIPS 140-2 compliance mode.

ETEXI



HXCOMM Deprecated by -machine accel=tcg property

DEF("no-kvm", HAS_ARG, QEMU_OPTION_no_kvm, "", QEMU_ARCH_I386)



HXCOMM Deprecated by kvm-pit driver properties

DEF("no-kvm-pit-reinjection", HAS_ARG, QEMU_OPTION_no_kvm_pit_reinjection,

    "", QEMU_ARCH_I386)



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)



HXCOMM Deprecated (ignored)

DEF("tdf", 0, QEMU_OPTION_tdf,"", QEMU_ARCH_ALL)



HXCOMM This is the last statement. Insert new options before this line!

STEXI

@end table