Commit 897eee24 authored by Stefan Hajnoczi's avatar Stefan Hajnoczi
Browse files

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



x86 and machine queue, 2017-05-17

# gpg: Signature made Wed 17 May 2017 02:37:54 PM 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

* ehabkost/tags/x86-and-machine-pull-request: (22 commits)
  tests: Add [+-]feature and feature=on|off test cases
  s390-pcibus: No need to set user_creatable=false explicitly
  xen-sysdev: Remove user_creatable flag
  virtio-mmio: Remove user_creatable flag
  sysbus-ohci: Remove user_creatable flag
  hpet: Remove user_creatable flag
  generic-sdhci: Remove user_creatable flag
  esp: Remove user_creatable flag
  fw_cfg: Remove user_creatable flag
  unimplemented-device: Remove user_creatable flag
  isabus-bridge: Remove user_creatable flag
  allwinner-ahci: Remove user_creatable flag
  sysbus-ahci: Remove user_creatable flag
  kvmvapic: Remove user_creatable flag
  ioapic: Remove user_creatable flag
  kvmclock: Remove user_creatable flag
  pflash_cfi01: Remove user_creatable flag
  fdc: Remove user_creatable flag from sysbus-fdc & SUNW,fdtwo
  iommu: Remove FIXME comment about user_creatable=true
  xen-backend: Remove FIXME comment about user_creatable flag
  ...

Signed-off-by: default avatarStefan Hajnoczi <stefanha@redhat.com>
parents 599c9cb6 17e8f541

hw/acpi/piix4.c

+1 −1
Original line number Diff line number Diff line
@@ -700,7 +700,7 @@ static void piix4_pm_class_init(ObjectClass *klass, void *data) 
     * Reason: part of PIIX4 southbridge, needs to be wired up,

     * e.g. by mips_malta_init()

     */

    dc->cannot_instantiate_with_device_add_yet = true;

    dc->user_creatable = false;

    dc->hotpluggable = false;

    hc->plug = piix4_device_plug_cb;

    hc->unplug_request = piix4_device_unplug_request_cb;

hw/arm/spitz.c

+1 −1
Original line number Diff line number Diff line
@@ -1076,7 +1076,7 @@ static void sl_nand_class_init(ObjectClass *klass, void *data) 
    dc->vmsd = &vmstate_sl_nand_info;

    dc->props = sl_nand_properties;

    /* Reason: init() method uses drive_get() */

    dc->cannot_instantiate_with_device_add_yet = true;

    dc->user_creatable = false;

}



static const TypeInfo sl_nand_info = {

hw/audio/marvell_88w8618.c

+1 −1
Original line number Diff line number Diff line
@@ -292,7 +292,7 @@ static void mv88w8618_audio_class_init(ObjectClass *klass, void *data) 
    dc->vmsd = &mv88w8618_audio_vmsd;

    dc->props = mv88w8618_audio_properties;

    /* Reason: pointer property "wm8750" */

    dc->cannot_instantiate_with_device_add_yet = true;

    dc->user_creatable = false;

}



static const TypeInfo mv88w8618_audio_info = {

hw/audio/pcspk.c

+1 −1
Original line number Diff line number Diff line
@@ -223,7 +223,7 @@ static void pcspk_class_initfn(ObjectClass *klass, void *data) 
    dc->vmsd = &vmstate_spk;

    dc->props = pcspk_properties;

    /* Reason: realize sets global pcspk_state */

    dc->cannot_instantiate_with_device_add_yet = true;

    dc->user_creatable = false;

}



static const TypeInfo pcspk_info = {

hw/core/or-irq.c

+1 −1
Original line number Diff line number Diff line
@@ -91,7 +91,7 @@ static void or_irq_class_init(ObjectClass *klass, void *data) 
    dc->vmsd = &vmstate_or_irq;



    /* Reason: Needs to be wired up to work, e.g. see stm32f205_soc.c */

    dc->cannot_instantiate_with_device_add_yet = true;

    dc->user_creatable = false;

}



static const TypeInfo or_irq_type_info = {