haraldwolff/qemu-patch-raspberry4
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

hyperv_testdev: refactor for better maintainability

Browse source 
Make hyperv_testdev slightly easier to follow and enhance in future.
For that, put the hyperv sint routes (wrapped in a helper structure) on
a linked list rather than a fixed-size array.  Besides, this way
HvSintRoute can be treated as an opaque structure, allowing for easier
refactoring of the core Hyper-V SynIC code in followup pathches.

Signed-off-by: Roman Kagan <rkagan@virtuozzo.com>
Message-Id: <20180921081836.29230-2-rkagan@virtuozzo.com>
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
This commit is contained in:
Roman Kagan 2018-09-21 11:18:29 +03:00 committed by Paolo Bonzini
parent 40dce4ee61
commit 1ba5c3a954
1 changed files with 57 additions and 63 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

120
hw/misc/hyperv_testdev.c
View file

@ -12,6 +12,7 @@
*/
#include "qemu/osdep.h"
#include "qemu/queue.h"
#include <linux/kvm.h>
#include "hw/hw.h"
#include "hw/qdev.h"
@ -20,12 +21,17 @@
#include "target/i386/hyperv.h"
#include "kvm_i386.h"
#define HV_TEST_DEV_MAX_SINT_ROUTES 64
typedef struct TestSintRoute {
QLIST_ENTRY(TestSintRoute) le;
uint8_t vp_index;
uint8_t sint;
HvSintRoute *sint_route;
} TestSintRoute;
struct HypervTestDev {
ISADevice parent_obj;
MemoryRegion sint_control;
HvSintRoute *sint_route[HV_TEST_DEV_MAX_SINT_ROUTES];
QLIST_HEAD(, TestSintRoute) sint_routes;
};
typedef struct HypervTestDev HypervTestDev;
@ -39,70 +45,56 @@ enum {
HV_TEST_DEV_SINT_ROUTE_SET_SINT
};
static int alloc_sint_route_index(HypervTestDev *dev)
static void sint_route_create(HypervTestDev *dev,
uint8_t vp_index, uint8_t sint)
{
int i;
TestSintRoute *sint_route;
for (i = 0; i < ARRAY_SIZE(dev->sint_route); i++) {
if (dev->sint_route[i] == NULL) {
return i;
sint_route = g_new0(TestSintRoute, 1);
assert(sint_route);
sint_route->vp_index = vp_index;
sint_route->sint = sint;
sint_route->sint_route = kvm_hv_sint_route_create(vp_index, sint, NULL);
assert(sint_route->sint_route);
QLIST_INSERT_HEAD(&dev->sint_routes, sint_route, le);
}
static TestSintRoute *sint_route_find(HypervTestDev *dev,
uint8_t vp_index, uint8_t sint)
{
TestSintRoute *sint_route;
QLIST_FOREACH(sint_route, &dev->sint_routes, le) {
if (sint_route->vp_index == vp_index && sint_route->sint == sint) {
return sint_route;
}
}
return -1;
assert(false);
return NULL;
}
static void free_sint_route_index(HypervTestDev *dev, int i)
static void sint_route_destroy(HypervTestDev *dev,
uint8_t vp_index, uint8_t sint)
{
assert(i >= 0 && i < ARRAY_SIZE(dev->sint_route));
dev->sint_route[i] = NULL;
TestSintRoute *sint_route;
sint_route = sint_route_find(dev, vp_index, sint);
QLIST_REMOVE(sint_route, le);
kvm_hv_sint_route_destroy(sint_route->sint_route);
g_free(sint_route);
}
static int find_sint_route_index(HypervTestDev *dev, uint32_t vp_index,
uint32_t sint)
static void sint_route_set_sint(HypervTestDev *dev,
uint8_t vp_index, uint8_t sint)
{
HvSintRoute *sint_route;
int i;
TestSintRoute *sint_route;
for (i = 0; i < ARRAY_SIZE(dev->sint_route); i++) {
sint_route = dev->sint_route[i];
if (sint_route && sint_route->vp_index == vp_index &&
sint_route->sint == sint) {
return i;
}
}
return -1;
}
sint_route = sint_route_find(dev, vp_index, sint);
static void hv_synic_test_dev_control(HypervTestDev *dev, uint32_t ctl,
uint32_t vp_index, uint32_t sint)
{
int i;
HvSintRoute *sint_route;
switch (ctl) {
case HV_TEST_DEV_SINT_ROUTE_CREATE:
i = alloc_sint_route_index(dev);
assert(i >= 0);
sint_route = kvm_hv_sint_route_create(vp_index, sint, NULL);
assert(sint_route);
dev->sint_route[i] = sint_route;
break;
case HV_TEST_DEV_SINT_ROUTE_DESTROY:
i = find_sint_route_index(dev, vp_index, sint);
assert(i >= 0);
sint_route = dev->sint_route[i];
kvm_hv_sint_route_destroy(sint_route);
free_sint_route_index(dev, i);
break;
case HV_TEST_DEV_SINT_ROUTE_SET_SINT:
i = find_sint_route_index(dev, vp_index, sint);
assert(i >= 0);
sint_route = dev->sint_route[i];
kvm_hv_sint_route_set_sint(sint_route);
break;
default:
break;
}
kvm_hv_sint_route_set_sint(sint_route->sint_route);
}
static uint64_t hv_test_dev_read(void *opaque, hwaddr addr, unsigned size)
@ -114,18 +106,20 @@ static void hv_test_dev_write(void *opaque, hwaddr addr, uint64_t data,
uint32_t len)
{
HypervTestDev *dev = HYPERV_TEST_DEV(opaque);
uint8_t ctl;
uint8_t sint = data & 0xFF;
uint8_t vp_index = (data >> 8ULL) & 0xFF;
uint8_t ctl = (data >> 16ULL) & 0xFF;
ctl = (data >> 16ULL) & 0xFF;
switch (ctl) {
case HV_TEST_DEV_SINT_ROUTE_CREATE:
case HV_TEST_DEV_SINT_ROUTE_DESTROY:
case HV_TEST_DEV_SINT_ROUTE_SET_SINT: {
uint8_t sint = data & 0xFF;
uint8_t vp_index = (data >> 8ULL) & 0xFF;
hv_synic_test_dev_control(dev, ctl, vp_index, sint);
sint_route_create(dev, vp_index, sint);
break;
case HV_TEST_DEV_SINT_ROUTE_DESTROY:
sint_route_destroy(dev, vp_index, sint);
break;
case HV_TEST_DEV_SINT_ROUTE_SET_SINT:
sint_route_set_sint(dev, vp_index, sint);
break;
}
default:
break;
}
@ -145,7 +139,7 @@ static void hv_test_dev_realizefn(DeviceState *d, Error **errp)
HypervTestDev *dev = HYPERV_TEST_DEV(d);
MemoryRegion *io = isa_address_space_io(isa);
memset(dev->sint_route, 0, sizeof(dev->sint_route));
QLIST_INIT(&dev->sint_routes);
memory_region_init_io(&dev->sint_control, OBJECT(dev),
&synic_test_sint_ops, dev,
"hyperv-testdev-ctl", 4);