mirror of
https://github.com/xen-project/xen.git
synced 2026-10-29 18:50:05 +01:00
Viresh Kumar
c8aaebccc8
The field 'base' in 'struct libxl_device_virtio' is defined as uint64,
while we are printing it with '%lu', which is 32bit only 32-bit
platforms. And so generates a error like:
libxl_internal.h:4388:51: error: format '%lu' expects argument of type 'long
unsigned int', but argument 3 has type 'uint64_t' {aka 'long long unsigned
int'} [-Werror=format=]
Fix it by switching to a 64bit PRI instead.
While fixing this, switch from decimal to hex which is the more natural base
to use for a field like this.
Fixes: 43ba5202e2 ("libxl: add support for generic virtio device")
Signed-off-by: Viresh Kumar <viresh.kumar@linaro.org>
Acked-by: Andrew Cooper <andrew.cooper3@citrix.com>
145 lines
4.4 KiB
C
145 lines
4.4 KiB
C
/*
|
|
* Copyright (C) 2022 Linaro Ltd.
|
|
*
|
|
* This program is free software; you can redistribute it and/or modify
|
|
* it under the terms of the GNU Lesser General Public License as published
|
|
* by the Free Software Foundation; version 2.1 only. with the special
|
|
* exception on linking described in file LICENSE.
|
|
*
|
|
* This program is distributed in the hope that it will be useful,
|
|
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
* GNU Lesser General Public License for more details.
|
|
*/
|
|
|
|
#include "libxl_internal.h"
|
|
|
|
static int libxl__device_virtio_setdefault(libxl__gc *gc, uint32_t domid,
|
|
libxl_device_virtio *virtio,
|
|
bool hotplug)
|
|
{
|
|
return libxl__resolve_domid(gc, virtio->backend_domname,
|
|
&virtio->backend_domid);
|
|
}
|
|
|
|
static int libxl__device_from_virtio(libxl__gc *gc, uint32_t domid,
|
|
libxl_device_virtio *virtio,
|
|
libxl__device *device)
|
|
{
|
|
device->backend_devid = virtio->devid;
|
|
device->backend_domid = virtio->backend_domid;
|
|
device->devid = virtio->devid;
|
|
device->domid = domid;
|
|
|
|
device->backend_kind = LIBXL__DEVICE_KIND_VIRTIO;
|
|
device->kind = LIBXL__DEVICE_KIND_VIRTIO;
|
|
|
|
return 0;
|
|
}
|
|
|
|
static int libxl__set_xenstore_virtio(libxl__gc *gc, uint32_t domid,
|
|
libxl_device_virtio *virtio,
|
|
flexarray_t *back, flexarray_t *front,
|
|
flexarray_t *ro_front)
|
|
{
|
|
const char *transport = libxl_virtio_transport_to_string(virtio->transport);
|
|
|
|
flexarray_append_pair(back, "irq", GCSPRINTF("%u", virtio->irq));
|
|
flexarray_append_pair(back, "base", GCSPRINTF("%#"PRIx64, virtio->base));
|
|
flexarray_append_pair(back, "type", GCSPRINTF("%s", virtio->type));
|
|
flexarray_append_pair(back, "transport", GCSPRINTF("%s", transport));
|
|
|
|
flexarray_append_pair(front, "irq", GCSPRINTF("%u", virtio->irq));
|
|
flexarray_append_pair(front, "base", GCSPRINTF("%#"PRIx64, virtio->base));
|
|
flexarray_append_pair(front, "type", GCSPRINTF("%s", virtio->type));
|
|
flexarray_append_pair(front, "transport", GCSPRINTF("%s", transport));
|
|
|
|
return 0;
|
|
}
|
|
|
|
static int libxl__virtio_from_xenstore(libxl__gc *gc, const char *libxl_path,
|
|
libxl_devid devid,
|
|
libxl_device_virtio *virtio)
|
|
{
|
|
const char *be_path, *tmp = NULL;
|
|
int rc;
|
|
|
|
virtio->devid = devid;
|
|
|
|
rc = libxl__xs_read_mandatory(gc, XBT_NULL,
|
|
GCSPRINTF("%s/backend", libxl_path),
|
|
&be_path);
|
|
if (rc) goto out;
|
|
|
|
rc = libxl__backendpath_parse_domid(gc, be_path, &virtio->backend_domid);
|
|
if (rc) goto out;
|
|
|
|
rc = libxl__xs_read_checked(gc, XBT_NULL,
|
|
GCSPRINTF("%s/irq", be_path), &tmp);
|
|
if (rc) goto out;
|
|
|
|
if (tmp) {
|
|
virtio->irq = strtoul(tmp, NULL, 0);
|
|
}
|
|
|
|
tmp = NULL;
|
|
rc = libxl__xs_read_checked(gc, XBT_NULL,
|
|
GCSPRINTF("%s/base", be_path), &tmp);
|
|
if (rc) goto out;
|
|
|
|
if (tmp) {
|
|
virtio->base = strtoul(tmp, NULL, 0);
|
|
}
|
|
|
|
tmp = NULL;
|
|
rc = libxl__xs_read_checked(gc, XBT_NULL,
|
|
GCSPRINTF("%s/transport", be_path), &tmp);
|
|
if (rc) goto out;
|
|
|
|
if (tmp) {
|
|
if (!strcmp(tmp, "mmio")) {
|
|
virtio->transport = LIBXL_VIRTIO_TRANSPORT_MMIO;
|
|
} else {
|
|
return ERROR_INVAL;
|
|
}
|
|
}
|
|
|
|
tmp = NULL;
|
|
rc = libxl__xs_read_checked(gc, XBT_NULL,
|
|
GCSPRINTF("%s/type", be_path), &tmp);
|
|
if (rc) goto out;
|
|
|
|
if (tmp) {
|
|
int len = sizeof(VIRTIO_DEVICE_TYPE_GENERIC) - 1;
|
|
|
|
if (!strncmp(tmp, VIRTIO_DEVICE_TYPE_GENERIC, len)) {
|
|
virtio->type = libxl__strdup(NOGC, tmp);
|
|
} else {
|
|
return ERROR_INVAL;
|
|
}
|
|
}
|
|
|
|
out:
|
|
return rc;
|
|
}
|
|
|
|
static LIBXL_DEFINE_UPDATE_DEVID(virtio)
|
|
|
|
#define libxl__add_virtios NULL
|
|
#define libxl_device_virtio_compare NULL
|
|
|
|
DEFINE_DEVICE_TYPE_STRUCT(virtio, VIRTIO, virtios,
|
|
.set_xenstore_config = (device_set_xenstore_config_fn_t)
|
|
libxl__set_xenstore_virtio,
|
|
.from_xenstore = (device_from_xenstore_fn_t)libxl__virtio_from_xenstore,
|
|
.skip_attach = 1
|
|
);
|
|
|
|
/*
|
|
* Local variables:
|
|
* mode: C
|
|
* c-basic-offset: 4
|
|
* indent-tabs-mode: nil
|
|
* End:
|
|
*/
|