diff options
| author | Anthony Liguori <aliguori@us.ibm.com> | 2013-07-03 08:36:59 -0500 |
|---|---|---|
| committer | Anthony Liguori <aliguori@us.ibm.com> | 2013-07-03 08:37:00 -0500 |
| commit | ab8bf29078e0ab8347e2ff8b4e5542f7a0c751cf (patch) | |
| tree | 8175716bcd820616bc2fa278d98536de50aa2595 /hw/i386/kvm/pci-assign.c | |
| parent | 1acd5a373905ddb28957842256a038956941f332 (diff) | |
| parent | 00f4d64ee76e873be881a82d893a591487aa7950 (diff) | |
| download | focaccia-qemu-ab8bf29078e0ab8347e2ff8b4e5542f7a0c751cf.tar.gz focaccia-qemu-ab8bf29078e0ab8347e2ff8b4e5542f7a0c751cf.zip | |
Merge remote-tracking branch 'qemu-kvm/uq/master' into staging
# By Michael S. Tsirkin (2) and others # Via Paolo Bonzini * qemu-kvm/uq/master: kvmclock: clock should count only if vm is running pci-assign: remove the duplicate function name in debug message kvm: skip system call when msi route is unchanged kvm: zero-initialize KVM_SET_GSI_ROUTING input kvm: add detail error message when fail to add ioeventfd Message-id: 1372841072-22265-1-git-send-email-pbonzini@redhat.com Signed-off-by: Anthony Liguori <aliguori@us.ibm.com>
Diffstat (limited to 'hw/i386/kvm/pci-assign.c')
| -rw-r--r-- | hw/i386/kvm/pci-assign.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/hw/i386/kvm/pci-assign.c b/hw/i386/kvm/pci-assign.c index 1fb7ad44ab..eab2d3e590 100644 --- a/hw/i386/kvm/pci-assign.c +++ b/hw/i386/kvm/pci-assign.c @@ -226,7 +226,7 @@ static uint32_t slow_bar_readb(void *opaque, hwaddr addr) uint32_t r; r = *in; - DEBUG("slow_bar_readl addr=0x" TARGET_FMT_plx " val=0x%08x\n", addr, r); + DEBUG("addr=0x" TARGET_FMT_plx " val=0x%08x\n", addr, r); return r; } @@ -238,7 +238,7 @@ static uint32_t slow_bar_readw(void *opaque, hwaddr addr) uint32_t r; r = *in; - DEBUG("slow_bar_readl addr=0x" TARGET_FMT_plx " val=0x%08x\n", addr, r); + DEBUG("addr=0x" TARGET_FMT_plx " val=0x%08x\n", addr, r); return r; } @@ -250,7 +250,7 @@ static uint32_t slow_bar_readl(void *opaque, hwaddr addr) uint32_t r; r = *in; - DEBUG("slow_bar_readl addr=0x" TARGET_FMT_plx " val=0x%08x\n", addr, r); + DEBUG("addr=0x" TARGET_FMT_plx " val=0x%08x\n", addr, r); return r; } @@ -260,7 +260,7 @@ static void slow_bar_writeb(void *opaque, hwaddr addr, uint32_t val) AssignedDevRegion *d = opaque; uint8_t *out = d->u.r_virtbase + addr; - DEBUG("slow_bar_writeb addr=0x" TARGET_FMT_plx " val=0x%02x\n", addr, val); + DEBUG("addr=0x" TARGET_FMT_plx " val=0x%02x\n", addr, val); *out = val; } @@ -269,7 +269,7 @@ static void slow_bar_writew(void *opaque, hwaddr addr, uint32_t val) AssignedDevRegion *d = opaque; uint16_t *out = (uint16_t *)(d->u.r_virtbase + addr); - DEBUG("slow_bar_writew addr=0x" TARGET_FMT_plx " val=0x%04x\n", addr, val); + DEBUG("addr=0x" TARGET_FMT_plx " val=0x%04x\n", addr, val); *out = val; } @@ -278,7 +278,7 @@ static void slow_bar_writel(void *opaque, hwaddr addr, uint32_t val) AssignedDevRegion *d = opaque; uint32_t *out = (uint32_t *)(d->u.r_virtbase + addr); - DEBUG("slow_bar_writel addr=0x" TARGET_FMT_plx " val=0x%08x\n", addr, val); + DEBUG("addr=0x" TARGET_FMT_plx " val=0x%08x\n", addr, val); *out = val; } |