diff options
| author |   Marcelo Tosatti <mtosatti@redhat.com> | 2009-09-14 08:48:43 -0300 |
|---|---|---|
| committer | Marcelo Tosatti <mtosatti@redhat.com> | 2009-09-14 08:48:43 -0300 |
| commit | 184b194ef1a8b8ce035d48c3fbdd72e3b4732869 (patch) | |
| tree | a4e50b03279f2a140a99aca8689973090afa151d /hw/pci-hotplug.c | |
| parent | Merge commit '2637c754ccdb286890ed2a8d0d1da775dbd062af' into upstream-merge (diff) | |
| parent | Fix sys-queue.h conflict for good (diff) | |
| download | qemu-kvm-184b194ef1a8b8ce035d48c3fbdd72e3b4732869.tar.gz qemu-kvm-184b194ef1a8b8ce035d48c3fbdd72e3b4732869.tar.bz2 qemu-kvm-184b194ef1a8b8ce035d48c3fbdd72e3b4732869.zip | |
Merge commit '72cf2d4f0e181d0d3a3122e04129c58a95da713e' into upstream-merge
* commit '72cf2d4f0e181d0d3a3122e04129c58a95da713e':
Fix sys-queue.h conflict for good
Try to fix BSD breakage by 806b60248218bd5f74a8b070f5a99a864e8e51c6
Include sys-queue.h early to override system queue definitions on BSD
Unbreak BSD: use qemu_fdatasync instead of fdatasync
Use proper format conversion specifier when printing size_t value
audio: remove lsbindex/popcount in favour of host-utils's ctz32
alsa: poll mode handling
oss: poll mode handling
audio: poll mode infrastructure
gus: Do not manually free the state, qdev does it for us
oss: Unbreak mmaping the ability to mmap oss fd on Linux
Conflicts:
exec.c
kvm.h
sysemu.h
vl.c
Signed-off-by: Marcelo Tosatti <mtosatti@redhat.com>
Diffstat (limited to 'hw/pci-hotplug.c')
| -rw-r--r-- | hw/pci-hotplug.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/hw/pci-hotplug.c b/hw/pci-hotplug.c index 26f640452..b8ea9ae1f 100644 --- a/hw/pci-hotplug.c +++ b/hw/pci-hotplug.c @@ -85,7 +85,7 @@ void drive_hot_add(Monitor *mon, const QDict *qdict) switch (type) { case IF_SCSI: success = 1; - scsibus = LIST_FIRST(&dev->qdev.child_bus); + scsibus = QLIST_FIRST(&dev->qdev.child_bus); scsi_bus_legacy_add_drive(DO_UPCAST(SCSIBus, qbus, scsibus), dinfo, dinfo->unit); break; |