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 /qemu-kvm.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 'qemu-kvm.c')
| -rw-r--r-- | qemu-kvm.c | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/qemu-kvm.c b/qemu-kvm.c index 78eeb6ff7..bff11e8fd 100644 --- a/qemu-kvm.c +++ b/qemu-kvm.c @@ -68,7 +68,7 @@ static uint64_t phys_ram_size; #ifdef USE_KVM_DEVICE_ASSIGNMENT /* The list of ioperm_data */ -static LIST_HEAD(, ioperm_data) ioperm_head; +static QLIST_HEAD(, ioperm_data) ioperm_head; #endif //#define DEBUG_MEMREG @@ -390,7 +390,7 @@ int kvm_init(int smp_cpus) kvm_context->no_pit_creation = 0; #ifdef KVM_CAP_SET_GUEST_DEBUG - TAILQ_INIT(&kvm_state->kvm_sw_breakpoints); + QTAILQ_INIT(&kvm_state->kvm_sw_breakpoints); #endif gsi_count = kvm_get_gsi_count(kvm_context); @@ -1843,7 +1843,7 @@ static void *ap_main_loop(void *_env) #ifdef USE_KVM_DEVICE_ASSIGNMENT /* do ioperm for io ports of assigned devices */ - LIST_FOREACH(data, &ioperm_head, entries) + QLIST_FOREACH(data, &ioperm_head, entries) on_vcpu(env, kvm_arch_do_ioperm, data); #endif @@ -2427,19 +2427,19 @@ void kvm_mutex_lock(void) #ifdef USE_KVM_DEVICE_ASSIGNMENT void kvm_add_ioperm_data(struct ioperm_data *data) { - LIST_INSERT_HEAD(&ioperm_head, data, entries); + QLIST_INSERT_HEAD(&ioperm_head, data, entries); } void kvm_remove_ioperm_data(unsigned long start_port, unsigned long num) { struct ioperm_data *data; - data = LIST_FIRST(&ioperm_head); + data = QLIST_FIRST(&ioperm_head); while (data) { - struct ioperm_data *next = LIST_NEXT(data, entries); + struct ioperm_data *next = QLIST_NEXT(data, entries); if (data->start_port == start_port && data->num == num) { - LIST_REMOVE(data, entries); + QLIST_REMOVE(data, entries); qemu_free(data); } |