diff options
| author |   Avi Kivity <avi@redhat.com> | 2009-08-29 10:36:54 +0300 |
|---|---|---|
| committer | Avi Kivity <avi@redhat.com> | 2009-08-29 10:36:54 +0300 |
| commit | 1a20533f56f5e2c0e2f4507205bf4acb0f669a43 (patch) | |
| tree | 7799aa18f7dba660def0cd5c29869816a99f2ea6 /cpu-defs.h | |
| parent | Merge commit 'b31a0277558db5eeb71164ad511467cf5125b853' into upstream-merge (diff) | |
| parent | Add isa_reserve_irq(). (diff) | |
| download | qemu-kvm-1a20533f56f5e2c0e2f4507205bf4acb0f669a43.tar.gz qemu-kvm-1a20533f56f5e2c0e2f4507205bf4acb0f669a43.tar.bz2 qemu-kvm-1a20533f56f5e2c0e2f4507205bf4acb0f669a43.zip | |
Merge commit '3a38d437ca60ce19ee92dbabbe6e672e9ba3c529' into upstream-merge
* commit '3a38d437ca60ce19ee92dbabbe6e672e9ba3c529':
Add isa_reserve_irq().
isa bus irq changes and fixes.
hw/eepro100.c: Use extended TBD only where applicable
pci-hotplug: initialize dinfo to NULL in pci_device_hot_add
block/vdi.c: Fix several bugs
introduce kvm64 CPU
allow overriding of CPUID level on command line
set CPUID bits to present cores and threads topology
push CPUID level to 4 to allow Intel multicore decoding
extend -smp parsing to include cores= and threads= options
add file descriptor migration
Add sparse to new feature convention
Conflicts:
hw/pc.c
Signed-off-by: Avi Kivity <avi@redhat.com>
Diffstat (limited to 'cpu-defs.h')
| -rw-r--r-- | cpu-defs.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/cpu-defs.h b/cpu-defs.h index 1cd9a1504..a7d6d94e4 100644 --- a/cpu-defs.h +++ b/cpu-defs.h @@ -194,6 +194,8 @@ struct KVMCPUState { int cpu_index; /* CPU index (informative) */ \ uint32_t host_tid; /* host thread ID */ \ int numa_node; /* NUMA node this cpu is belonging to */ \ + int nr_cores; /* number of cores within this CPU package */ \ + int nr_threads;/* number of threads within this CPU */ \ int running; /* Nonzero if cpu is currently running(usermode). */ \ int thread_id; \ /* user data */ \ |