Commit 25930ed6 authored by Peter Maydell's avatar Peter Maydell
Browse files

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



x86 and machine queue, 2016-09-27

# gpg: Signature made Tue 27 Sep 2016 21:10:06 BST
# gpg:                using RSA key 0x2807936F984DC5A6
# gpg: Good signature from "Eduardo Habkost <ehabkost@redhat.com>"
# Primary key fingerprint: 5A32 2FD5 ABC4 D3DB ACCF  D1AA 2807 936F 984D C5A6

* remotes/ehabkost/tags/x86-pull-request:
  sysbus: Remove ignored return value of FindSysbusDeviceFunc
  target-i386: Remove has_msr_* global vars for KVM features
  target-i386: Clear KVM CPUID features if KVM is disabled
  target-i386: Remove has_msr_hv_tsc global variable
  target-i386: Remove has_msr_hv_apic global variable
  target-i386: Remove has_msr_mtrr global variable
  target-i386: Move xsave component mask to features array
  target-i386: xsave: Calculate set of xsave components on realize
  target-i386: xsave: Helper function to calculate xsave area size
  target-i386: xsave: Simplify CPUID[0xD,0].{EAX,EDX} calculation
  target-i386: xsave: Calculate enabled components only once
  target-i386: Don't try to enable PT State xsave component
  target-i386: Move feature name arrays inside FeatureWordInfo
  linux-user: remove #define smp_{cores, threads}
  target-i386: Enable CPUID[0x8000000A] if SVM is enabled
  target-i386: Automatically set level/xlevel/xlevel2 when needed
  tests: Test CPUID level handling for old machines
  tests: Add test code for CPUID level/xlevel handling
  target-i386: Add a marker to end of the region zeroed on reset
  target-i386: Remove unused X86CPUDefinition::xlevel2 field

Signed-off-by: default avatarPeter Maydell <peter.maydell@linaro.org>
parents 333ec4ca 4f01a637

hw/arm/sysbus-fdt.c

+2 −2
Original line number Diff line number Diff line
@@ -436,7 +436,7 @@ static const NodeCreationPair add_fdt_node_functions[] = { 
 * are dynamically instantiable and if so call the node creation

 * function.

 */

static int add_fdt_node(SysBusDevice *sbdev, void *opaque)

static void add_fdt_node(SysBusDevice *sbdev, void *opaque)

{

    int i, ret;
@@ -445,7 +445,7 @@ static int add_fdt_node(SysBusDevice *sbdev, void *opaque) 
                    add_fdt_node_functions[i].typename)) {

            ret = add_fdt_node_functions[i].add_fdt_node_fn(sbdev, opaque);

            assert(!ret);

            return 0;

            return;

        }

    }

    error_report("Device %s can not be dynamically instantiated",

hw/core/machine.c

+1 −1
Original line number Diff line number Diff line
@@ -332,7 +332,7 @@ static bool machine_get_enforce_config_section(Object *obj, Error **errp) 
    return ms->enforce_config_section;

}



static int error_on_sysbus_device(SysBusDevice *sbdev, void *opaque)

static void error_on_sysbus_device(SysBusDevice *sbdev, void *opaque)

{

    error_report("Option '-device %s' cannot be handled by this machine",

                 object_class_get_name(object_get_class(OBJECT(sbdev))));

hw/core/platform-bus.c

+2 −6
Original line number Diff line number Diff line
@@ -74,7 +74,7 @@ hwaddr platform_bus_get_mmio_addr(PlatformBusDevice *pbus, SysBusDevice *sbdev, 
    return object_property_get_int(OBJECT(sbdev_mr), "addr", NULL);

}



static int platform_bus_count_irqs(SysBusDevice *sbdev, void *opaque)

static void platform_bus_count_irqs(SysBusDevice *sbdev, void *opaque)

{

    PlatformBusDevice *pbus = opaque;

    qemu_irq sbirq;
@@ -93,8 +93,6 @@ static int platform_bus_count_irqs(SysBusDevice *sbdev, void *opaque) 
            }

        }

    }



    return 0;

}



/*
@@ -168,7 +166,7 @@ static void platform_bus_map_mmio(PlatformBusDevice *pbus, SysBusDevice *sbdev, 
 * For each sysbus device, look for unassigned IRQ lines as well as

 * unassociated MMIO regions. Connect them to the platform bus if available.

 */

static int link_sysbus_device(SysBusDevice *sbdev, void *opaque)

static void link_sysbus_device(SysBusDevice *sbdev, void *opaque)

{

    PlatformBusDevice *pbus = opaque;

    int i;
@@ -180,8 +178,6 @@ static int link_sysbus_device(SysBusDevice *sbdev, void *opaque) 
    for (i = 0; sysbus_has_mmio(sbdev, i); i++) {

        platform_bus_map_mmio(pbus, sbdev, i);

    }



    return 0;

}



static void platform_bus_init_notify(Notifier *notifier, void *data)

hw/ppc/e500.c

+1 −3
Original line number Diff line number Diff line
@@ -196,7 +196,7 @@ static int create_devtree_etsec(SysBusDevice *sbdev, PlatformDevtreeData *data) 
    return 0;

}



static int sysbus_device_create_devtree(SysBusDevice *sbdev, void *opaque)

static void sysbus_device_create_devtree(SysBusDevice *sbdev, void *opaque)

{

    PlatformDevtreeData *data = opaque;

    bool matched = false;
@@ -211,8 +211,6 @@ static int sysbus_device_create_devtree(SysBusDevice *sbdev, void *opaque) 
                     qdev_fw_name(DEVICE(sbdev)));

        exit(1);

    }



    return 0;

}



static void platform_bus_create_devtree(PPCE500Params *params, void *fdt,

hw/ppc/spapr.c

+1 −3
Original line number Diff line number Diff line
@@ -1110,7 +1110,7 @@ static void spapr_reallocate_hpt(sPAPRMachineState *spapr, int shift, 
    }

}



static int find_unknown_sysbus_device(SysBusDevice *sbdev, void *opaque)

static void find_unknown_sysbus_device(SysBusDevice *sbdev, void *opaque)

{

    bool matched = false;
@@ -1123,8 +1123,6 @@ static int find_unknown_sysbus_device(SysBusDevice *sbdev, void *opaque) 
                     qdev_fw_name(DEVICE(sbdev)));

        exit(1);

    }



    return 0;

}



static void ppc_spapr_reset(void)