Peter Maydell 26edf8cc08 Merge remote-tracking branch 'remotes/mst/tags/for_upstream' into staging ...

pc,pci,virtio,qdev fixes, tests

new tests for SMBIOS
SMBIOS fixes
pc, pci fixes
qdev patches stayed on list for a month with no review,
as I told people on KVM forum I'm merging stuch patches
if they look fine.

Signed-off-by: Michael S. Tsirkin <mst@redhat.com>

* remotes/mst/tags/for_upstream:
  qdev: Add test of qdev_prop_check_global
  qdev: Display warning about unused -global
  tests: add smbios testing
  tests: rename acpi-test to bios-tables-test
  virtio-balloon: return empty data when no stats are available
  pcie_host: Turn pcie_host_init() into an instance_init
  SMBIOS: Fix type 17 field sizes
  SMBIOS: Update Type 0 struct generator for machines >= 2.1
  SMBIOS: Fix endian-ness when populating multi-byte fields
  serial-pci: Set prog interface field of pci config to 16550 compatible

Conflicts:
	include/hw/i386/pc.h
[PMM: fixed trivial conflict in pc.h]
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>

2014-06-05 21:52:37 +01:00

..

empty_slot.c

empty_slot: QOM cast cleanup

2013-07-29 21:06:37 +02:00

fw-path-provider.c

fw-path-provider: Change GPL version to 2+

2014-04-07 15:36:07 +02:00

hotplug.c

define hotplug interface

2014-02-10 10:23:35 +02:00

irq.c

hw/core: Add interface to allocate and free a single IRQ

2013-10-14 17:11:44 +03:00

loader.c

pc: avoid duplicate names for ROM MRs

2014-03-11 13:25:48 +02:00

machine.c

machine: Make -machine opts properties of MachineState

2014-05-28 17:36:13 +02:00

Makefile.objs

qdev: Introduce FWPathProvider interface

2014-03-20 02:40:13 +01:00

null-machine.c

machine: Conversion of QEMUMachineInitArgs to MachineState

2014-05-28 17:35:01 +02:00

ptimer.c

savevm: Remove all the unneeded version_minimum_id_old (rest)

2014-05-14 15:24:51 +02:00

qdev-properties-system.c

qdev: Display warning about unused -global

2014-06-05 19:20:37 +03:00

qdev-properties.c

qdev: Display warning about unused -global

2014-06-05 19:20:37 +03:00

qdev.c

qdev: Implement named GPIOs

2014-05-28 17:36:21 +02:00

stream.c

stream: Remove app argument hack

2013-04-16 10:04:23 +02:00

sysbus.c

sysbus: Set cannot_instantiate_with_device_add_yet

2013-12-23 00:27:22 +01:00

uboot_image.h

hw: move private headers to hw/ subdirectories.

2013-04-08 18:13:16 +02:00