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>
This commit is contained in:
commit
ab8bf29078
|
@ -28,38 +28,6 @@ typedef struct KVMClockState {
|
|||
bool clock_valid;
|
||||
} KVMClockState;
|
||||
|
||||
static void kvmclock_pre_save(void *opaque)
|
||||
{
|
||||
KVMClockState *s = opaque;
|
||||
struct kvm_clock_data data;
|
||||
int ret;
|
||||
|
||||
if (s->clock_valid) {
|
||||
return;
|
||||
}
|
||||
ret = kvm_vm_ioctl(kvm_state, KVM_GET_CLOCK, &data);
|
||||
if (ret < 0) {
|
||||
fprintf(stderr, "KVM_GET_CLOCK failed: %s\n", strerror(ret));
|
||||
data.clock = 0;
|
||||
}
|
||||
s->clock = data.clock;
|
||||
/*
|
||||
* If the VM is stopped, declare the clock state valid to avoid re-reading
|
||||
* it on next vmsave (which would return a different value). Will be reset
|
||||
* when the VM is continued.
|
||||
*/
|
||||
s->clock_valid = !runstate_is_running();
|
||||
}
|
||||
|
||||
static int kvmclock_post_load(void *opaque, int version_id)
|
||||
{
|
||||
KVMClockState *s = opaque;
|
||||
struct kvm_clock_data data;
|
||||
|
||||
data.clock = s->clock;
|
||||
data.flags = 0;
|
||||
return kvm_vm_ioctl(kvm_state, KVM_SET_CLOCK, &data);
|
||||
}
|
||||
|
||||
static void kvmclock_vm_state_change(void *opaque, int running,
|
||||
RunState state)
|
||||
|
@ -70,8 +38,18 @@ static void kvmclock_vm_state_change(void *opaque, int running,
|
|||
int ret;
|
||||
|
||||
if (running) {
|
||||
struct kvm_clock_data data;
|
||||
|
||||
s->clock_valid = false;
|
||||
|
||||
data.clock = s->clock;
|
||||
data.flags = 0;
|
||||
ret = kvm_vm_ioctl(kvm_state, KVM_SET_CLOCK, &data);
|
||||
if (ret < 0) {
|
||||
fprintf(stderr, "KVM_SET_CLOCK failed: %s\n", strerror(ret));
|
||||
abort();
|
||||
}
|
||||
|
||||
if (!cap_clock_ctrl) {
|
||||
return;
|
||||
}
|
||||
|
@ -84,6 +62,26 @@ static void kvmclock_vm_state_change(void *opaque, int running,
|
|||
return;
|
||||
}
|
||||
}
|
||||
} else {
|
||||
struct kvm_clock_data data;
|
||||
int ret;
|
||||
|
||||
if (s->clock_valid) {
|
||||
return;
|
||||
}
|
||||
ret = kvm_vm_ioctl(kvm_state, KVM_GET_CLOCK, &data);
|
||||
if (ret < 0) {
|
||||
fprintf(stderr, "KVM_GET_CLOCK failed: %s\n", strerror(ret));
|
||||
abort();
|
||||
}
|
||||
s->clock = data.clock;
|
||||
|
||||
/*
|
||||
* If the VM is stopped, declare the clock state valid to
|
||||
* avoid re-reading it on next vmsave (which would return
|
||||
* a different value). Will be reset when the VM is continued.
|
||||
*/
|
||||
s->clock_valid = true;
|
||||
}
|
||||
}
|
||||
|
||||
|
@ -100,8 +98,6 @@ static const VMStateDescription kvmclock_vmsd = {
|
|||
.version_id = 1,
|
||||
.minimum_version_id = 1,
|
||||
.minimum_version_id_old = 1,
|
||||
.pre_save = kvmclock_pre_save,
|
||||
.post_load = kvmclock_post_load,
|
||||
.fields = (VMStateField[]) {
|
||||
VMSTATE_UINT64(clock, KVMClockState),
|
||||
VMSTATE_END_OF_LIST()
|
||||
|
|
|
@ -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;
|
||||
}
|
||||
|
||||
|
|
27
kvm-all.c
27
kvm-all.c
|
@ -837,6 +837,8 @@ static void kvm_mem_ioeventfd_add(MemoryListener *listener,
|
|||
data, true, int128_get64(section->size),
|
||||
match_data);
|
||||
if (r < 0) {
|
||||
fprintf(stderr, "%s: error adding ioeventfd: %s\n",
|
||||
__func__, strerror(-r));
|
||||
abort();
|
||||
}
|
||||
}
|
||||
|
@ -869,6 +871,8 @@ static void kvm_io_ioeventfd_add(MemoryListener *listener,
|
|||
data, true, int128_get64(section->size),
|
||||
match_data);
|
||||
if (r < 0) {
|
||||
fprintf(stderr, "%s: error adding ioeventfd: %s\n",
|
||||
__func__, strerror(-r));
|
||||
abort();
|
||||
}
|
||||
}
|
||||
|
@ -1012,11 +1016,8 @@ static void kvm_add_routing_entry(KVMState *s,
|
|||
}
|
||||
n = s->irq_routes->nr++;
|
||||
new = &s->irq_routes->entries[n];
|
||||
memset(new, 0, sizeof(*new));
|
||||
new->gsi = entry->gsi;
|
||||
new->type = entry->type;
|
||||
new->flags = entry->flags;
|
||||
new->u = entry->u;
|
||||
|
||||
*new = *entry;
|
||||
|
||||
set_gsi(s, entry->gsi);
|
||||
}
|
||||
|
@ -1033,9 +1034,11 @@ static int kvm_update_routing_entry(KVMState *s,
|
|||
continue;
|
||||
}
|
||||
|
||||
entry->type = new_entry->type;
|
||||
entry->flags = new_entry->flags;
|
||||
entry->u = new_entry->u;
|
||||
if(!memcmp(entry, new_entry, sizeof *entry)) {
|
||||
return 0;
|
||||
}
|
||||
|
||||
*entry = *new_entry;
|
||||
|
||||
kvm_irqchip_commit_routes(s);
|
||||
|
||||
|
@ -1047,7 +1050,7 @@ static int kvm_update_routing_entry(KVMState *s,
|
|||
|
||||
void kvm_irqchip_add_irq_route(KVMState *s, int irq, int irqchip, int pin)
|
||||
{
|
||||
struct kvm_irq_routing_entry e;
|
||||
struct kvm_irq_routing_entry e = {};
|
||||
|
||||
assert(pin < s->gsi_count);
|
||||
|
||||
|
@ -1160,7 +1163,7 @@ int kvm_irqchip_send_msi(KVMState *s, MSIMessage msg)
|
|||
return virq;
|
||||
}
|
||||
|
||||
route = g_malloc(sizeof(KVMMSIRoute));
|
||||
route = g_malloc0(sizeof(KVMMSIRoute));
|
||||
route->kroute.gsi = virq;
|
||||
route->kroute.type = KVM_IRQ_ROUTING_MSI;
|
||||
route->kroute.flags = 0;
|
||||
|
@ -1182,7 +1185,7 @@ int kvm_irqchip_send_msi(KVMState *s, MSIMessage msg)
|
|||
|
||||
int kvm_irqchip_add_msi_route(KVMState *s, MSIMessage msg)
|
||||
{
|
||||
struct kvm_irq_routing_entry kroute;
|
||||
struct kvm_irq_routing_entry kroute = {};
|
||||
int virq;
|
||||
|
||||
if (!kvm_gsi_routing_enabled()) {
|
||||
|
@ -1209,7 +1212,7 @@ int kvm_irqchip_add_msi_route(KVMState *s, MSIMessage msg)
|
|||
|
||||
int kvm_irqchip_update_msi_route(KVMState *s, int virq, MSIMessage msg)
|
||||
{
|
||||
struct kvm_irq_routing_entry kroute;
|
||||
struct kvm_irq_routing_entry kroute = {};
|
||||
|
||||
if (!kvm_irqchip_in_kernel()) {
|
||||
return -ENOSYS;
|
||||
|
|
Loading…
Reference in a new issue