| 
									
										
										
										
											2012-11-22 22:05:06 -05:00
										 |  |  | /*
 | 
					
						
							|  |  |  |  * ACPI implementation | 
					
						
							|  |  |  |  * | 
					
						
							|  |  |  |  * Copyright (c) 2006 Fabrice Bellard | 
					
						
							| 
									
										
										
										
											2012-10-29 22:11:31 -04:00
										 |  |  |  * Copyright (c) 2009 Isaku Yamahata <yamahata at valinux co jp> | 
					
						
							|  |  |  |  *                    VA Linux Systems Japan K.K. | 
					
						
							|  |  |  |  * Copyright (C) 2012 Jason Baron <jbaron@redhat.com> | 
					
						
							|  |  |  |  * | 
					
						
							|  |  |  |  * This is based on acpi.c. | 
					
						
							| 
									
										
										
										
											2012-11-22 22:05:06 -05:00
										 |  |  |  * | 
					
						
							|  |  |  |  * This library is free software; you can redistribute it and/or | 
					
						
							|  |  |  |  * modify it under the terms of the GNU Lesser General Public | 
					
						
							|  |  |  |  * License version 2 as published by the Free Software Foundation. | 
					
						
							|  |  |  |  * | 
					
						
							|  |  |  |  * This library is distributed in the hope that it will be useful, | 
					
						
							|  |  |  |  * but WITHOUT ANY WARRANTY; without even the implied warranty of | 
					
						
							|  |  |  |  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU | 
					
						
							|  |  |  |  * Lesser General Public License for more details. | 
					
						
							|  |  |  |  * | 
					
						
							|  |  |  |  * You should have received a copy of the GNU Lesser General Public | 
					
						
							|  |  |  |  * License along with this library; if not, see <http://www.gnu.org/licenses/>
 | 
					
						
							|  |  |  |  * | 
					
						
							| 
									
										
										
										
											2012-10-29 22:11:31 -04:00
										 |  |  |  * Contributions after 2012-01-13 are licensed under the terms of the | 
					
						
							|  |  |  |  * GNU GPL, version 2 or (at your option) any later version. | 
					
						
							| 
									
										
										
										
											2012-11-22 22:05:06 -05:00
										 |  |  |  */ | 
					
						
							| 
									
										
										
										
											2016-01-26 18:17:03 +00:00
										 |  |  | #include "qemu/osdep.h"
 | 
					
						
							| 
									
										
										
										
											2013-02-04 15:40:22 +01:00
										 |  |  | #include "hw/hw.h"
 | 
					
						
							| 
									
										
											  
											
												include/qemu/osdep.h: Don't include qapi/error.h
Commit 57cb38b included qapi/error.h into qemu/osdep.h to get the
Error typedef.  Since then, we've moved to include qemu/osdep.h
everywhere.  Its file comment explains: "To avoid getting into
possible circular include dependencies, this file should not include
any other QEMU headers, with the exceptions of config-host.h,
compiler.h, os-posix.h and os-win32.h, all of which are doing a
similar job to this file and are under similar constraints."
qapi/error.h doesn't do a similar job, and it doesn't adhere to
similar constraints: it includes qapi-types.h.  That's in excess of
100KiB of crap most .c files don't actually need.
Add the typedef to qemu/typedefs.h, and include that instead of
qapi/error.h.  Include qapi/error.h in .c files that need it and don't
get it now.  Include qapi-types.h in qom/object.h for uint16List.
Update scripts/clean-includes accordingly.  Update it further to match
reality: replace config.h by config-target.h, add sysemu/os-posix.h,
sysemu/os-win32.h.  Update the list of includes in the qemu/osdep.h
comment quoted above similarly.
This reduces the number of objects depending on qapi/error.h from "all
of them" to less than a third.  Unfortunately, the number depending on
qapi-types.h shrinks only a little.  More work is needed for that one.
Signed-off-by: Markus Armbruster <armbru@redhat.com>
[Fix compilation without the spice devel packages. - Paolo]
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
											
										 
											2016-03-14 09:01:28 +01:00
										 |  |  | #include "qapi/error.h"
 | 
					
						
							| 
									
										
										
										
											2013-07-24 18:56:10 +03:00
										 |  |  | #include "qapi/visitor.h"
 | 
					
						
							| 
									
										
										
										
											2013-02-05 17:06:20 +01:00
										 |  |  | #include "hw/i386/pc.h"
 | 
					
						
							| 
									
										
										
										
											2013-02-04 15:40:22 +01:00
										 |  |  | #include "hw/pci/pci.h"
 | 
					
						
							| 
									
										
										
										
											2012-12-17 18:20:00 +01:00
										 |  |  | #include "qemu/timer.h"
 | 
					
						
							| 
									
										
										
										
											2012-12-17 18:20:04 +01:00
										 |  |  | #include "sysemu/sysemu.h"
 | 
					
						
							| 
									
										
										
										
											2013-02-05 17:06:20 +01:00
										 |  |  | #include "hw/acpi/acpi.h"
 | 
					
						
							| 
									
										
										
										
											2015-06-28 14:58:56 -03:00
										 |  |  | #include "hw/acpi/tco.h"
 | 
					
						
							| 
									
										
										
										
											2012-12-17 18:20:04 +01:00
										 |  |  | #include "sysemu/kvm.h"
 | 
					
						
							| 
									
										
										
										
											2012-12-17 18:19:49 +01:00
										 |  |  | #include "exec/address-spaces.h"
 | 
					
						
							| 
									
										
										
										
											2012-11-22 22:05:06 -05:00
										 |  |  | 
 | 
					
						
							| 
									
										
										
										
											2013-02-05 17:06:20 +01:00
										 |  |  | #include "hw/i386/ich9.h"
 | 
					
						
							| 
									
										
										
										
											2014-06-02 15:25:22 +02:00
										 |  |  | #include "hw/mem/pc-dimm.h"
 | 
					
						
							| 
									
										
										
										
											2012-11-22 22:05:06 -05:00
										 |  |  | 
 | 
					
						
							|  |  |  | //#define DEBUG
 | 
					
						
							|  |  |  | 
 | 
					
						
							|  |  |  | #ifdef DEBUG
 | 
					
						
							|  |  |  | #define ICH9_DEBUG(fmt, ...) \
 | 
					
						
							|  |  |  | do { printf("%s "fmt, __func__, ## __VA_ARGS__); } while (0) | 
					
						
							|  |  |  | #else
 | 
					
						
							|  |  |  | #define ICH9_DEBUG(fmt, ...)    do { } while (0)
 | 
					
						
							|  |  |  | #endif
 | 
					
						
							|  |  |  | 
 | 
					
						
							|  |  |  | static void ich9_pm_update_sci_fn(ACPIREGS *regs) | 
					
						
							|  |  |  | { | 
					
						
							|  |  |  |     ICH9LPCPMRegs *pm = container_of(regs, ICH9LPCPMRegs, acpi_regs); | 
					
						
							| 
									
										
										
										
											2013-12-13 17:22:07 +01:00
										 |  |  |     acpi_update_sci(&pm->acpi_regs, pm->irq); | 
					
						
							| 
									
										
										
										
											2012-11-22 22:05:06 -05:00
										 |  |  | } | 
					
						
							|  |  |  | 
 | 
					
						
							| 
									
										
										
										
											2012-11-22 13:43:17 +01:00
										 |  |  | static uint64_t ich9_gpe_readb(void *opaque, hwaddr addr, unsigned width) | 
					
						
							|  |  |  | { | 
					
						
							|  |  |  |     ICH9LPCPMRegs *pm = opaque; | 
					
						
							|  |  |  |     return acpi_gpe_ioport_readb(&pm->acpi_regs, addr); | 
					
						
							|  |  |  | } | 
					
						
							|  |  |  | 
 | 
					
						
							|  |  |  | static void ich9_gpe_writeb(void *opaque, hwaddr addr, uint64_t val, | 
					
						
							|  |  |  |                             unsigned width) | 
					
						
							|  |  |  | { | 
					
						
							|  |  |  |     ICH9LPCPMRegs *pm = opaque; | 
					
						
							|  |  |  |     acpi_gpe_ioport_writeb(&pm->acpi_regs, addr, val); | 
					
						
							| 
									
										
										
										
											2013-12-13 17:22:10 +01:00
										 |  |  |     acpi_update_sci(&pm->acpi_regs, pm->irq); | 
					
						
							| 
									
										
										
										
											2012-11-22 13:43:17 +01:00
										 |  |  | } | 
					
						
							|  |  |  | 
 | 
					
						
							|  |  |  | static const MemoryRegionOps ich9_gpe_ops = { | 
					
						
							|  |  |  |     .read = ich9_gpe_readb, | 
					
						
							|  |  |  |     .write = ich9_gpe_writeb, | 
					
						
							|  |  |  |     .valid.min_access_size = 1, | 
					
						
							|  |  |  |     .valid.max_access_size = 4, | 
					
						
							|  |  |  |     .impl.min_access_size = 1, | 
					
						
							|  |  |  |     .impl.max_access_size = 1, | 
					
						
							|  |  |  |     .endianness = DEVICE_LITTLE_ENDIAN, | 
					
						
							|  |  |  | }; | 
					
						
							|  |  |  | 
 | 
					
						
							| 
									
										
										
										
											2012-11-22 13:51:35 +01:00
										 |  |  | static uint64_t ich9_smi_readl(void *opaque, hwaddr addr, unsigned width) | 
					
						
							|  |  |  | { | 
					
						
							|  |  |  |     ICH9LPCPMRegs *pm = opaque; | 
					
						
							|  |  |  |     switch (addr) { | 
					
						
							|  |  |  |     case 0: | 
					
						
							|  |  |  |         return pm->smi_en; | 
					
						
							|  |  |  |     case 4: | 
					
						
							|  |  |  |         return pm->smi_sts; | 
					
						
							|  |  |  |     default: | 
					
						
							|  |  |  |         return 0; | 
					
						
							|  |  |  |     } | 
					
						
							|  |  |  | } | 
					
						
							|  |  |  | 
 | 
					
						
							|  |  |  | static void ich9_smi_writel(void *opaque, hwaddr addr, uint64_t val, | 
					
						
							|  |  |  |                             unsigned width) | 
					
						
							|  |  |  | { | 
					
						
							|  |  |  |     ICH9LPCPMRegs *pm = opaque; | 
					
						
							| 
									
										
										
										
											2015-06-28 14:58:56 -03:00
										 |  |  |     TCOIORegs *tr = &pm->tco_regs; | 
					
						
							|  |  |  |     uint64_t tco_en; | 
					
						
							|  |  |  | 
 | 
					
						
							| 
									
										
										
										
											2012-11-22 13:51:35 +01:00
										 |  |  |     switch (addr) { | 
					
						
							|  |  |  |     case 0: | 
					
						
							| 
									
										
										
										
											2015-06-28 14:58:56 -03:00
										 |  |  |         tco_en = pm->smi_en & ICH9_PMIO_SMI_EN_TCO_EN; | 
					
						
							|  |  |  |         /* once TCO_LOCK bit is set, TCO_EN bit cannot be overwritten */ | 
					
						
							|  |  |  |         if (tr->tco.cnt1 & TCO_LOCK) { | 
					
						
							|  |  |  |             val = (val & ~ICH9_PMIO_SMI_EN_TCO_EN) | tco_en; | 
					
						
							|  |  |  |         } | 
					
						
							| 
									
										
										
										
											2015-05-06 10:58:30 +02:00
										 |  |  |         pm->smi_en &= ~pm->smi_en_wmask; | 
					
						
							|  |  |  |         pm->smi_en |= (val & pm->smi_en_wmask); | 
					
						
							| 
									
										
										
										
											2012-11-22 13:51:35 +01:00
										 |  |  |         break; | 
					
						
							|  |  |  |     } | 
					
						
							|  |  |  | } | 
					
						
							|  |  |  | 
 | 
					
						
							|  |  |  | static const MemoryRegionOps ich9_smi_ops = { | 
					
						
							|  |  |  |     .read = ich9_smi_readl, | 
					
						
							|  |  |  |     .write = ich9_smi_writel, | 
					
						
							|  |  |  |     .valid.min_access_size = 4, | 
					
						
							|  |  |  |     .valid.max_access_size = 4, | 
					
						
							|  |  |  |     .endianness = DEVICE_LITTLE_ENDIAN, | 
					
						
							|  |  |  | }; | 
					
						
							|  |  |  | 
 | 
					
						
							| 
									
										
										
										
											2012-11-22 22:05:06 -05:00
										 |  |  | void ich9_pm_iospace_update(ICH9LPCPMRegs *pm, uint32_t pm_io_base) | 
					
						
							|  |  |  | { | 
					
						
							|  |  |  |     ICH9_DEBUG("to 0x%x\n", pm_io_base); | 
					
						
							|  |  |  | 
 | 
					
						
							|  |  |  |     assert((pm_io_base & ICH9_PMIO_MASK) == 0); | 
					
						
							|  |  |  | 
 | 
					
						
							|  |  |  |     pm->pm_io_base = pm_io_base; | 
					
						
							| 
									
										
										
										
											2012-11-22 12:08:22 +01:00
										 |  |  |     memory_region_transaction_begin(); | 
					
						
							|  |  |  |     memory_region_set_enabled(&pm->io, pm->pm_io_base != 0); | 
					
						
							|  |  |  |     memory_region_set_address(&pm->io, pm->pm_io_base); | 
					
						
							|  |  |  |     memory_region_transaction_commit(); | 
					
						
							| 
									
										
										
										
											2012-11-22 22:05:06 -05:00
										 |  |  | } | 
					
						
							|  |  |  | 
 | 
					
						
							|  |  |  | static int ich9_pm_post_load(void *opaque, int version_id) | 
					
						
							|  |  |  | { | 
					
						
							|  |  |  |     ICH9LPCPMRegs *pm = opaque; | 
					
						
							|  |  |  |     uint32_t pm_io_base = pm->pm_io_base; | 
					
						
							|  |  |  |     pm->pm_io_base = 0; | 
					
						
							|  |  |  |     ich9_pm_iospace_update(pm, pm_io_base); | 
					
						
							|  |  |  |     return 0; | 
					
						
							|  |  |  | } | 
					
						
							|  |  |  | 
 | 
					
						
							|  |  |  | #define VMSTATE_GPE_ARRAY(_field, _state)                            \
 | 
					
						
							|  |  |  |  {                                                                   \ | 
					
						
							|  |  |  |      .name       = (stringify(_field)),                              \ | 
					
						
							|  |  |  |      .version_id = 0,                                                \ | 
					
						
							|  |  |  |      .num        = ICH9_PMIO_GPE0_LEN,                               \ | 
					
						
							|  |  |  |      .info       = &vmstate_info_uint8,                              \ | 
					
						
							|  |  |  |      .size       = sizeof(uint8_t),                                  \ | 
					
						
							|  |  |  |      .flags      = VMS_ARRAY | VMS_POINTER,                          \ | 
					
						
							|  |  |  |      .offset     = vmstate_offset_pointer(_state, _field, uint8_t),  \ | 
					
						
							|  |  |  |  } | 
					
						
							|  |  |  | 
 | 
					
						
							| 
									
										
										
										
											2014-06-02 15:25:23 +02:00
										 |  |  | static bool vmstate_test_use_memhp(void *opaque) | 
					
						
							|  |  |  | { | 
					
						
							|  |  |  |     ICH9LPCPMRegs *s = opaque; | 
					
						
							|  |  |  |     return s->acpi_memory_hotplug.is_enabled; | 
					
						
							|  |  |  | } | 
					
						
							|  |  |  | 
 | 
					
						
							|  |  |  | static const VMStateDescription vmstate_memhp_state = { | 
					
						
							|  |  |  |     .name = "ich9_pm/memhp", | 
					
						
							|  |  |  |     .version_id = 1, | 
					
						
							|  |  |  |     .minimum_version_id = 1, | 
					
						
							|  |  |  |     .minimum_version_id_old = 1, | 
					
						
							| 
									
										
										
										
											2014-09-23 14:09:54 +02:00
										 |  |  |     .needed = vmstate_test_use_memhp, | 
					
						
							| 
									
										
										
										
											2014-06-02 15:25:23 +02:00
										 |  |  |     .fields      = (VMStateField[]) { | 
					
						
							|  |  |  |         VMSTATE_MEMORY_HOTPLUG(acpi_memory_hotplug, ICH9LPCPMRegs), | 
					
						
							|  |  |  |         VMSTATE_END_OF_LIST() | 
					
						
							|  |  |  |     } | 
					
						
							|  |  |  | }; | 
					
						
							|  |  |  | 
 | 
					
						
							| 
									
										
										
										
											2015-06-28 14:58:56 -03:00
										 |  |  | static bool vmstate_test_use_tco(void *opaque) | 
					
						
							|  |  |  | { | 
					
						
							|  |  |  |     ICH9LPCPMRegs *s = opaque; | 
					
						
							|  |  |  |     return s->enable_tco; | 
					
						
							|  |  |  | } | 
					
						
							|  |  |  | 
 | 
					
						
							|  |  |  | static const VMStateDescription vmstate_tco_io_state = { | 
					
						
							|  |  |  |     .name = "ich9_pm/tco", | 
					
						
							|  |  |  |     .version_id = 1, | 
					
						
							|  |  |  |     .minimum_version_id = 1, | 
					
						
							|  |  |  |     .minimum_version_id_old = 1, | 
					
						
							|  |  |  |     .needed = vmstate_test_use_tco, | 
					
						
							|  |  |  |     .fields      = (VMStateField[]) { | 
					
						
							|  |  |  |         VMSTATE_STRUCT(tco_regs, ICH9LPCPMRegs, 1, vmstate_tco_io_sts, | 
					
						
							|  |  |  |                        TCOIORegs), | 
					
						
							|  |  |  |         VMSTATE_END_OF_LIST() | 
					
						
							|  |  |  |     } | 
					
						
							|  |  |  | }; | 
					
						
							|  |  |  | 
 | 
					
						
							| 
									
										
										
										
											2016-06-15 11:25:23 +02:00
										 |  |  | static bool vmstate_test_use_cpuhp(void *opaque) | 
					
						
							|  |  |  | { | 
					
						
							|  |  |  |     ICH9LPCPMRegs *s = opaque; | 
					
						
							|  |  |  |     return !s->cpu_hotplug_legacy; | 
					
						
							|  |  |  | } | 
					
						
							|  |  |  | 
 | 
					
						
							|  |  |  | static int vmstate_cpuhp_pre_load(void *opaque) | 
					
						
							|  |  |  | { | 
					
						
							|  |  |  |     ICH9LPCPMRegs *s = opaque; | 
					
						
							|  |  |  |     Object *obj = OBJECT(s->gpe_cpu.device); | 
					
						
							|  |  |  |     object_property_set_bool(obj, false, "cpu-hotplug-legacy", &error_abort); | 
					
						
							|  |  |  |     return 0; | 
					
						
							|  |  |  | } | 
					
						
							|  |  |  | 
 | 
					
						
							|  |  |  | static const VMStateDescription vmstate_cpuhp_state = { | 
					
						
							|  |  |  |     .name = "ich9_pm/cpuhp", | 
					
						
							|  |  |  |     .version_id = 1, | 
					
						
							|  |  |  |     .minimum_version_id = 1, | 
					
						
							|  |  |  |     .minimum_version_id_old = 1, | 
					
						
							|  |  |  |     .needed = vmstate_test_use_cpuhp, | 
					
						
							|  |  |  |     .pre_load = vmstate_cpuhp_pre_load, | 
					
						
							|  |  |  |     .fields      = (VMStateField[]) { | 
					
						
							|  |  |  |         VMSTATE_CPU_HOTPLUG(cpuhp_state, ICH9LPCPMRegs), | 
					
						
							|  |  |  |         VMSTATE_END_OF_LIST() | 
					
						
							|  |  |  |     } | 
					
						
							|  |  |  | }; | 
					
						
							|  |  |  | 
 | 
					
						
							| 
									
										
										
										
											2012-11-22 22:05:06 -05:00
										 |  |  | const VMStateDescription vmstate_ich9_pm = { | 
					
						
							|  |  |  |     .name = "ich9_pm", | 
					
						
							|  |  |  |     .version_id = 1, | 
					
						
							|  |  |  |     .minimum_version_id = 1, | 
					
						
							|  |  |  |     .post_load = ich9_pm_post_load, | 
					
						
							|  |  |  |     .fields = (VMStateField[]) { | 
					
						
							|  |  |  |         VMSTATE_UINT16(acpi_regs.pm1.evt.sts, ICH9LPCPMRegs), | 
					
						
							|  |  |  |         VMSTATE_UINT16(acpi_regs.pm1.evt.en, ICH9LPCPMRegs), | 
					
						
							|  |  |  |         VMSTATE_UINT16(acpi_regs.pm1.cnt.cnt, ICH9LPCPMRegs), | 
					
						
							| 
									
										
										
										
											2015-01-08 10:18:59 +01:00
										 |  |  |         VMSTATE_TIMER_PTR(acpi_regs.tmr.timer, ICH9LPCPMRegs), | 
					
						
							| 
									
										
										
										
											2012-11-22 22:05:06 -05:00
										 |  |  |         VMSTATE_INT64(acpi_regs.tmr.overflow_time, ICH9LPCPMRegs), | 
					
						
							|  |  |  |         VMSTATE_GPE_ARRAY(acpi_regs.gpe.sts, ICH9LPCPMRegs), | 
					
						
							|  |  |  |         VMSTATE_GPE_ARRAY(acpi_regs.gpe.en, ICH9LPCPMRegs), | 
					
						
							|  |  |  |         VMSTATE_UINT32(smi_en, ICH9LPCPMRegs), | 
					
						
							|  |  |  |         VMSTATE_UINT32(smi_sts, ICH9LPCPMRegs), | 
					
						
							|  |  |  |         VMSTATE_END_OF_LIST() | 
					
						
							| 
									
										
										
										
											2014-06-02 15:25:23 +02:00
										 |  |  |     }, | 
					
						
							| 
									
										
										
										
											2014-09-23 14:09:54 +02:00
										 |  |  |     .subsections = (const VMStateDescription*[]) { | 
					
						
							|  |  |  |         &vmstate_memhp_state, | 
					
						
							| 
									
										
										
										
											2015-06-28 14:58:56 -03:00
										 |  |  |         &vmstate_tco_io_state, | 
					
						
							| 
									
										
										
										
											2016-06-15 11:25:23 +02:00
										 |  |  |         &vmstate_cpuhp_state, | 
					
						
							| 
									
										
										
										
											2015-06-28 14:58:56 -03:00
										 |  |  |         NULL | 
					
						
							| 
									
										
										
										
											2012-11-22 22:05:06 -05:00
										 |  |  |     } | 
					
						
							|  |  |  | }; | 
					
						
							|  |  |  | 
 | 
					
						
							|  |  |  | static void pm_reset(void *opaque) | 
					
						
							|  |  |  | { | 
					
						
							|  |  |  |     ICH9LPCPMRegs *pm = opaque; | 
					
						
							|  |  |  |     ich9_pm_iospace_update(pm, 0); | 
					
						
							|  |  |  | 
 | 
					
						
							|  |  |  |     acpi_pm1_evt_reset(&pm->acpi_regs); | 
					
						
							|  |  |  |     acpi_pm1_cnt_reset(&pm->acpi_regs); | 
					
						
							|  |  |  |     acpi_pm_tmr_reset(&pm->acpi_regs); | 
					
						
							|  |  |  |     acpi_gpe_reset(&pm->acpi_regs); | 
					
						
							|  |  |  | 
 | 
					
						
							| 
									
										
										
										
											2015-07-24 20:16:00 +02:00
										 |  |  |     pm->smi_en = 0; | 
					
						
							| 
									
										
										
										
											2015-06-18 18:30:51 +02:00
										 |  |  |     if (!pm->smm_enabled) { | 
					
						
							| 
									
										
										
										
											2015-07-24 20:16:01 +02:00
										 |  |  |         /* Mark SMM as already inited to prevent SMM from running. */ | 
					
						
							| 
									
										
										
										
											2012-11-14 15:54:07 -05:00
										 |  |  |         pm->smi_en |= ICH9_PMIO_SMI_EN_APMC_EN; | 
					
						
							|  |  |  |     } | 
					
						
							| 
									
										
										
										
											2015-05-06 10:58:30 +02:00
										 |  |  |     pm->smi_en_wmask = ~0; | 
					
						
							| 
									
										
										
										
											2012-11-14 15:54:07 -05:00
										 |  |  | 
 | 
					
						
							| 
									
										
										
										
											2013-12-13 17:22:07 +01:00
										 |  |  |     acpi_update_sci(&pm->acpi_regs, pm->irq); | 
					
						
							| 
									
										
										
										
											2012-11-22 22:05:06 -05:00
										 |  |  | } | 
					
						
							|  |  |  | 
 | 
					
						
							|  |  |  | static void pm_powerdown_req(Notifier *n, void *opaque) | 
					
						
							|  |  |  | { | 
					
						
							|  |  |  |     ICH9LPCPMRegs *pm = container_of(n, ICH9LPCPMRegs, powerdown_notifier); | 
					
						
							|  |  |  | 
 | 
					
						
							|  |  |  |     acpi_pm1_evt_power_down(&pm->acpi_regs); | 
					
						
							|  |  |  | } | 
					
						
							|  |  |  | 
 | 
					
						
							| 
									
										
										
										
											2015-06-28 14:58:56 -03:00
										 |  |  | void ich9_pm_init(PCIDevice *lpc_pci, ICH9LPCPMRegs *pm, | 
					
						
							| 
									
										
										
										
											2016-01-23 14:02:11 -02:00
										 |  |  |                   bool smm_enabled, | 
					
						
							| 
									
										
										
										
											2013-04-24 18:37:22 +08:00
										 |  |  |                   qemu_irq sci_irq) | 
					
						
							| 
									
										
										
										
											2012-11-22 22:05:06 -05:00
										 |  |  | { | 
					
						
							| 
									
										
										
										
											2013-06-06 21:25:08 -04:00
										 |  |  |     memory_region_init(&pm->io, OBJECT(lpc_pci), "ich9-pm", ICH9_PMIO_SIZE); | 
					
						
							| 
									
										
										
										
											2012-11-22 12:08:22 +01:00
										 |  |  |     memory_region_set_enabled(&pm->io, false); | 
					
						
							| 
									
										
										
										
											2012-12-11 09:42:18 +01:00
										 |  |  |     memory_region_add_subregion(pci_address_space_io(lpc_pci), | 
					
						
							|  |  |  |                                 0, &pm->io); | 
					
						
							| 
									
										
										
										
											2012-11-22 12:08:22 +01:00
										 |  |  | 
 | 
					
						
							| 
									
										
										
										
											2012-11-22 12:12:30 +01:00
										 |  |  |     acpi_pm_tmr_init(&pm->acpi_regs, ich9_pm_update_sci_fn, &pm->io); | 
					
						
							| 
									
										
										
										
											2012-11-22 13:25:10 +01:00
										 |  |  |     acpi_pm1_evt_init(&pm->acpi_regs, ich9_pm_update_sci_fn, &pm->io); | 
					
						
							| 
									
										
										
										
											2015-04-29 15:20:14 +02:00
										 |  |  |     acpi_pm1_cnt_init(&pm->acpi_regs, &pm->io, pm->disable_s3, pm->disable_s4, | 
					
						
							|  |  |  |                       pm->s4_val); | 
					
						
							| 
									
										
										
										
											2012-11-22 13:43:17 +01:00
										 |  |  | 
 | 
					
						
							| 
									
										
										
										
											2012-11-22 22:05:06 -05:00
										 |  |  |     acpi_gpe_init(&pm->acpi_regs, ICH9_PMIO_GPE0_LEN); | 
					
						
							| 
									
										
										
										
											2013-06-06 21:25:08 -04:00
										 |  |  |     memory_region_init_io(&pm->io_gpe, OBJECT(lpc_pci), &ich9_gpe_ops, pm, | 
					
						
							| 
									
										
										
										
											2013-06-13 18:51:48 +08:00
										 |  |  |                           "acpi-gpe0", ICH9_PMIO_GPE0_LEN); | 
					
						
							| 
									
										
										
										
											2012-11-22 13:43:17 +01:00
										 |  |  |     memory_region_add_subregion(&pm->io, ICH9_PMIO_GPE0_STS, &pm->io_gpe); | 
					
						
							| 
									
										
										
										
											2012-11-22 22:05:06 -05:00
										 |  |  | 
 | 
					
						
							| 
									
										
										
										
											2013-06-06 21:25:08 -04:00
										 |  |  |     memory_region_init_io(&pm->io_smi, OBJECT(lpc_pci), &ich9_smi_ops, pm, | 
					
						
							| 
									
										
										
										
											2013-06-13 18:51:48 +08:00
										 |  |  |                           "acpi-smi", 8); | 
					
						
							| 
									
										
										
										
											2012-11-22 13:51:35 +01:00
										 |  |  |     memory_region_add_subregion(&pm->io, ICH9_PMIO_SMI_EN, &pm->io_smi); | 
					
						
							|  |  |  | 
 | 
					
						
							| 
									
										
										
										
											2015-06-18 18:30:51 +02:00
										 |  |  |     pm->smm_enabled = smm_enabled; | 
					
						
							| 
									
										
										
										
											2015-06-28 14:58:56 -03:00
										 |  |  | 
 | 
					
						
							| 
									
										
										
										
											2016-01-23 14:02:11 -02:00
										 |  |  |     pm->enable_tco = true; | 
					
						
							|  |  |  |     acpi_pm_tco_init(&pm->tco_regs, &pm->io); | 
					
						
							| 
									
										
										
										
											2015-06-28 14:58:56 -03:00
										 |  |  | 
 | 
					
						
							| 
									
										
										
										
											2012-11-22 22:05:06 -05:00
										 |  |  |     pm->irq = sci_irq; | 
					
						
							|  |  |  |     qemu_register_reset(pm_reset, pm); | 
					
						
							|  |  |  |     pm->powerdown_notifier.notify = pm_powerdown_req; | 
					
						
							|  |  |  |     qemu_register_powerdown_notifier(&pm->powerdown_notifier); | 
					
						
							| 
									
										
										
										
											2014-01-09 17:36:32 +01:00
										 |  |  | 
 | 
					
						
							| 
									
										
										
										
											2016-05-17 16:43:00 +02:00
										 |  |  |     legacy_acpi_cpu_hotplug_init(pci_address_space_io(lpc_pci), | 
					
						
							|  |  |  |         OBJECT(lpc_pci), &pm->gpe_cpu, ICH9_CPU_HOTPLUG_IO_BASE); | 
					
						
							| 
									
										
										
										
											2014-06-02 15:25:22 +02:00
										 |  |  | 
 | 
					
						
							|  |  |  |     if (pm->acpi_memory_hotplug.is_enabled) { | 
					
						
							|  |  |  |         acpi_memory_hotplug_init(pci_address_space_io(lpc_pci), OBJECT(lpc_pci), | 
					
						
							|  |  |  |                                  &pm->acpi_memory_hotplug); | 
					
						
							|  |  |  |     } | 
					
						
							| 
									
										
										
										
											2012-11-22 22:05:06 -05:00
										 |  |  | } | 
					
						
							| 
									
										
										
										
											2013-07-24 18:56:10 +03:00
										 |  |  | 
 | 
					
						
							| 
									
										
											  
											
												qom: Swap 'name' next to visitor in ObjectPropertyAccessor
Similar to the previous patch, it's nice to have all functions
in the tree that involve a visitor and a name for conversion to
or from QAPI to consistently stick the 'name' parameter next
to the Visitor parameter.
Done by manually changing include/qom/object.h and qom/object.c,
then running this Coccinelle script and touching up the fallout
(Coccinelle insisted on adding some trailing whitespace).
    @ rule1 @
    identifier fn;
    typedef Object, Visitor, Error;
    identifier obj, v, opaque, name, errp;
    @@
     void fn
    - (Object *obj, Visitor *v, void *opaque, const char *name,
    + (Object *obj, Visitor *v, const char *name, void *opaque,
       Error **errp) { ... }
    @@
    identifier rule1.fn;
    expression obj, v, opaque, name, errp;
    @@
     fn(obj, v,
    -   opaque, name,
    +   name, opaque,
        errp)
Signed-off-by: Eric Blake <eblake@redhat.com>
Reviewed-by: Marc-André Lureau <marcandre.lureau@redhat.com>
Message-Id: <1454075341-13658-20-git-send-email-eblake@redhat.com>
Signed-off-by: Markus Armbruster <armbru@redhat.com>
											
										 
											2016-01-29 06:48:55 -07:00
										 |  |  | static void ich9_pm_get_gpe0_blk(Object *obj, Visitor *v, const char *name, | 
					
						
							|  |  |  |                                  void *opaque, Error **errp) | 
					
						
							| 
									
										
										
										
											2013-07-24 18:56:10 +03:00
										 |  |  | { | 
					
						
							|  |  |  |     ICH9LPCPMRegs *pm = opaque; | 
					
						
							|  |  |  |     uint32_t value = pm->pm_io_base + ICH9_PMIO_GPE0_STS; | 
					
						
							|  |  |  | 
 | 
					
						
							| 
									
										
											  
											
												qapi: Swap visit_* arguments for consistent 'name' placement
JSON uses "name":value, but many of our visitor interfaces were
called with visit_type_FOO(v, &value, name, errp).  This can be
a bit confusing to have to mentally swap the parameter order to
match JSON order.  It's particularly bad for visit_start_struct(),
where the 'name' parameter is smack in the middle of the
otherwise-related group of 'obj, kind, size' parameters! It's
time to do a global swap of the parameter ordering, so that the
'name' parameter is always immediately after the Visitor argument.
Additional reason in favor of the swap: the existing include/qjson.h
prefers listing 'name' first in json_prop_*(), and I have plans to
unify that file with the qapi visitors; listing 'name' first in
qapi will minimize churn to the (admittedly few) qjson.h clients.
Later patches will then fix docs, object.h, visitor-impl.h, and
those clients to match.
Done by first patching scripts/qapi*.py by hand to make generated
files do what I want, then by running the following Coccinelle
script to affect the rest of the code base:
 $ spatch --sp-file script `git grep -l '\bvisit_' -- '**/*.[ch]'`
I then had to apply some touchups (Coccinelle insisted on TAB
indentation in visitor.h, and botched the signature of
visit_type_enum() by rewriting 'const char *const strings[]' to
the syntactically invalid 'const char*const[] strings').  The
movement of parameters is sufficient to provoke compiler errors
if any callers were missed.
    // Part 1: Swap declaration order
    @@
    type TV, TErr, TObj, T1, T2;
    identifier OBJ, ARG1, ARG2;
    @@
     void visit_start_struct
    -(TV v, TObj OBJ, T1 ARG1, const char *name, T2 ARG2, TErr errp)
    +(TV v, const char *name, TObj OBJ, T1 ARG1, T2 ARG2, TErr errp)
     { ... }
    @@
    type bool, TV, T1;
    identifier ARG1;
    @@
     bool visit_optional
    -(TV v, T1 ARG1, const char *name)
    +(TV v, const char *name, T1 ARG1)
     { ... }
    @@
    type TV, TErr, TObj, T1;
    identifier OBJ, ARG1;
    @@
     void visit_get_next_type
    -(TV v, TObj OBJ, T1 ARG1, const char *name, TErr errp)
    +(TV v, const char *name, TObj OBJ, T1 ARG1, TErr errp)
     { ... }
    @@
    type TV, TErr, TObj, T1, T2;
    identifier OBJ, ARG1, ARG2;
    @@
     void visit_type_enum
    -(TV v, TObj OBJ, T1 ARG1, T2 ARG2, const char *name, TErr errp)
    +(TV v, const char *name, TObj OBJ, T1 ARG1, T2 ARG2, TErr errp)
     { ... }
    @@
    type TV, TErr, TObj;
    identifier OBJ;
    identifier VISIT_TYPE =~ "^visit_type_";
    @@
     void VISIT_TYPE
    -(TV v, TObj OBJ, const char *name, TErr errp)
    +(TV v, const char *name, TObj OBJ, TErr errp)
     { ... }
    // Part 2: swap caller order
    @@
    expression V, NAME, OBJ, ARG1, ARG2, ERR;
    identifier VISIT_TYPE =~ "^visit_type_";
    @@
    (
    -visit_start_struct(V, OBJ, ARG1, NAME, ARG2, ERR)
    +visit_start_struct(V, NAME, OBJ, ARG1, ARG2, ERR)
    |
    -visit_optional(V, ARG1, NAME)
    +visit_optional(V, NAME, ARG1)
    |
    -visit_get_next_type(V, OBJ, ARG1, NAME, ERR)
    +visit_get_next_type(V, NAME, OBJ, ARG1, ERR)
    |
    -visit_type_enum(V, OBJ, ARG1, ARG2, NAME, ERR)
    +visit_type_enum(V, NAME, OBJ, ARG1, ARG2, ERR)
    |
    -VISIT_TYPE(V, OBJ, NAME, ERR)
    +VISIT_TYPE(V, NAME, OBJ, ERR)
    )
Signed-off-by: Eric Blake <eblake@redhat.com>
Reviewed-by: Marc-André Lureau <marcandre.lureau@redhat.com>
Message-Id: <1454075341-13658-19-git-send-email-eblake@redhat.com>
Signed-off-by: Markus Armbruster <armbru@redhat.com>
											
										 
											2016-01-29 06:48:54 -07:00
										 |  |  |     visit_type_uint32(v, name, &value, errp); | 
					
						
							| 
									
										
										
										
											2013-07-24 18:56:10 +03:00
										 |  |  | } | 
					
						
							|  |  |  | 
 | 
					
						
							| 
									
										
										
										
											2014-06-02 15:25:22 +02:00
										 |  |  | static bool ich9_pm_get_memory_hotplug_support(Object *obj, Error **errp) | 
					
						
							|  |  |  | { | 
					
						
							|  |  |  |     ICH9LPCState *s = ICH9_LPC_DEVICE(obj); | 
					
						
							|  |  |  | 
 | 
					
						
							|  |  |  |     return s->pm.acpi_memory_hotplug.is_enabled; | 
					
						
							|  |  |  | } | 
					
						
							|  |  |  | 
 | 
					
						
							|  |  |  | static void ich9_pm_set_memory_hotplug_support(Object *obj, bool value, | 
					
						
							|  |  |  |                                                Error **errp) | 
					
						
							|  |  |  | { | 
					
						
							|  |  |  |     ICH9LPCState *s = ICH9_LPC_DEVICE(obj); | 
					
						
							|  |  |  | 
 | 
					
						
							|  |  |  |     s->pm.acpi_memory_hotplug.is_enabled = value; | 
					
						
							|  |  |  | } | 
					
						
							|  |  |  | 
 | 
					
						
							| 
									
										
										
										
											2016-04-11 17:25:54 +02:00
										 |  |  | static bool ich9_pm_get_cpu_hotplug_legacy(Object *obj, Error **errp) | 
					
						
							|  |  |  | { | 
					
						
							|  |  |  |     ICH9LPCState *s = ICH9_LPC_DEVICE(obj); | 
					
						
							|  |  |  | 
 | 
					
						
							|  |  |  |     return s->pm.cpu_hotplug_legacy; | 
					
						
							|  |  |  | } | 
					
						
							|  |  |  | 
 | 
					
						
							|  |  |  | static void ich9_pm_set_cpu_hotplug_legacy(Object *obj, bool value, | 
					
						
							|  |  |  |                                            Error **errp) | 
					
						
							|  |  |  | { | 
					
						
							|  |  |  |     ICH9LPCState *s = ICH9_LPC_DEVICE(obj); | 
					
						
							|  |  |  | 
 | 
					
						
							| 
									
										
										
										
											2016-06-15 11:25:23 +02:00
										 |  |  |     assert(!value); | 
					
						
							|  |  |  |     if (s->pm.cpu_hotplug_legacy && value == false) { | 
					
						
							|  |  |  |         acpi_switch_to_modern_cphp(&s->pm.gpe_cpu, &s->pm.cpuhp_state, | 
					
						
							|  |  |  |                                    ICH9_CPU_HOTPLUG_IO_BASE); | 
					
						
							|  |  |  |     } | 
					
						
							| 
									
										
										
										
											2016-04-11 17:25:54 +02:00
										 |  |  |     s->pm.cpu_hotplug_legacy = value; | 
					
						
							|  |  |  | } | 
					
						
							|  |  |  | 
 | 
					
						
							| 
									
										
											  
											
												qom: Swap 'name' next to visitor in ObjectPropertyAccessor
Similar to the previous patch, it's nice to have all functions
in the tree that involve a visitor and a name for conversion to
or from QAPI to consistently stick the 'name' parameter next
to the Visitor parameter.
Done by manually changing include/qom/object.h and qom/object.c,
then running this Coccinelle script and touching up the fallout
(Coccinelle insisted on adding some trailing whitespace).
    @ rule1 @
    identifier fn;
    typedef Object, Visitor, Error;
    identifier obj, v, opaque, name, errp;
    @@
     void fn
    - (Object *obj, Visitor *v, void *opaque, const char *name,
    + (Object *obj, Visitor *v, const char *name, void *opaque,
       Error **errp) { ... }
    @@
    identifier rule1.fn;
    expression obj, v, opaque, name, errp;
    @@
     fn(obj, v,
    -   opaque, name,
    +   name, opaque,
        errp)
Signed-off-by: Eric Blake <eblake@redhat.com>
Reviewed-by: Marc-André Lureau <marcandre.lureau@redhat.com>
Message-Id: <1454075341-13658-20-git-send-email-eblake@redhat.com>
Signed-off-by: Markus Armbruster <armbru@redhat.com>
											
										 
											2016-01-29 06:48:55 -07:00
										 |  |  | static void ich9_pm_get_disable_s3(Object *obj, Visitor *v, const char *name, | 
					
						
							|  |  |  |                                    void *opaque, Error **errp) | 
					
						
							| 
									
										
										
										
											2015-01-12 17:30:14 +05:30
										 |  |  | { | 
					
						
							|  |  |  |     ICH9LPCPMRegs *pm = opaque; | 
					
						
							|  |  |  |     uint8_t value = pm->disable_s3; | 
					
						
							|  |  |  | 
 | 
					
						
							| 
									
										
											  
											
												qapi: Swap visit_* arguments for consistent 'name' placement
JSON uses "name":value, but many of our visitor interfaces were
called with visit_type_FOO(v, &value, name, errp).  This can be
a bit confusing to have to mentally swap the parameter order to
match JSON order.  It's particularly bad for visit_start_struct(),
where the 'name' parameter is smack in the middle of the
otherwise-related group of 'obj, kind, size' parameters! It's
time to do a global swap of the parameter ordering, so that the
'name' parameter is always immediately after the Visitor argument.
Additional reason in favor of the swap: the existing include/qjson.h
prefers listing 'name' first in json_prop_*(), and I have plans to
unify that file with the qapi visitors; listing 'name' first in
qapi will minimize churn to the (admittedly few) qjson.h clients.
Later patches will then fix docs, object.h, visitor-impl.h, and
those clients to match.
Done by first patching scripts/qapi*.py by hand to make generated
files do what I want, then by running the following Coccinelle
script to affect the rest of the code base:
 $ spatch --sp-file script `git grep -l '\bvisit_' -- '**/*.[ch]'`
I then had to apply some touchups (Coccinelle insisted on TAB
indentation in visitor.h, and botched the signature of
visit_type_enum() by rewriting 'const char *const strings[]' to
the syntactically invalid 'const char*const[] strings').  The
movement of parameters is sufficient to provoke compiler errors
if any callers were missed.
    // Part 1: Swap declaration order
    @@
    type TV, TErr, TObj, T1, T2;
    identifier OBJ, ARG1, ARG2;
    @@
     void visit_start_struct
    -(TV v, TObj OBJ, T1 ARG1, const char *name, T2 ARG2, TErr errp)
    +(TV v, const char *name, TObj OBJ, T1 ARG1, T2 ARG2, TErr errp)
     { ... }
    @@
    type bool, TV, T1;
    identifier ARG1;
    @@
     bool visit_optional
    -(TV v, T1 ARG1, const char *name)
    +(TV v, const char *name, T1 ARG1)
     { ... }
    @@
    type TV, TErr, TObj, T1;
    identifier OBJ, ARG1;
    @@
     void visit_get_next_type
    -(TV v, TObj OBJ, T1 ARG1, const char *name, TErr errp)
    +(TV v, const char *name, TObj OBJ, T1 ARG1, TErr errp)
     { ... }
    @@
    type TV, TErr, TObj, T1, T2;
    identifier OBJ, ARG1, ARG2;
    @@
     void visit_type_enum
    -(TV v, TObj OBJ, T1 ARG1, T2 ARG2, const char *name, TErr errp)
    +(TV v, const char *name, TObj OBJ, T1 ARG1, T2 ARG2, TErr errp)
     { ... }
    @@
    type TV, TErr, TObj;
    identifier OBJ;
    identifier VISIT_TYPE =~ "^visit_type_";
    @@
     void VISIT_TYPE
    -(TV v, TObj OBJ, const char *name, TErr errp)
    +(TV v, const char *name, TObj OBJ, TErr errp)
     { ... }
    // Part 2: swap caller order
    @@
    expression V, NAME, OBJ, ARG1, ARG2, ERR;
    identifier VISIT_TYPE =~ "^visit_type_";
    @@
    (
    -visit_start_struct(V, OBJ, ARG1, NAME, ARG2, ERR)
    +visit_start_struct(V, NAME, OBJ, ARG1, ARG2, ERR)
    |
    -visit_optional(V, ARG1, NAME)
    +visit_optional(V, NAME, ARG1)
    |
    -visit_get_next_type(V, OBJ, ARG1, NAME, ERR)
    +visit_get_next_type(V, NAME, OBJ, ARG1, ERR)
    |
    -visit_type_enum(V, OBJ, ARG1, ARG2, NAME, ERR)
    +visit_type_enum(V, NAME, OBJ, ARG1, ARG2, ERR)
    |
    -VISIT_TYPE(V, OBJ, NAME, ERR)
    +VISIT_TYPE(V, NAME, OBJ, ERR)
    )
Signed-off-by: Eric Blake <eblake@redhat.com>
Reviewed-by: Marc-André Lureau <marcandre.lureau@redhat.com>
Message-Id: <1454075341-13658-19-git-send-email-eblake@redhat.com>
Signed-off-by: Markus Armbruster <armbru@redhat.com>
											
										 
											2016-01-29 06:48:54 -07:00
										 |  |  |     visit_type_uint8(v, name, &value, errp); | 
					
						
							| 
									
										
										
										
											2015-01-12 17:30:14 +05:30
										 |  |  | } | 
					
						
							|  |  |  | 
 | 
					
						
							| 
									
										
											  
											
												qom: Swap 'name' next to visitor in ObjectPropertyAccessor
Similar to the previous patch, it's nice to have all functions
in the tree that involve a visitor and a name for conversion to
or from QAPI to consistently stick the 'name' parameter next
to the Visitor parameter.
Done by manually changing include/qom/object.h and qom/object.c,
then running this Coccinelle script and touching up the fallout
(Coccinelle insisted on adding some trailing whitespace).
    @ rule1 @
    identifier fn;
    typedef Object, Visitor, Error;
    identifier obj, v, opaque, name, errp;
    @@
     void fn
    - (Object *obj, Visitor *v, void *opaque, const char *name,
    + (Object *obj, Visitor *v, const char *name, void *opaque,
       Error **errp) { ... }
    @@
    identifier rule1.fn;
    expression obj, v, opaque, name, errp;
    @@
     fn(obj, v,
    -   opaque, name,
    +   name, opaque,
        errp)
Signed-off-by: Eric Blake <eblake@redhat.com>
Reviewed-by: Marc-André Lureau <marcandre.lureau@redhat.com>
Message-Id: <1454075341-13658-20-git-send-email-eblake@redhat.com>
Signed-off-by: Markus Armbruster <armbru@redhat.com>
											
										 
											2016-01-29 06:48:55 -07:00
										 |  |  | static void ich9_pm_set_disable_s3(Object *obj, Visitor *v, const char *name, | 
					
						
							|  |  |  |                                    void *opaque, Error **errp) | 
					
						
							| 
									
										
										
										
											2015-01-12 17:30:14 +05:30
										 |  |  | { | 
					
						
							|  |  |  |     ICH9LPCPMRegs *pm = opaque; | 
					
						
							|  |  |  |     Error *local_err = NULL; | 
					
						
							|  |  |  |     uint8_t value; | 
					
						
							|  |  |  | 
 | 
					
						
							| 
									
										
											  
											
												qapi: Swap visit_* arguments for consistent 'name' placement
JSON uses "name":value, but many of our visitor interfaces were
called with visit_type_FOO(v, &value, name, errp).  This can be
a bit confusing to have to mentally swap the parameter order to
match JSON order.  It's particularly bad for visit_start_struct(),
where the 'name' parameter is smack in the middle of the
otherwise-related group of 'obj, kind, size' parameters! It's
time to do a global swap of the parameter ordering, so that the
'name' parameter is always immediately after the Visitor argument.
Additional reason in favor of the swap: the existing include/qjson.h
prefers listing 'name' first in json_prop_*(), and I have plans to
unify that file with the qapi visitors; listing 'name' first in
qapi will minimize churn to the (admittedly few) qjson.h clients.
Later patches will then fix docs, object.h, visitor-impl.h, and
those clients to match.
Done by first patching scripts/qapi*.py by hand to make generated
files do what I want, then by running the following Coccinelle
script to affect the rest of the code base:
 $ spatch --sp-file script `git grep -l '\bvisit_' -- '**/*.[ch]'`
I then had to apply some touchups (Coccinelle insisted on TAB
indentation in visitor.h, and botched the signature of
visit_type_enum() by rewriting 'const char *const strings[]' to
the syntactically invalid 'const char*const[] strings').  The
movement of parameters is sufficient to provoke compiler errors
if any callers were missed.
    // Part 1: Swap declaration order
    @@
    type TV, TErr, TObj, T1, T2;
    identifier OBJ, ARG1, ARG2;
    @@
     void visit_start_struct
    -(TV v, TObj OBJ, T1 ARG1, const char *name, T2 ARG2, TErr errp)
    +(TV v, const char *name, TObj OBJ, T1 ARG1, T2 ARG2, TErr errp)
     { ... }
    @@
    type bool, TV, T1;
    identifier ARG1;
    @@
     bool visit_optional
    -(TV v, T1 ARG1, const char *name)
    +(TV v, const char *name, T1 ARG1)
     { ... }
    @@
    type TV, TErr, TObj, T1;
    identifier OBJ, ARG1;
    @@
     void visit_get_next_type
    -(TV v, TObj OBJ, T1 ARG1, const char *name, TErr errp)
    +(TV v, const char *name, TObj OBJ, T1 ARG1, TErr errp)
     { ... }
    @@
    type TV, TErr, TObj, T1, T2;
    identifier OBJ, ARG1, ARG2;
    @@
     void visit_type_enum
    -(TV v, TObj OBJ, T1 ARG1, T2 ARG2, const char *name, TErr errp)
    +(TV v, const char *name, TObj OBJ, T1 ARG1, T2 ARG2, TErr errp)
     { ... }
    @@
    type TV, TErr, TObj;
    identifier OBJ;
    identifier VISIT_TYPE =~ "^visit_type_";
    @@
     void VISIT_TYPE
    -(TV v, TObj OBJ, const char *name, TErr errp)
    +(TV v, const char *name, TObj OBJ, TErr errp)
     { ... }
    // Part 2: swap caller order
    @@
    expression V, NAME, OBJ, ARG1, ARG2, ERR;
    identifier VISIT_TYPE =~ "^visit_type_";
    @@
    (
    -visit_start_struct(V, OBJ, ARG1, NAME, ARG2, ERR)
    +visit_start_struct(V, NAME, OBJ, ARG1, ARG2, ERR)
    |
    -visit_optional(V, ARG1, NAME)
    +visit_optional(V, NAME, ARG1)
    |
    -visit_get_next_type(V, OBJ, ARG1, NAME, ERR)
    +visit_get_next_type(V, NAME, OBJ, ARG1, ERR)
    |
    -visit_type_enum(V, OBJ, ARG1, ARG2, NAME, ERR)
    +visit_type_enum(V, NAME, OBJ, ARG1, ARG2, ERR)
    |
    -VISIT_TYPE(V, OBJ, NAME, ERR)
    +VISIT_TYPE(V, NAME, OBJ, ERR)
    )
Signed-off-by: Eric Blake <eblake@redhat.com>
Reviewed-by: Marc-André Lureau <marcandre.lureau@redhat.com>
Message-Id: <1454075341-13658-19-git-send-email-eblake@redhat.com>
Signed-off-by: Markus Armbruster <armbru@redhat.com>
											
										 
											2016-01-29 06:48:54 -07:00
										 |  |  |     visit_type_uint8(v, name, &value, &local_err); | 
					
						
							| 
									
										
										
										
											2015-01-12 17:30:14 +05:30
										 |  |  |     if (local_err) { | 
					
						
							|  |  |  |         goto out; | 
					
						
							|  |  |  |     } | 
					
						
							|  |  |  |     pm->disable_s3 = value; | 
					
						
							|  |  |  | out: | 
					
						
							|  |  |  |     error_propagate(errp, local_err); | 
					
						
							|  |  |  | } | 
					
						
							|  |  |  | 
 | 
					
						
							| 
									
										
											  
											
												qom: Swap 'name' next to visitor in ObjectPropertyAccessor
Similar to the previous patch, it's nice to have all functions
in the tree that involve a visitor and a name for conversion to
or from QAPI to consistently stick the 'name' parameter next
to the Visitor parameter.
Done by manually changing include/qom/object.h and qom/object.c,
then running this Coccinelle script and touching up the fallout
(Coccinelle insisted on adding some trailing whitespace).
    @ rule1 @
    identifier fn;
    typedef Object, Visitor, Error;
    identifier obj, v, opaque, name, errp;
    @@
     void fn
    - (Object *obj, Visitor *v, void *opaque, const char *name,
    + (Object *obj, Visitor *v, const char *name, void *opaque,
       Error **errp) { ... }
    @@
    identifier rule1.fn;
    expression obj, v, opaque, name, errp;
    @@
     fn(obj, v,
    -   opaque, name,
    +   name, opaque,
        errp)
Signed-off-by: Eric Blake <eblake@redhat.com>
Reviewed-by: Marc-André Lureau <marcandre.lureau@redhat.com>
Message-Id: <1454075341-13658-20-git-send-email-eblake@redhat.com>
Signed-off-by: Markus Armbruster <armbru@redhat.com>
											
										 
											2016-01-29 06:48:55 -07:00
										 |  |  | static void ich9_pm_get_disable_s4(Object *obj, Visitor *v, const char *name, | 
					
						
							|  |  |  |                                    void *opaque, Error **errp) | 
					
						
							| 
									
										
										
										
											2015-01-12 17:30:14 +05:30
										 |  |  | { | 
					
						
							|  |  |  |     ICH9LPCPMRegs *pm = opaque; | 
					
						
							|  |  |  |     uint8_t value = pm->disable_s4; | 
					
						
							|  |  |  | 
 | 
					
						
							| 
									
										
											  
											
												qapi: Swap visit_* arguments for consistent 'name' placement
JSON uses "name":value, but many of our visitor interfaces were
called with visit_type_FOO(v, &value, name, errp).  This can be
a bit confusing to have to mentally swap the parameter order to
match JSON order.  It's particularly bad for visit_start_struct(),
where the 'name' parameter is smack in the middle of the
otherwise-related group of 'obj, kind, size' parameters! It's
time to do a global swap of the parameter ordering, so that the
'name' parameter is always immediately after the Visitor argument.
Additional reason in favor of the swap: the existing include/qjson.h
prefers listing 'name' first in json_prop_*(), and I have plans to
unify that file with the qapi visitors; listing 'name' first in
qapi will minimize churn to the (admittedly few) qjson.h clients.
Later patches will then fix docs, object.h, visitor-impl.h, and
those clients to match.
Done by first patching scripts/qapi*.py by hand to make generated
files do what I want, then by running the following Coccinelle
script to affect the rest of the code base:
 $ spatch --sp-file script `git grep -l '\bvisit_' -- '**/*.[ch]'`
I then had to apply some touchups (Coccinelle insisted on TAB
indentation in visitor.h, and botched the signature of
visit_type_enum() by rewriting 'const char *const strings[]' to
the syntactically invalid 'const char*const[] strings').  The
movement of parameters is sufficient to provoke compiler errors
if any callers were missed.
    // Part 1: Swap declaration order
    @@
    type TV, TErr, TObj, T1, T2;
    identifier OBJ, ARG1, ARG2;
    @@
     void visit_start_struct
    -(TV v, TObj OBJ, T1 ARG1, const char *name, T2 ARG2, TErr errp)
    +(TV v, const char *name, TObj OBJ, T1 ARG1, T2 ARG2, TErr errp)
     { ... }
    @@
    type bool, TV, T1;
    identifier ARG1;
    @@
     bool visit_optional
    -(TV v, T1 ARG1, const char *name)
    +(TV v, const char *name, T1 ARG1)
     { ... }
    @@
    type TV, TErr, TObj, T1;
    identifier OBJ, ARG1;
    @@
     void visit_get_next_type
    -(TV v, TObj OBJ, T1 ARG1, const char *name, TErr errp)
    +(TV v, const char *name, TObj OBJ, T1 ARG1, TErr errp)
     { ... }
    @@
    type TV, TErr, TObj, T1, T2;
    identifier OBJ, ARG1, ARG2;
    @@
     void visit_type_enum
    -(TV v, TObj OBJ, T1 ARG1, T2 ARG2, const char *name, TErr errp)
    +(TV v, const char *name, TObj OBJ, T1 ARG1, T2 ARG2, TErr errp)
     { ... }
    @@
    type TV, TErr, TObj;
    identifier OBJ;
    identifier VISIT_TYPE =~ "^visit_type_";
    @@
     void VISIT_TYPE
    -(TV v, TObj OBJ, const char *name, TErr errp)
    +(TV v, const char *name, TObj OBJ, TErr errp)
     { ... }
    // Part 2: swap caller order
    @@
    expression V, NAME, OBJ, ARG1, ARG2, ERR;
    identifier VISIT_TYPE =~ "^visit_type_";
    @@
    (
    -visit_start_struct(V, OBJ, ARG1, NAME, ARG2, ERR)
    +visit_start_struct(V, NAME, OBJ, ARG1, ARG2, ERR)
    |
    -visit_optional(V, ARG1, NAME)
    +visit_optional(V, NAME, ARG1)
    |
    -visit_get_next_type(V, OBJ, ARG1, NAME, ERR)
    +visit_get_next_type(V, NAME, OBJ, ARG1, ERR)
    |
    -visit_type_enum(V, OBJ, ARG1, ARG2, NAME, ERR)
    +visit_type_enum(V, NAME, OBJ, ARG1, ARG2, ERR)
    |
    -VISIT_TYPE(V, OBJ, NAME, ERR)
    +VISIT_TYPE(V, NAME, OBJ, ERR)
    )
Signed-off-by: Eric Blake <eblake@redhat.com>
Reviewed-by: Marc-André Lureau <marcandre.lureau@redhat.com>
Message-Id: <1454075341-13658-19-git-send-email-eblake@redhat.com>
Signed-off-by: Markus Armbruster <armbru@redhat.com>
											
										 
											2016-01-29 06:48:54 -07:00
										 |  |  |     visit_type_uint8(v, name, &value, errp); | 
					
						
							| 
									
										
										
										
											2015-01-12 17:30:14 +05:30
										 |  |  | } | 
					
						
							|  |  |  | 
 | 
					
						
							| 
									
										
											  
											
												qom: Swap 'name' next to visitor in ObjectPropertyAccessor
Similar to the previous patch, it's nice to have all functions
in the tree that involve a visitor and a name for conversion to
or from QAPI to consistently stick the 'name' parameter next
to the Visitor parameter.
Done by manually changing include/qom/object.h and qom/object.c,
then running this Coccinelle script and touching up the fallout
(Coccinelle insisted on adding some trailing whitespace).
    @ rule1 @
    identifier fn;
    typedef Object, Visitor, Error;
    identifier obj, v, opaque, name, errp;
    @@
     void fn
    - (Object *obj, Visitor *v, void *opaque, const char *name,
    + (Object *obj, Visitor *v, const char *name, void *opaque,
       Error **errp) { ... }
    @@
    identifier rule1.fn;
    expression obj, v, opaque, name, errp;
    @@
     fn(obj, v,
    -   opaque, name,
    +   name, opaque,
        errp)
Signed-off-by: Eric Blake <eblake@redhat.com>
Reviewed-by: Marc-André Lureau <marcandre.lureau@redhat.com>
Message-Id: <1454075341-13658-20-git-send-email-eblake@redhat.com>
Signed-off-by: Markus Armbruster <armbru@redhat.com>
											
										 
											2016-01-29 06:48:55 -07:00
										 |  |  | static void ich9_pm_set_disable_s4(Object *obj, Visitor *v, const char *name, | 
					
						
							|  |  |  |                                    void *opaque, Error **errp) | 
					
						
							| 
									
										
										
										
											2015-01-12 17:30:14 +05:30
										 |  |  | { | 
					
						
							|  |  |  |     ICH9LPCPMRegs *pm = opaque; | 
					
						
							|  |  |  |     Error *local_err = NULL; | 
					
						
							|  |  |  |     uint8_t value; | 
					
						
							|  |  |  | 
 | 
					
						
							| 
									
										
											  
											
												qapi: Swap visit_* arguments for consistent 'name' placement
JSON uses "name":value, but many of our visitor interfaces were
called with visit_type_FOO(v, &value, name, errp).  This can be
a bit confusing to have to mentally swap the parameter order to
match JSON order.  It's particularly bad for visit_start_struct(),
where the 'name' parameter is smack in the middle of the
otherwise-related group of 'obj, kind, size' parameters! It's
time to do a global swap of the parameter ordering, so that the
'name' parameter is always immediately after the Visitor argument.
Additional reason in favor of the swap: the existing include/qjson.h
prefers listing 'name' first in json_prop_*(), and I have plans to
unify that file with the qapi visitors; listing 'name' first in
qapi will minimize churn to the (admittedly few) qjson.h clients.
Later patches will then fix docs, object.h, visitor-impl.h, and
those clients to match.
Done by first patching scripts/qapi*.py by hand to make generated
files do what I want, then by running the following Coccinelle
script to affect the rest of the code base:
 $ spatch --sp-file script `git grep -l '\bvisit_' -- '**/*.[ch]'`
I then had to apply some touchups (Coccinelle insisted on TAB
indentation in visitor.h, and botched the signature of
visit_type_enum() by rewriting 'const char *const strings[]' to
the syntactically invalid 'const char*const[] strings').  The
movement of parameters is sufficient to provoke compiler errors
if any callers were missed.
    // Part 1: Swap declaration order
    @@
    type TV, TErr, TObj, T1, T2;
    identifier OBJ, ARG1, ARG2;
    @@
     void visit_start_struct
    -(TV v, TObj OBJ, T1 ARG1, const char *name, T2 ARG2, TErr errp)
    +(TV v, const char *name, TObj OBJ, T1 ARG1, T2 ARG2, TErr errp)
     { ... }
    @@
    type bool, TV, T1;
    identifier ARG1;
    @@
     bool visit_optional
    -(TV v, T1 ARG1, const char *name)
    +(TV v, const char *name, T1 ARG1)
     { ... }
    @@
    type TV, TErr, TObj, T1;
    identifier OBJ, ARG1;
    @@
     void visit_get_next_type
    -(TV v, TObj OBJ, T1 ARG1, const char *name, TErr errp)
    +(TV v, const char *name, TObj OBJ, T1 ARG1, TErr errp)
     { ... }
    @@
    type TV, TErr, TObj, T1, T2;
    identifier OBJ, ARG1, ARG2;
    @@
     void visit_type_enum
    -(TV v, TObj OBJ, T1 ARG1, T2 ARG2, const char *name, TErr errp)
    +(TV v, const char *name, TObj OBJ, T1 ARG1, T2 ARG2, TErr errp)
     { ... }
    @@
    type TV, TErr, TObj;
    identifier OBJ;
    identifier VISIT_TYPE =~ "^visit_type_";
    @@
     void VISIT_TYPE
    -(TV v, TObj OBJ, const char *name, TErr errp)
    +(TV v, const char *name, TObj OBJ, TErr errp)
     { ... }
    // Part 2: swap caller order
    @@
    expression V, NAME, OBJ, ARG1, ARG2, ERR;
    identifier VISIT_TYPE =~ "^visit_type_";
    @@
    (
    -visit_start_struct(V, OBJ, ARG1, NAME, ARG2, ERR)
    +visit_start_struct(V, NAME, OBJ, ARG1, ARG2, ERR)
    |
    -visit_optional(V, ARG1, NAME)
    +visit_optional(V, NAME, ARG1)
    |
    -visit_get_next_type(V, OBJ, ARG1, NAME, ERR)
    +visit_get_next_type(V, NAME, OBJ, ARG1, ERR)
    |
    -visit_type_enum(V, OBJ, ARG1, ARG2, NAME, ERR)
    +visit_type_enum(V, NAME, OBJ, ARG1, ARG2, ERR)
    |
    -VISIT_TYPE(V, OBJ, NAME, ERR)
    +VISIT_TYPE(V, NAME, OBJ, ERR)
    )
Signed-off-by: Eric Blake <eblake@redhat.com>
Reviewed-by: Marc-André Lureau <marcandre.lureau@redhat.com>
Message-Id: <1454075341-13658-19-git-send-email-eblake@redhat.com>
Signed-off-by: Markus Armbruster <armbru@redhat.com>
											
										 
											2016-01-29 06:48:54 -07:00
										 |  |  |     visit_type_uint8(v, name, &value, &local_err); | 
					
						
							| 
									
										
										
										
											2015-01-12 17:30:14 +05:30
										 |  |  |     if (local_err) { | 
					
						
							|  |  |  |         goto out; | 
					
						
							|  |  |  |     } | 
					
						
							|  |  |  |     pm->disable_s4 = value; | 
					
						
							|  |  |  | out: | 
					
						
							|  |  |  |     error_propagate(errp, local_err); | 
					
						
							|  |  |  | } | 
					
						
							|  |  |  | 
 | 
					
						
							| 
									
										
											  
											
												qom: Swap 'name' next to visitor in ObjectPropertyAccessor
Similar to the previous patch, it's nice to have all functions
in the tree that involve a visitor and a name for conversion to
or from QAPI to consistently stick the 'name' parameter next
to the Visitor parameter.
Done by manually changing include/qom/object.h and qom/object.c,
then running this Coccinelle script and touching up the fallout
(Coccinelle insisted on adding some trailing whitespace).
    @ rule1 @
    identifier fn;
    typedef Object, Visitor, Error;
    identifier obj, v, opaque, name, errp;
    @@
     void fn
    - (Object *obj, Visitor *v, void *opaque, const char *name,
    + (Object *obj, Visitor *v, const char *name, void *opaque,
       Error **errp) { ... }
    @@
    identifier rule1.fn;
    expression obj, v, opaque, name, errp;
    @@
     fn(obj, v,
    -   opaque, name,
    +   name, opaque,
        errp)
Signed-off-by: Eric Blake <eblake@redhat.com>
Reviewed-by: Marc-André Lureau <marcandre.lureau@redhat.com>
Message-Id: <1454075341-13658-20-git-send-email-eblake@redhat.com>
Signed-off-by: Markus Armbruster <armbru@redhat.com>
											
										 
											2016-01-29 06:48:55 -07:00
										 |  |  | static void ich9_pm_get_s4_val(Object *obj, Visitor *v, const char *name, | 
					
						
							|  |  |  |                                void *opaque, Error **errp) | 
					
						
							| 
									
										
										
										
											2015-01-12 17:30:14 +05:30
										 |  |  | { | 
					
						
							|  |  |  |     ICH9LPCPMRegs *pm = opaque; | 
					
						
							|  |  |  |     uint8_t value = pm->s4_val; | 
					
						
							|  |  |  | 
 | 
					
						
							| 
									
										
											  
											
												qapi: Swap visit_* arguments for consistent 'name' placement
JSON uses "name":value, but many of our visitor interfaces were
called with visit_type_FOO(v, &value, name, errp).  This can be
a bit confusing to have to mentally swap the parameter order to
match JSON order.  It's particularly bad for visit_start_struct(),
where the 'name' parameter is smack in the middle of the
otherwise-related group of 'obj, kind, size' parameters! It's
time to do a global swap of the parameter ordering, so that the
'name' parameter is always immediately after the Visitor argument.
Additional reason in favor of the swap: the existing include/qjson.h
prefers listing 'name' first in json_prop_*(), and I have plans to
unify that file with the qapi visitors; listing 'name' first in
qapi will minimize churn to the (admittedly few) qjson.h clients.
Later patches will then fix docs, object.h, visitor-impl.h, and
those clients to match.
Done by first patching scripts/qapi*.py by hand to make generated
files do what I want, then by running the following Coccinelle
script to affect the rest of the code base:
 $ spatch --sp-file script `git grep -l '\bvisit_' -- '**/*.[ch]'`
I then had to apply some touchups (Coccinelle insisted on TAB
indentation in visitor.h, and botched the signature of
visit_type_enum() by rewriting 'const char *const strings[]' to
the syntactically invalid 'const char*const[] strings').  The
movement of parameters is sufficient to provoke compiler errors
if any callers were missed.
    // Part 1: Swap declaration order
    @@
    type TV, TErr, TObj, T1, T2;
    identifier OBJ, ARG1, ARG2;
    @@
     void visit_start_struct
    -(TV v, TObj OBJ, T1 ARG1, const char *name, T2 ARG2, TErr errp)
    +(TV v, const char *name, TObj OBJ, T1 ARG1, T2 ARG2, TErr errp)
     { ... }
    @@
    type bool, TV, T1;
    identifier ARG1;
    @@
     bool visit_optional
    -(TV v, T1 ARG1, const char *name)
    +(TV v, const char *name, T1 ARG1)
     { ... }
    @@
    type TV, TErr, TObj, T1;
    identifier OBJ, ARG1;
    @@
     void visit_get_next_type
    -(TV v, TObj OBJ, T1 ARG1, const char *name, TErr errp)
    +(TV v, const char *name, TObj OBJ, T1 ARG1, TErr errp)
     { ... }
    @@
    type TV, TErr, TObj, T1, T2;
    identifier OBJ, ARG1, ARG2;
    @@
     void visit_type_enum
    -(TV v, TObj OBJ, T1 ARG1, T2 ARG2, const char *name, TErr errp)
    +(TV v, const char *name, TObj OBJ, T1 ARG1, T2 ARG2, TErr errp)
     { ... }
    @@
    type TV, TErr, TObj;
    identifier OBJ;
    identifier VISIT_TYPE =~ "^visit_type_";
    @@
     void VISIT_TYPE
    -(TV v, TObj OBJ, const char *name, TErr errp)
    +(TV v, const char *name, TObj OBJ, TErr errp)
     { ... }
    // Part 2: swap caller order
    @@
    expression V, NAME, OBJ, ARG1, ARG2, ERR;
    identifier VISIT_TYPE =~ "^visit_type_";
    @@
    (
    -visit_start_struct(V, OBJ, ARG1, NAME, ARG2, ERR)
    +visit_start_struct(V, NAME, OBJ, ARG1, ARG2, ERR)
    |
    -visit_optional(V, ARG1, NAME)
    +visit_optional(V, NAME, ARG1)
    |
    -visit_get_next_type(V, OBJ, ARG1, NAME, ERR)
    +visit_get_next_type(V, NAME, OBJ, ARG1, ERR)
    |
    -visit_type_enum(V, OBJ, ARG1, ARG2, NAME, ERR)
    +visit_type_enum(V, NAME, OBJ, ARG1, ARG2, ERR)
    |
    -VISIT_TYPE(V, OBJ, NAME, ERR)
    +VISIT_TYPE(V, NAME, OBJ, ERR)
    )
Signed-off-by: Eric Blake <eblake@redhat.com>
Reviewed-by: Marc-André Lureau <marcandre.lureau@redhat.com>
Message-Id: <1454075341-13658-19-git-send-email-eblake@redhat.com>
Signed-off-by: Markus Armbruster <armbru@redhat.com>
											
										 
											2016-01-29 06:48:54 -07:00
										 |  |  |     visit_type_uint8(v, name, &value, errp); | 
					
						
							| 
									
										
										
										
											2015-01-12 17:30:14 +05:30
										 |  |  | } | 
					
						
							|  |  |  | 
 | 
					
						
							| 
									
										
											  
											
												qom: Swap 'name' next to visitor in ObjectPropertyAccessor
Similar to the previous patch, it's nice to have all functions
in the tree that involve a visitor and a name for conversion to
or from QAPI to consistently stick the 'name' parameter next
to the Visitor parameter.
Done by manually changing include/qom/object.h and qom/object.c,
then running this Coccinelle script and touching up the fallout
(Coccinelle insisted on adding some trailing whitespace).
    @ rule1 @
    identifier fn;
    typedef Object, Visitor, Error;
    identifier obj, v, opaque, name, errp;
    @@
     void fn
    - (Object *obj, Visitor *v, void *opaque, const char *name,
    + (Object *obj, Visitor *v, const char *name, void *opaque,
       Error **errp) { ... }
    @@
    identifier rule1.fn;
    expression obj, v, opaque, name, errp;
    @@
     fn(obj, v,
    -   opaque, name,
    +   name, opaque,
        errp)
Signed-off-by: Eric Blake <eblake@redhat.com>
Reviewed-by: Marc-André Lureau <marcandre.lureau@redhat.com>
Message-Id: <1454075341-13658-20-git-send-email-eblake@redhat.com>
Signed-off-by: Markus Armbruster <armbru@redhat.com>
											
										 
											2016-01-29 06:48:55 -07:00
										 |  |  | static void ich9_pm_set_s4_val(Object *obj, Visitor *v, const char *name, | 
					
						
							|  |  |  |                                void *opaque, Error **errp) | 
					
						
							| 
									
										
										
										
											2015-01-12 17:30:14 +05:30
										 |  |  | { | 
					
						
							|  |  |  |     ICH9LPCPMRegs *pm = opaque; | 
					
						
							|  |  |  |     Error *local_err = NULL; | 
					
						
							|  |  |  |     uint8_t value; | 
					
						
							|  |  |  | 
 | 
					
						
							| 
									
										
											  
											
												qapi: Swap visit_* arguments for consistent 'name' placement
JSON uses "name":value, but many of our visitor interfaces were
called with visit_type_FOO(v, &value, name, errp).  This can be
a bit confusing to have to mentally swap the parameter order to
match JSON order.  It's particularly bad for visit_start_struct(),
where the 'name' parameter is smack in the middle of the
otherwise-related group of 'obj, kind, size' parameters! It's
time to do a global swap of the parameter ordering, so that the
'name' parameter is always immediately after the Visitor argument.
Additional reason in favor of the swap: the existing include/qjson.h
prefers listing 'name' first in json_prop_*(), and I have plans to
unify that file with the qapi visitors; listing 'name' first in
qapi will minimize churn to the (admittedly few) qjson.h clients.
Later patches will then fix docs, object.h, visitor-impl.h, and
those clients to match.
Done by first patching scripts/qapi*.py by hand to make generated
files do what I want, then by running the following Coccinelle
script to affect the rest of the code base:
 $ spatch --sp-file script `git grep -l '\bvisit_' -- '**/*.[ch]'`
I then had to apply some touchups (Coccinelle insisted on TAB
indentation in visitor.h, and botched the signature of
visit_type_enum() by rewriting 'const char *const strings[]' to
the syntactically invalid 'const char*const[] strings').  The
movement of parameters is sufficient to provoke compiler errors
if any callers were missed.
    // Part 1: Swap declaration order
    @@
    type TV, TErr, TObj, T1, T2;
    identifier OBJ, ARG1, ARG2;
    @@
     void visit_start_struct
    -(TV v, TObj OBJ, T1 ARG1, const char *name, T2 ARG2, TErr errp)
    +(TV v, const char *name, TObj OBJ, T1 ARG1, T2 ARG2, TErr errp)
     { ... }
    @@
    type bool, TV, T1;
    identifier ARG1;
    @@
     bool visit_optional
    -(TV v, T1 ARG1, const char *name)
    +(TV v, const char *name, T1 ARG1)
     { ... }
    @@
    type TV, TErr, TObj, T1;
    identifier OBJ, ARG1;
    @@
     void visit_get_next_type
    -(TV v, TObj OBJ, T1 ARG1, const char *name, TErr errp)
    +(TV v, const char *name, TObj OBJ, T1 ARG1, TErr errp)
     { ... }
    @@
    type TV, TErr, TObj, T1, T2;
    identifier OBJ, ARG1, ARG2;
    @@
     void visit_type_enum
    -(TV v, TObj OBJ, T1 ARG1, T2 ARG2, const char *name, TErr errp)
    +(TV v, const char *name, TObj OBJ, T1 ARG1, T2 ARG2, TErr errp)
     { ... }
    @@
    type TV, TErr, TObj;
    identifier OBJ;
    identifier VISIT_TYPE =~ "^visit_type_";
    @@
     void VISIT_TYPE
    -(TV v, TObj OBJ, const char *name, TErr errp)
    +(TV v, const char *name, TObj OBJ, TErr errp)
     { ... }
    // Part 2: swap caller order
    @@
    expression V, NAME, OBJ, ARG1, ARG2, ERR;
    identifier VISIT_TYPE =~ "^visit_type_";
    @@
    (
    -visit_start_struct(V, OBJ, ARG1, NAME, ARG2, ERR)
    +visit_start_struct(V, NAME, OBJ, ARG1, ARG2, ERR)
    |
    -visit_optional(V, ARG1, NAME)
    +visit_optional(V, NAME, ARG1)
    |
    -visit_get_next_type(V, OBJ, ARG1, NAME, ERR)
    +visit_get_next_type(V, NAME, OBJ, ARG1, ERR)
    |
    -visit_type_enum(V, OBJ, ARG1, ARG2, NAME, ERR)
    +visit_type_enum(V, NAME, OBJ, ARG1, ARG2, ERR)
    |
    -VISIT_TYPE(V, OBJ, NAME, ERR)
    +VISIT_TYPE(V, NAME, OBJ, ERR)
    )
Signed-off-by: Eric Blake <eblake@redhat.com>
Reviewed-by: Marc-André Lureau <marcandre.lureau@redhat.com>
Message-Id: <1454075341-13658-19-git-send-email-eblake@redhat.com>
Signed-off-by: Markus Armbruster <armbru@redhat.com>
											
										 
											2016-01-29 06:48:54 -07:00
										 |  |  |     visit_type_uint8(v, name, &value, &local_err); | 
					
						
							| 
									
										
										
										
											2015-01-12 17:30:14 +05:30
										 |  |  |     if (local_err) { | 
					
						
							|  |  |  |         goto out; | 
					
						
							|  |  |  |     } | 
					
						
							|  |  |  |     pm->s4_val = value; | 
					
						
							|  |  |  | out: | 
					
						
							|  |  |  |     error_propagate(errp, local_err); | 
					
						
							|  |  |  | } | 
					
						
							|  |  |  | 
 | 
					
						
							| 
									
										
										
										
											2015-06-28 14:58:56 -03:00
										 |  |  | static bool ich9_pm_get_enable_tco(Object *obj, Error **errp) | 
					
						
							|  |  |  | { | 
					
						
							|  |  |  |     ICH9LPCState *s = ICH9_LPC_DEVICE(obj); | 
					
						
							|  |  |  |     return s->pm.enable_tco; | 
					
						
							|  |  |  | } | 
					
						
							|  |  |  | 
 | 
					
						
							|  |  |  | static void ich9_pm_set_enable_tco(Object *obj, bool value, Error **errp) | 
					
						
							|  |  |  | { | 
					
						
							|  |  |  |     ICH9LPCState *s = ICH9_LPC_DEVICE(obj); | 
					
						
							|  |  |  |     s->pm.enable_tco = value; | 
					
						
							|  |  |  | } | 
					
						
							|  |  |  | 
 | 
					
						
							| 
									
										
										
										
											2013-07-24 18:56:10 +03:00
										 |  |  | void ich9_pm_add_properties(Object *obj, ICH9LPCPMRegs *pm, Error **errp) | 
					
						
							|  |  |  | { | 
					
						
							|  |  |  |     static const uint32_t gpe0_len = ICH9_PMIO_GPE0_LEN; | 
					
						
							| 
									
										
										
										
											2014-06-02 15:25:22 +02:00
										 |  |  |     pm->acpi_memory_hotplug.is_enabled = true; | 
					
						
							| 
									
										
										
										
											2016-04-11 17:25:54 +02:00
										 |  |  |     pm->cpu_hotplug_legacy = true; | 
					
						
							| 
									
										
										
										
											2015-01-12 17:30:14 +05:30
										 |  |  |     pm->disable_s3 = 0; | 
					
						
							|  |  |  |     pm->disable_s4 = 0; | 
					
						
							|  |  |  |     pm->s4_val = 2; | 
					
						
							| 
									
										
										
										
											2013-07-24 18:56:10 +03:00
										 |  |  | 
 | 
					
						
							|  |  |  |     object_property_add_uint32_ptr(obj, ACPI_PM_PROP_PM_IO_BASE, | 
					
						
							|  |  |  |                                    &pm->pm_io_base, errp); | 
					
						
							|  |  |  |     object_property_add(obj, ACPI_PM_PROP_GPE0_BLK, "uint32", | 
					
						
							|  |  |  |                         ich9_pm_get_gpe0_blk, | 
					
						
							|  |  |  |                         NULL, NULL, pm, NULL); | 
					
						
							|  |  |  |     object_property_add_uint32_ptr(obj, ACPI_PM_PROP_GPE0_BLK_LEN, | 
					
						
							|  |  |  |                                    &gpe0_len, errp); | 
					
						
							| 
									
										
										
										
											2014-06-02 15:25:22 +02:00
										 |  |  |     object_property_add_bool(obj, "memory-hotplug-support", | 
					
						
							|  |  |  |                              ich9_pm_get_memory_hotplug_support, | 
					
						
							|  |  |  |                              ich9_pm_set_memory_hotplug_support, | 
					
						
							|  |  |  |                              NULL); | 
					
						
							| 
									
										
										
										
											2016-04-11 17:25:54 +02:00
										 |  |  |     object_property_add_bool(obj, "cpu-hotplug-legacy", | 
					
						
							|  |  |  |                              ich9_pm_get_cpu_hotplug_legacy, | 
					
						
							|  |  |  |                              ich9_pm_set_cpu_hotplug_legacy, | 
					
						
							|  |  |  |                              NULL); | 
					
						
							| 
									
										
										
										
											2015-01-12 17:30:14 +05:30
										 |  |  |     object_property_add(obj, ACPI_PM_PROP_S3_DISABLED, "uint8", | 
					
						
							|  |  |  |                         ich9_pm_get_disable_s3, | 
					
						
							|  |  |  |                         ich9_pm_set_disable_s3, | 
					
						
							|  |  |  |                         NULL, pm, NULL); | 
					
						
							|  |  |  |     object_property_add(obj, ACPI_PM_PROP_S4_DISABLED, "uint8", | 
					
						
							|  |  |  |                         ich9_pm_get_disable_s4, | 
					
						
							|  |  |  |                         ich9_pm_set_disable_s4, | 
					
						
							|  |  |  |                         NULL, pm, NULL); | 
					
						
							|  |  |  |     object_property_add(obj, ACPI_PM_PROP_S4_VAL, "uint8", | 
					
						
							|  |  |  |                         ich9_pm_get_s4_val, | 
					
						
							|  |  |  |                         ich9_pm_set_s4_val, | 
					
						
							|  |  |  |                         NULL, pm, NULL); | 
					
						
							| 
									
										
										
										
											2015-06-28 14:58:56 -03:00
										 |  |  |     object_property_add_bool(obj, ACPI_PM_PROP_TCO_ENABLED, | 
					
						
							|  |  |  |                              ich9_pm_get_enable_tco, | 
					
						
							|  |  |  |                              ich9_pm_set_enable_tco, | 
					
						
							|  |  |  |                              NULL); | 
					
						
							| 
									
										
										
										
											2014-06-02 15:25:22 +02:00
										 |  |  | } | 
					
						
							|  |  |  | 
 | 
					
						
							| 
									
										
										
										
											2016-05-31 12:01:17 +02:00
										 |  |  | void ich9_pm_device_plug_cb(HotplugHandler *hotplug_dev, DeviceState *dev, | 
					
						
							|  |  |  |                             Error **errp) | 
					
						
							| 
									
										
										
										
											2014-06-02 15:25:22 +02:00
										 |  |  | { | 
					
						
							| 
									
										
										
										
											2016-05-31 12:01:17 +02:00
										 |  |  |     ICH9LPCState *lpc = ICH9_LPC_DEVICE(hotplug_dev); | 
					
						
							|  |  |  | 
 | 
					
						
							|  |  |  |     if (lpc->pm.acpi_memory_hotplug.is_enabled && | 
					
						
							| 
									
										
										
										
											2014-06-02 15:25:22 +02:00
										 |  |  |         object_dynamic_cast(OBJECT(dev), TYPE_PC_DIMM)) { | 
					
						
							| 
									
										
										
										
											2016-11-07 19:13:38 +08:00
										 |  |  |         if (object_dynamic_cast(OBJECT(dev), TYPE_NVDIMM)) { | 
					
						
							|  |  |  |             nvdimm_acpi_plug_cb(hotplug_dev, dev); | 
					
						
							|  |  |  |         } else { | 
					
						
							|  |  |  |             acpi_memory_plug_cb(hotplug_dev, &lpc->pm.acpi_memory_hotplug, | 
					
						
							|  |  |  |                                 dev, errp); | 
					
						
							|  |  |  |         } | 
					
						
							| 
									
										
										
										
											2016-06-14 16:02:06 +02:00
										 |  |  |     } else if (object_dynamic_cast(OBJECT(dev), TYPE_CPU)) { | 
					
						
							|  |  |  |         if (lpc->pm.cpu_hotplug_legacy) { | 
					
						
							|  |  |  |             legacy_acpi_cpu_plug_cb(hotplug_dev, &lpc->pm.gpe_cpu, dev, errp); | 
					
						
							|  |  |  |         } else { | 
					
						
							|  |  |  |             acpi_cpu_plug_cb(hotplug_dev, &lpc->pm.cpuhp_state, dev, errp); | 
					
						
							|  |  |  |         } | 
					
						
							| 
									
										
										
										
											2014-06-02 15:25:22 +02:00
										 |  |  |     } else { | 
					
						
							|  |  |  |         error_setg(errp, "acpi: device plug request for not supported device" | 
					
						
							|  |  |  |                    " type: %s", object_get_typename(OBJECT(dev))); | 
					
						
							|  |  |  |     } | 
					
						
							| 
									
										
										
										
											2013-07-24 18:56:10 +03:00
										 |  |  | } | 
					
						
							| 
									
										
										
										
											2014-06-16 19:12:27 +02:00
										 |  |  | 
 | 
					
						
							| 
									
										
										
										
											2016-05-31 12:01:17 +02:00
										 |  |  | void ich9_pm_device_unplug_request_cb(HotplugHandler *hotplug_dev, | 
					
						
							|  |  |  |                                       DeviceState *dev, Error **errp) | 
					
						
							| 
									
										
										
										
											2015-01-28 15:45:38 +08:00
										 |  |  | { | 
					
						
							| 
									
										
										
										
											2016-05-31 12:01:17 +02:00
										 |  |  |     ICH9LPCState *lpc = ICH9_LPC_DEVICE(hotplug_dev); | 
					
						
							|  |  |  | 
 | 
					
						
							|  |  |  |     if (lpc->pm.acpi_memory_hotplug.is_enabled && | 
					
						
							| 
									
										
										
										
											2015-04-27 16:47:17 +08:00
										 |  |  |         object_dynamic_cast(OBJECT(dev), TYPE_PC_DIMM)) { | 
					
						
							| 
									
										
										
										
											2016-05-31 12:01:17 +02:00
										 |  |  |         acpi_memory_unplug_request_cb(hotplug_dev, | 
					
						
							|  |  |  |                                       &lpc->pm.acpi_memory_hotplug, dev, | 
					
						
							|  |  |  |                                       errp); | 
					
						
							| 
									
										
										
										
											2016-06-14 16:14:02 +02:00
										 |  |  |     } else if (object_dynamic_cast(OBJECT(dev), TYPE_CPU) && | 
					
						
							|  |  |  |                !lpc->pm.cpu_hotplug_legacy) { | 
					
						
							|  |  |  |         acpi_cpu_unplug_request_cb(hotplug_dev, &lpc->pm.cpuhp_state, | 
					
						
							|  |  |  |                                    dev, errp); | 
					
						
							| 
									
										
										
										
											2015-04-27 16:47:17 +08:00
										 |  |  |     } else { | 
					
						
							|  |  |  |         error_setg(errp, "acpi: device unplug request for not supported device" | 
					
						
							|  |  |  |                    " type: %s", object_get_typename(OBJECT(dev))); | 
					
						
							|  |  |  |     } | 
					
						
							| 
									
										
										
										
											2015-01-28 15:45:38 +08:00
										 |  |  | } | 
					
						
							|  |  |  | 
 | 
					
						
							| 
									
										
										
										
											2016-05-31 12:01:17 +02:00
										 |  |  | void ich9_pm_device_unplug_cb(HotplugHandler *hotplug_dev, DeviceState *dev, | 
					
						
							| 
									
										
										
										
											2015-01-28 15:45:40 +08:00
										 |  |  |                               Error **errp) | 
					
						
							|  |  |  | { | 
					
						
							| 
									
										
										
										
											2016-05-31 12:01:17 +02:00
										 |  |  |     ICH9LPCState *lpc = ICH9_LPC_DEVICE(hotplug_dev); | 
					
						
							|  |  |  | 
 | 
					
						
							|  |  |  |     if (lpc->pm.acpi_memory_hotplug.is_enabled && | 
					
						
							| 
									
										
										
										
											2015-04-27 16:47:18 +08:00
										 |  |  |         object_dynamic_cast(OBJECT(dev), TYPE_PC_DIMM)) { | 
					
						
							| 
									
										
										
										
											2016-05-31 12:01:17 +02:00
										 |  |  |         acpi_memory_unplug_cb(&lpc->pm.acpi_memory_hotplug, dev, errp); | 
					
						
							| 
									
										
										
										
											2016-06-14 16:14:02 +02:00
										 |  |  |     } else if (object_dynamic_cast(OBJECT(dev), TYPE_CPU) && | 
					
						
							|  |  |  |                !lpc->pm.cpu_hotplug_legacy) { | 
					
						
							|  |  |  |         acpi_cpu_unplug_cb(&lpc->pm.cpuhp_state, dev, errp); | 
					
						
							| 
									
										
										
										
											2015-04-27 16:47:18 +08:00
										 |  |  |     } else { | 
					
						
							|  |  |  |         error_setg(errp, "acpi: device unplug for not supported device" | 
					
						
							|  |  |  |                    " type: %s", object_get_typename(OBJECT(dev))); | 
					
						
							|  |  |  |     } | 
					
						
							| 
									
										
										
										
											2015-01-28 15:45:40 +08:00
										 |  |  | } | 
					
						
							|  |  |  | 
 | 
					
						
							| 
									
										
										
										
											2014-06-16 19:12:27 +02:00
										 |  |  | void ich9_pm_ospm_status(AcpiDeviceIf *adev, ACPIOSTInfoList ***list) | 
					
						
							|  |  |  | { | 
					
						
							|  |  |  |     ICH9LPCState *s = ICH9_LPC_DEVICE(adev); | 
					
						
							|  |  |  | 
 | 
					
						
							|  |  |  |     acpi_memory_ospm_status(&s->pm.acpi_memory_hotplug, list); | 
					
						
							| 
									
										
										
										
											2016-04-22 19:06:36 +02:00
										 |  |  |     if (!s->pm.cpu_hotplug_legacy) { | 
					
						
							|  |  |  |         acpi_cpu_ospm_status(&s->pm.cpuhp_state, list); | 
					
						
							|  |  |  |     } | 
					
						
							| 
									
										
										
										
											2014-06-16 19:12:27 +02:00
										 |  |  | } |