aboutsummaryrefslogtreecommitdiff
path: root/hw/xen
diff options
context:
space:
mode:
authorPhilippe Mathieu-Daudé <philmd@redhat.com>2020-05-08 12:02:22 +0200
committerPaolo Bonzini <pbonzini@redhat.com>2020-06-10 12:09:56 -0400
commitda278d58a092bfcc4e36f1e274229c1468dea731 (patch)
tree83fa17711816ae569b86ebccdadbfe04d0819db0 /hw/xen
parent23accdf162dcccb9fec9585a64ad01a87b13da5c (diff)
accel: Move Xen accelerator code under accel/xen/
This code is not related to hardware emulation. Move it under accel/ with the other hypervisors. Reviewed-by: Paul Durrant <paul@xen.org> Signed-off-by: Philippe Mathieu-Daudé <philmd@redhat.com> Message-Id: <20200508100222.7112-1-philmd@redhat.com> Reviewed-by: Juan Quintela <quintela@redhat.com> Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
Diffstat (limited to 'hw/xen')
-rw-r--r--hw/xen/Makefile.objs2
-rw-r--r--hw/xen/xen-common.c219
2 files changed, 1 insertions, 220 deletions
diff --git a/hw/xen/Makefile.objs b/hw/xen/Makefile.objs
index 84df60a928..340b2c5096 100644
--- a/hw/xen/Makefile.objs
+++ b/hw/xen/Makefile.objs
@@ -1,5 +1,5 @@
# xen backend driver support
-common-obj-$(CONFIG_XEN) += xen-legacy-backend.o xen_devconfig.o xen_pvdev.o xen-common.o xen-bus.o xen-bus-helper.o xen-backend.o
+common-obj-$(CONFIG_XEN) += xen-legacy-backend.o xen_devconfig.o xen_pvdev.o xen-bus.o xen-bus-helper.o xen-backend.o
obj-$(CONFIG_XEN_PCI_PASSTHROUGH) += xen-host-pci-device.o
obj-$(CONFIG_XEN_PCI_PASSTHROUGH) += xen_pt.o xen_pt_config_init.o xen_pt_graphics.o xen_pt_msi.o
diff --git a/hw/xen/xen-common.c b/hw/xen/xen-common.c
deleted file mode 100644
index 70564cc952..0000000000
--- a/hw/xen/xen-common.c
+++ /dev/null
@@ -1,219 +0,0 @@
-/*
- * Copyright (C) 2014 Citrix Systems UK Ltd.
- *
- * This work is licensed under the terms of the GNU GPL, version 2. See
- * the COPYING file in the top-level directory.
- *
- * Contributions after 2012-01-13 are licensed under the terms of the
- * GNU GPL, version 2 or (at your option) any later version.
- */
-
-#include "qemu/osdep.h"
-#include "qemu/error-report.h"
-#include "qemu/module.h"
-#include "qapi/error.h"
-#include "hw/xen/xen-legacy-backend.h"
-#include "hw/xen/xen_pt.h"
-#include "chardev/char.h"
-#include "sysemu/accel.h"
-#include "sysemu/runstate.h"
-#include "migration/misc.h"
-#include "migration/global_state.h"
-#include "hw/boards.h"
-
-//#define DEBUG_XEN
-
-#ifdef DEBUG_XEN
-#define DPRINTF(fmt, ...) \
- do { fprintf(stderr, "xen: " fmt, ## __VA_ARGS__); } while (0)
-#else
-#define DPRINTF(fmt, ...) \
- do { } while (0)
-#endif
-
-xc_interface *xen_xc;
-xenforeignmemory_handle *xen_fmem;
-xendevicemodel_handle *xen_dmod;
-
-static int store_dev_info(int domid, Chardev *cs, const char *string)
-{
- struct xs_handle *xs = NULL;
- char *path = NULL;
- char *newpath = NULL;
- char *pts = NULL;
- int ret = -1;
-
- /* Only continue if we're talking to a pty. */
- if (!CHARDEV_IS_PTY(cs)) {
- return 0;
- }
- pts = cs->filename + 4;
-
- /* We now have everything we need to set the xenstore entry. */
- xs = xs_open(0);
- if (xs == NULL) {
- fprintf(stderr, "Could not contact XenStore\n");
- goto out;
- }
-
- path = xs_get_domain_path(xs, domid);
- if (path == NULL) {
- fprintf(stderr, "xs_get_domain_path() error\n");
- goto out;
- }
- newpath = realloc(path, (strlen(path) + strlen(string) +
- strlen("/tty") + 1));
- if (newpath == NULL) {
- fprintf(stderr, "realloc error\n");
- goto out;
- }
- path = newpath;
-
- strcat(path, string);
- strcat(path, "/tty");
- if (!xs_write(xs, XBT_NULL, path, pts, strlen(pts))) {
- fprintf(stderr, "xs_write for '%s' fail", string);
- goto out;
- }
- ret = 0;
-
-out:
- free(path);
- xs_close(xs);
-
- return ret;
-}
-
-void xenstore_store_pv_console_info(int i, Chardev *chr)
-{
- if (i == 0) {
- store_dev_info(xen_domid, chr, "/console");
- } else {
- char buf[32];
- snprintf(buf, sizeof(buf), "/device/console/%d", i);
- store_dev_info(xen_domid, chr, buf);
- }
-}
-
-
-static void xenstore_record_dm_state(struct xs_handle *xs, const char *state)
-{
- char path[50];
-
- if (xs == NULL) {
- error_report("xenstore connection not initialized");
- exit(1);
- }
-
- snprintf(path, sizeof (path), "device-model/%u/state", xen_domid);
- /*
- * This call may fail when running restricted so don't make it fatal in
- * that case. Toolstacks should instead use QMP to listen for state changes.
- */
- if (!xs_write(xs, XBT_NULL, path, state, strlen(state)) &&
- !xen_domid_restrict) {
- error_report("error recording dm state");
- exit(1);
- }
-}
-
-
-static void xen_change_state_handler(void *opaque, int running,
- RunState state)
-{
- if (running) {
- /* record state running */
- xenstore_record_dm_state(xenstore, "running");
- }
-}
-
-static bool xen_get_igd_gfx_passthru(Object *obj, Error **errp)
-{
- return has_igd_gfx_passthru;
-}
-
-static void xen_set_igd_gfx_passthru(Object *obj, bool value, Error **errp)
-{
- has_igd_gfx_passthru = value;
-}
-
-static void xen_setup_post(MachineState *ms, AccelState *accel)
-{
- int rc;
-
- if (xen_domid_restrict) {
- rc = xen_restrict(xen_domid);
- if (rc < 0) {
- perror("xen: failed to restrict");
- exit(1);
- }
- }
-}
-
-static int xen_init(MachineState *ms)
-{
- MachineClass *mc = MACHINE_GET_CLASS(ms);
-
- xen_xc = xc_interface_open(0, 0, 0);
- if (xen_xc == NULL) {
- xen_pv_printf(NULL, 0, "can't open xen interface\n");
- return -1;
- }
- xen_fmem = xenforeignmemory_open(0, 0);
- if (xen_fmem == NULL) {
- xen_pv_printf(NULL, 0, "can't open xen fmem interface\n");
- xc_interface_close(xen_xc);
- return -1;
- }
- xen_dmod = xendevicemodel_open(0, 0);
- if (xen_dmod == NULL) {
- xen_pv_printf(NULL, 0, "can't open xen devicemodel interface\n");
- xenforeignmemory_close(xen_fmem);
- xc_interface_close(xen_xc);
- return -1;
- }
- qemu_add_vm_change_state_handler(xen_change_state_handler, NULL);
- /*
- * opt out of system RAM being allocated by generic code
- */
- mc->default_ram_id = NULL;
- return 0;
-}
-
-static void xen_accel_class_init(ObjectClass *oc, void *data)
-{
- AccelClass *ac = ACCEL_CLASS(oc);
- static GlobalProperty compat[] = {
- { "migration", "store-global-state", "off" },
- { "migration", "send-configuration", "off" },
- { "migration", "send-section-footer", "off" },
- };
-
- ac->name = "Xen";
- ac->init_machine = xen_init;
- ac->setup_post = xen_setup_post;
- ac->allowed = &xen_allowed;
- ac->compat_props = g_ptr_array_new();
-
- compat_props_add(ac->compat_props, compat, G_N_ELEMENTS(compat));
-
- object_class_property_add_bool(oc, "igd-passthru",
- xen_get_igd_gfx_passthru, xen_set_igd_gfx_passthru);
- object_class_property_set_description(oc, "igd-passthru",
- "Set on/off to enable/disable igd passthrou");
-}
-
-#define TYPE_XEN_ACCEL ACCEL_CLASS_NAME("xen")
-
-static const TypeInfo xen_accel_type = {
- .name = TYPE_XEN_ACCEL,
- .parent = TYPE_ACCEL,
- .class_init = xen_accel_class_init,
-};
-
-static void xen_type_init(void)
-{
- type_register_static(&xen_accel_type);
-}
-
-type_init(xen_type_init);