Merge commit '5a1fc5e8529afb6041a3dfa406a94c187d2afc1d' into upstream-merge

* commit '5a1fc5e8529afb6041a3dfa406a94c187d2afc1d':
  qemu: clean up target page usage in msix
  fix comment on cpu_register_physical_memory_offset
  qemu/pci: reset device registers on bus reset
  qemu/pci: refactor code/symbolic constants
  qemu/virtio: fix reset with device removal
  qemu/qdev: type safety in reset handler
  serial: convert isa to qdev
  qdev: don't crash on unset drive properties.
  floppy: move dma setup + drive connect to fdctrl_init_common()
  floppy: add drive properties.
  store a pointer to QemuOpts in DeviceState, release it when zapping a device.
  allow if=none for drive_add
  refactor drive_hot_add
  drive cleanup fixes.

Conflicts:
	hw/msix.c
	hw/pci.h

Signed-off-by: Avi Kivity <avi@redhat.com>

1 files changed, 1 insertions, 2 deletions

diff --git a/sysemu.h b/sysemu.h
index 6fda55a95..49d4ad122 100644
--- a/sysemu.h
+++ b/sysemu.h
@@ -193,7 +193,7 @@ extern DriveInfo *extboot_drive;
 extern DriveInfo *drive_get(BlockInterfaceType type, int bus, int unit);
 extern DriveInfo *drive_get_by_id(const char *id);
 extern int drive_get_max_bus(BlockInterfaceType type);
-extern void drive_uninit(BlockDriverState *bdrv);
+extern void drive_uninit(DriveInfo *dinfo);
 extern const char *drive_get_serial(BlockDriverState *bdrv);
 extern BlockInterfaceErrorAction drive_get_onerror(BlockDriverState *bdrv);
 
@@ -211,7 +211,6 @@ typedef int (dev_match_fn)(void *dev_private, void *arg);
 
 DriveInfo *add_init_drive(const char *opts);
 void destroy_nic(dev_match_fn *match_fn, void *arg);
-void destroy_bdrvs(dev_match_fn *match_fn, void *arg);
 
 /* pci-hotplug */
 void pci_device_hot_add(Monitor *mon, const QDict *qdict);