diff options
| author | Anthony Liguori | 2013-06-28 18:48:09 +0200 |
|---|---|---|
| committer | Anthony Liguori | 2013-06-28 18:48:09 +0200 |
| commit | 8a9c98aedc1a3fb4dfbebeccc926e273df54f2ba (patch) | |
| tree | b800dd8b6131717bf397103ec4d7199f67ea0c5c /include/exec/hwaddr.h | |
| parent | Merge remote-tracking branch 'kwolf/for-anthony' into staging (diff) | |
| parent | cpu: Turn cpu_unassigned_access() into a CPUState hook (diff) | |
| download | qemu-8a9c98aedc1a3fb4dfbebeccc926e273df54f2ba.tar.gz qemu-8a9c98aedc1a3fb4dfbebeccc926e273df54f2ba.tar.xz qemu-8a9c98aedc1a3fb4dfbebeccc926e273df54f2ba.zip | |
Merge remote-tracking branch 'afaerber/qom-cpu' into staging
# By Andreas Färber
# Via Andreas Färber
* afaerber/qom-cpu: (24 commits)
cpu: Turn cpu_unassigned_access() into a CPUState hook
hwaddr: Make hwaddr type usable beyond softmmu
cpu: Change qemu_init_vcpu() argument to CPUState
cpus: Change qemu_dummy_start_vcpu() argument to CPUState
cpus: Change qemu_kvm_start_vcpu() argument to CPUState
cpus: Change cpu_handle_guest_debug() argument to CPUState
gdbstub: Set gdb_set_stop_cpu() argument to CPUState
kvm: Change kvm_cpu_exec() argument to CPUState
kvm: Change kvm_handle_internal_error() argument to CPUState
cpu: Turn cpu_dump_{state,statistics}() into CPUState hooks
cpus: Change qemu_kvm_init_cpu_signals() argument to CPUState
kvm: Change kvm_set_signal_mask() argument to CPUState
cpus: Change qemu_kvm_wait_io_event() argument to CPUState
cpus: Change cpu_thread_is_idle() argument to CPUState
cpu: Change cpu_exit() argument to CPUState
kvm: Change cpu_synchronize_state() argument to CPUState
kvm: Change kvm_cpu_synchronize_state() argument to CPUState
gdbstub: Simplify find_cpu()
cpu: Guard cpu_{save,load}() definitions
target-openrisc: Register VMStateDescription for OpenRISCCPU
...
Diffstat (limited to 'include/exec/hwaddr.h')
| -rw-r--r-- | include/exec/hwaddr.h | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/include/exec/hwaddr.h b/include/exec/hwaddr.h index 251cf9216f..c9eb78fba1 100644 --- a/include/exec/hwaddr.h +++ b/include/exec/hwaddr.h @@ -3,8 +3,6 @@ #ifndef HWADDR_H #define HWADDR_H -#ifndef CONFIG_USER_ONLY - #define HWADDR_BITS 64 /* hwaddr is the type of a physical address (its size can be different from 'target_ulong'). */ @@ -20,5 +18,3 @@ typedef uint64_t hwaddr; #define HWADDR_PRIX PRIX64 #endif - -#endif |