diff options
author | Eddie Dong <eddie.dong@intel.com> | 2007-10-10 06:15:54 -0400 |
---|---|---|
committer | Avi Kivity <avi@qumranet.com> | 2008-01-30 10:52:55 -0500 |
commit | 8c392696e749171531d155ea5cefdfc1c970fd18 (patch) | |
tree | 36b97e721b3423b3272c9866ed32b06251db8b09 /drivers/kvm/ioapic.c | |
parent | 2fcceae145645ec6a4fab0a806bb674d7484d97b (diff) |
KVM: Split IOAPIC reset function and export for kernel RESET
Signed-off-by: Yaozu (Eddie) Dong <eddie.dong@intel.com>
Signed-off-by: Avi Kivity <avi@qumranet.com>
Diffstat (limited to 'drivers/kvm/ioapic.c')
-rw-r--r-- | drivers/kvm/ioapic.c | 17 |
1 files changed, 13 insertions, 4 deletions
diff --git a/drivers/kvm/ioapic.c b/drivers/kvm/ioapic.c index e14b7c724e67..cf1d50b3549b 100644 --- a/drivers/kvm/ioapic.c +++ b/drivers/kvm/ioapic.c | |||
@@ -371,18 +371,27 @@ static void ioapic_mmio_write(struct kvm_io_device *this, gpa_t addr, int len, | |||
371 | } | 371 | } |
372 | } | 372 | } |
373 | 373 | ||
374 | void kvm_ioapic_reset(struct kvm_ioapic *ioapic) | ||
375 | { | ||
376 | int i; | ||
377 | |||
378 | for (i = 0; i < IOAPIC_NUM_PINS; i++) | ||
379 | ioapic->redirtbl[i].fields.mask = 1; | ||
380 | ioapic->base_address = IOAPIC_DEFAULT_BASE_ADDRESS; | ||
381 | ioapic->ioregsel = 0; | ||
382 | ioapic->irr = 0; | ||
383 | ioapic->id = 0; | ||
384 | } | ||
385 | |||
374 | int kvm_ioapic_init(struct kvm *kvm) | 386 | int kvm_ioapic_init(struct kvm *kvm) |
375 | { | 387 | { |
376 | struct kvm_ioapic *ioapic; | 388 | struct kvm_ioapic *ioapic; |
377 | int i; | ||
378 | 389 | ||
379 | ioapic = kzalloc(sizeof(struct kvm_ioapic), GFP_KERNEL); | 390 | ioapic = kzalloc(sizeof(struct kvm_ioapic), GFP_KERNEL); |
380 | if (!ioapic) | 391 | if (!ioapic) |
381 | return -ENOMEM; | 392 | return -ENOMEM; |
382 | kvm->vioapic = ioapic; | 393 | kvm->vioapic = ioapic; |
383 | for (i = 0; i < IOAPIC_NUM_PINS; i++) | 394 | kvm_ioapic_reset(ioapic); |
384 | ioapic->redirtbl[i].fields.mask = 1; | ||
385 | ioapic->base_address = IOAPIC_DEFAULT_BASE_ADDRESS; | ||
386 | ioapic->dev.read = ioapic_mmio_read; | 395 | ioapic->dev.read = ioapic_mmio_read; |
387 | ioapic->dev.write = ioapic_mmio_write; | 396 | ioapic->dev.write = ioapic_mmio_write; |
388 | ioapic->dev.in_range = ioapic_in_range; | 397 | ioapic->dev.in_range = ioapic_in_range; |