xen: Drop __XEN_LATEST_INTERFACE_VERSION__ checks from prior to Xen 4.2
We assume (and check for in configure) 4.2 or later now. In reality all of the removed checks are for far older versions. FMT_ioreq_size is no longer needed. Signed-off-by: Ian Campbell <ian.campbell@citrix.com> Reviewed-by: Stefano Stabellini <stefano.stabellini@eu.citrix.com> Signed-off-by: Stefano Stabellini <stefano.stabellini@eu.citrix.com>
This commit is contained in:
parent
6aa0205e49
commit
47d3df2387
|
@ -241,9 +241,7 @@ static int xenfb_send_motion(struct XenInput *xenfb,
|
|||
event.type = XENKBD_TYPE_MOTION;
|
||||
event.motion.rel_x = rel_x;
|
||||
event.motion.rel_y = rel_y;
|
||||
#if __XEN_LATEST_INTERFACE_VERSION__ >= 0x00030207
|
||||
event.motion.rel_z = rel_z;
|
||||
#endif
|
||||
|
||||
return xenfb_kbd_event(xenfb, &event);
|
||||
}
|
||||
|
@ -258,12 +256,7 @@ static int xenfb_send_position(struct XenInput *xenfb,
|
|||
event.type = XENKBD_TYPE_POS;
|
||||
event.pos.abs_x = abs_x;
|
||||
event.pos.abs_y = abs_y;
|
||||
#if __XEN_LATEST_INTERFACE_VERSION__ == 0x00030207
|
||||
event.pos.abs_z = z;
|
||||
#endif
|
||||
#if __XEN_LATEST_INTERFACE_VERSION__ >= 0x00030208
|
||||
event.pos.rel_z = z;
|
||||
#endif
|
||||
|
||||
return xenfb_kbd_event(xenfb, &event);
|
||||
}
|
||||
|
|
19
xen-hvm.c
19
xen-hvm.c
|
@ -67,17 +67,6 @@ struct shared_vmport_iopage {
|
|||
typedef struct shared_vmport_iopage shared_vmport_iopage_t;
|
||||
#endif
|
||||
|
||||
#if __XEN_LATEST_INTERFACE_VERSION__ < 0x0003020a
|
||||
static inline uint32_t xen_vcpu_eport(shared_iopage_t *shared_page, int i)
|
||||
{
|
||||
return shared_page->vcpu_iodata[i].vp_eport;
|
||||
}
|
||||
static inline ioreq_t *xen_vcpu_ioreq(shared_iopage_t *shared_page, int vcpu)
|
||||
{
|
||||
return &shared_page->vcpu_iodata[vcpu].vp_ioreq;
|
||||
}
|
||||
# define FMT_ioreq_size PRIx64
|
||||
#else
|
||||
static inline uint32_t xen_vcpu_eport(shared_iopage_t *shared_page, int i)
|
||||
{
|
||||
return shared_page->vcpu_ioreq[i].vp_eport;
|
||||
|
@ -86,8 +75,6 @@ static inline ioreq_t *xen_vcpu_ioreq(shared_iopage_t *shared_page, int vcpu)
|
|||
{
|
||||
return &shared_page->vcpu_ioreq[vcpu];
|
||||
}
|
||||
# define FMT_ioreq_size "u"
|
||||
#endif
|
||||
|
||||
#define BUFFER_IO_MAX_DELAY 100
|
||||
|
||||
|
@ -688,7 +675,7 @@ static ioreq_t *cpu_get_ioreq_from_shared_memory(XenIOState *state, int vcpu)
|
|||
if (req->state != STATE_IOREQ_READY) {
|
||||
DPRINTF("I/O request not ready: "
|
||||
"%x, ptr: %x, port: %"PRIx64", "
|
||||
"data: %"PRIx64", count: %" FMT_ioreq_size ", size: %" FMT_ioreq_size "\n",
|
||||
"data: %"PRIx64", count: %u, size: %u\n",
|
||||
req->state, req->data_is_ptr, req->addr,
|
||||
req->data, req->count, req->size);
|
||||
return NULL;
|
||||
|
@ -1050,9 +1037,7 @@ static void cpu_handle_ioreq(void *opaque)
|
|||
if (req->state != STATE_IOREQ_INPROCESS) {
|
||||
fprintf(stderr, "Badness in I/O request ... not in service?!: "
|
||||
"%x, ptr: %x, port: %"PRIx64", "
|
||||
"data: %"PRIx64", count: %" FMT_ioreq_size
|
||||
", size: %" FMT_ioreq_size
|
||||
", type: %"FMT_ioreq_size"\n",
|
||||
"data: %"PRIx64", count: %u, size: %u, type: %u\n",
|
||||
req->state, req->data_is_ptr, req->addr,
|
||||
req->data, req->count, req->size, req->type);
|
||||
destroy_hvm_domain(false);
|
||||
|
|
Loading…
Reference in New Issue