mirror of
https://github.com/qemu/qemu.git
synced 2024-12-22 11:43:48 +08:00
804ba7c10b
When using QEMU for Xen PV guest, QEMU abort with:
xen-common.c:118:xen_init: Object 0x7f2b8325dcb0 is not an instance of type generic-pc-machine
This is because the machine 'xenpv' also use accel=xen. Moving the code
to xen_hvm_init() fix the issue.
This fix 021746c131
.
Signed-off-by: Anthony PERARD <anthony.perard@citrix.com>
Signed-off-by: Stefano Stabellini <sstabellini@kernel.org>
Reviewed-by: Eduardo Habkost <ehabkost@redhat.com>
Reviewed-by: Stefano Stabellini <sstabellini@kernel.org>
159 lines
3.8 KiB
C
159 lines
3.8 KiB
C
/*
|
|
* 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 "hw/xen/xen_backend.h"
|
|
#include "qmp-commands.h"
|
|
#include "sysemu/char.h"
|
|
#include "sysemu/accel.h"
|
|
#include "migration/migration.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
|
|
|
|
static int store_dev_info(int domid, CharDriverState *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 (strncmp(cs->filename, "pty:", 4)) {
|
|
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, CharDriverState *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) {
|
|
fprintf(stderr, "xenstore connection not initialized\n");
|
|
exit(1);
|
|
}
|
|
|
|
snprintf(path, sizeof (path), "device-model/%u/state", xen_domid);
|
|
if (!xs_write(xs, XBT_NULL, path, state, strlen(state))) {
|
|
fprintf(stderr, "error recording dm state\n");
|
|
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 int xen_init(MachineState *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;
|
|
}
|
|
qemu_add_vm_change_state_handler(xen_change_state_handler, NULL);
|
|
|
|
global_state_set_optional();
|
|
savevm_skip_configuration();
|
|
savevm_skip_section_footers();
|
|
|
|
return 0;
|
|
}
|
|
|
|
static void xen_accel_class_init(ObjectClass *oc, void *data)
|
|
{
|
|
AccelClass *ac = ACCEL_CLASS(oc);
|
|
ac->name = "Xen";
|
|
ac->init_machine = xen_init;
|
|
ac->allowed = &xen_allowed;
|
|
}
|
|
|
|
#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);
|