]> git.proxmox.com Git - mirror_qemu.git/commit
qdev: Replace cannot_instantiate_with_device_add_yet with !user_creatable
authorEduardo Habkost <ehabkost@redhat.com>
Wed, 3 May 2017 20:35:44 +0000 (17:35 -0300)
committerMichael Roth <mdroth@linux.vnet.ibm.com>
Thu, 31 Aug 2017 16:51:16 +0000 (11:51 -0500)
commitaab00230aaa89bd1862d5fa235d476646415fdee
tree8e5692fd7db2f0a31ff2458360e963e178b53a8c
parentcfc65be6fb1ea5eab086817021962986ecd0d993
qdev: Replace cannot_instantiate_with_device_add_yet with !user_creatable

cannot_instantiate_with_device_add_yet was introduced by commit
efec3dd631d94160288392721a5f9c39e50fb2bc to replace no_user. It was
supposed to be a temporary measure.

When it was introduced, we had 54
cannot_instantiate_with_device_add_yet=true lines in the code.
Today (3 years later) this number has not shrunk: we now have
57 cannot_instantiate_with_device_add_yet=true lines. I think it
is safe to say it is not a temporary measure, and we won't see
the flag go away soon.

Instead of a long field name that misleads people to believe it
is temporary, replace it a shorter and less misleading field:
user_creatable.

Except for code comments, changes were generated using the
following Coccinelle patch:

  @@
  expression DC;
  @@
  (
  -DC->cannot_instantiate_with_device_add_yet = false;
  +DC->user_creatable = true;
  |
  -DC->cannot_instantiate_with_device_add_yet = true;
  +DC->user_creatable = false;
  )

  @@
  typedef ObjectClass;
  expression dc;
  identifier class, data;
  @@
   static void device_class_init(ObjectClass *class, void *data)
   {
   ...
   dc->hotpluggable = true;
  +dc->user_creatable = true;
   ...
   }

  @@
  @@
   struct DeviceClass {
   ...
  -bool cannot_instantiate_with_device_add_yet;
  +bool user_creatable;
   ...
  }

  @@
  expression DC;
  @@
  (
  -!DC->cannot_instantiate_with_device_add_yet
  +DC->user_creatable
  |
  -DC->cannot_instantiate_with_device_add_yet
  +!DC->user_creatable
  )

Cc: Alistair Francis <alistair.francis@xilinx.com>
Cc: Laszlo Ersek <lersek@redhat.com>
Cc: Marcel Apfelbaum <marcel@redhat.com>
Cc: Markus Armbruster <armbru@redhat.com>
Cc: Peter Maydell <peter.maydell@linaro.org>
Cc: Thomas Huth <thuth@redhat.com>
Acked-by: Alistair Francis <alistair.francis@xilinx.com>
Reviewed-by: Thomas Huth <thuth@redhat.com>
Reviewed-by: Marcel Apfelbaum <marcel@redhat.com>
Acked-by: Marcel Apfelbaum <marcel@redhat.com>
Signed-off-by: Eduardo Habkost <ehabkost@redhat.com>
Message-Id: <20170503203604.31462-2-ehabkost@redhat.com>
[ehabkost: kept "TODO remove once we're there" comment]
Reviewed-by: Markus Armbruster <armbru@redhat.com>
Signed-off-by: Eduardo Habkost <ehabkost@redhat.com>
(cherry picked from commit e90f2a8c3e0e677eeea46a9b401c3f98425ffa37)
 Conflicts:
include/hw/qdev-core.h
* remove context dep on 08f00df
Signed-off-by: Michael Roth <mdroth@linux.vnet.ibm.com>
56 files changed:
hw/acpi/piix4.c
hw/arm/spitz.c
hw/audio/marvell_88w8618.c
hw/audio/pcspk.c
hw/core/or-irq.c
hw/core/qdev.c
hw/core/register.c
hw/dma/i8257.c
hw/dma/sparc32_dma.c
hw/gpio/omap_gpio.c
hw/i2c/omap_i2c.c
hw/i2c/smbus_eeprom.c
hw/i2c/smbus_ich9.c
hw/i386/pc.c
hw/input/vmmouse.c
hw/intc/apic_common.c
hw/intc/etraxfs_pic.c
hw/intc/grlib_irqmp.c
hw/intc/i8259_common.c
hw/intc/nios2_iic.c
hw/intc/omap_intc.c
hw/isa/lpc_ich9.c
hw/isa/piix4.c
hw/isa/vt82c686.c
hw/mips/gt64xxx_pci.c
hw/misc/vmport.c
hw/net/dp8393x.c
hw/net/etraxfs_eth.c
hw/net/lance.c
hw/pci-bridge/dec.c
hw/pci-bridge/pci_expander_bridge.c
hw/pci-host/apb.c
hw/pci-host/bonito.c
hw/pci-host/gpex.c
hw/pci-host/grackle.c
hw/pci-host/piix.c
hw/pci-host/ppce500.c
hw/pci-host/prep.c
hw/pci-host/q35.c
hw/pci-host/uninorth.c
hw/pci-host/versatile.c
hw/pci-host/xilinx-pcie.c
hw/ppc/ppc4xx_pci.c
hw/ppc/spapr_drc.c
hw/s390x/s390-pci-bus.c
hw/sd/milkymist-memcard.c
hw/sd/pl181.c
hw/sh4/sh_pci.c
hw/timer/i8254_common.c
hw/timer/mc146818rtc.c
include/hw/qdev-core.h
include/hw/qdev-properties.h
monitor.c
qdev-monitor.c
qom/cpu.c
target/i386/cpu.c