Merge commit '498238687fd3a2bf3efb32694732f88ceac72e99' into upstream-merge

Merge commit '498238687fd3a2bf3efb32694732f88ceac72e99' into upstream-merge

* commit '498238687fd3a2bf3efb32694732f88ceac72e99': (28 commits)
  pci: introduce multifunction property.
  qdev: implement qdev_prop_set_bit().
  pci: remove PCIDeviceInfo::header_type
  pci: don't overwrite multi functio bit in pci header type.
  pci: insert assert that auto-assigned-address function is single function device.
  pci: use PCI_DEVFN() where appropriate.
  target-mips: add loongson 2E & 2F integer instructions
  Fix warning about uninitialized variable
  sheepdog: fix compile error on systems without TCP_CORK
  ramblocks: No more being lazy about duplicate names
  pci: Free the space allocated for the option rom on removal
  block: add sheepdog driver for distributed storage support
  ide: Reject invalid CHS geometry
  ide: Reject readonly drives unless CD-ROM
  ide: Make ide_init_drive() return success
  ide: Replace IDEState members is_cdrom, is_cf by drive_kind
  ide: Improve error messages
  scsi: Error locations for -drive if=scsi device initialization
  error: New qemu_opts_loc_restore()
  scsi: Reject unimplemented error actions
  ...

Conflicts:
	hw/pci.c

Signed-off-by: Marcelo Tosatti <mtosatti@redhat.com>