diff options
| author | Anthony Liguori <aliguori@us.ibm.com> | 2012-06-11 12:15:52 -0500 |
|---|---|---|
| committer | Anthony Liguori <aliguori@us.ibm.com> | 2012-06-11 12:15:52 -0500 |
| commit | 7677e24f3db8466c7d6014a794b1e425bc7929ba (patch) | |
| tree | 2231c7456a6c179206b4cf892d8e80c016ff8ba8 /hw/kvm/apic.c | |
| parent | 248bfdc9f53a85b82e3ff39c5122d8849f61ee65 (diff) | |
| parent | 0cdd3d14447da1a04e778c219c77db8b96f9cf33 (diff) | |
| download | qemu-7677e24f3db8466c7d6014a794b1e425bc7929ba.tar.gz qemu-7677e24f3db8466c7d6014a794b1e425bc7929ba.tar.bz2 qemu-7677e24f3db8466c7d6014a794b1e425bc7929ba.zip | |
Merge remote-tracking branch 'qemu-kvm/uq/master' into staging
* qemu-kvm/uq/master:
kvm: i8254: Fix conversion of in-kernel to userspace state
kvm/apic: correct short memset
Diffstat (limited to 'hw/kvm/apic.c')
| -rw-r--r-- | hw/kvm/apic.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/hw/kvm/apic.c b/hw/kvm/apic.c index 8ba4079025..80e3e48333 100644 --- a/hw/kvm/apic.c +++ b/hw/kvm/apic.c @@ -30,7 +30,7 @@ void kvm_put_apic_state(DeviceState *d, struct kvm_lapic_state *kapic) APICCommonState *s = DO_UPCAST(APICCommonState, busdev.qdev, d); int i; - memset(kapic, 0, sizeof(kapic)); + memset(kapic, 0, sizeof(*kapic)); kvm_apic_set_reg(kapic, 0x2, s->id << 24); kvm_apic_set_reg(kapic, 0x8, s->tpr); kvm_apic_set_reg(kapic, 0xd, s->log_dest << 24); |