670d8c6ebf
As the Xen backend operations were abstracted out into a function table to
allow for internally emulated Xen support, we missed the xen_init_pv()
code path which also needs to install the operations for the true Xen
libraries. Add the missing call to setup_xen_backend_ops().
Fixes: b6cacfea0b ("hw/xen: Add evtchn operations to allow redirection to internal emulation")
Reported-by: Anthony PERARD <anthony.perard@citrix.com>
Signed-off-by: David Woodhouse <dwmw@amazon.co.uk>
Reviewed-by: Paul Durrant <paul@xen.org>
Tested-by: Anthony PERARD <anthony.perard@citrix.com>
Message-Id: <5dfb65342d4502c1ce2f890c97cff20bf25b3860.camel@infradead.org>
Signed-off-by: Anthony PERARD <anthony.perard@citrix.com>
97 lines
2.8 KiB
C
97 lines
2.8 KiB
C
/*
|
|
* QEMU Xen PV Machine
|
|
*
|
|
* Copyright (c) 2007 Red Hat
|
|
*
|
|
* Permission is hereby granted, free of charge, to any person obtaining a copy
|
|
* of this software and associated documentation files (the "Software"), to deal
|
|
* in the Software without restriction, including without limitation the rights
|
|
* to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
|
|
* copies of the Software, and to permit persons to whom the Software is
|
|
* furnished to do so, subject to the following conditions:
|
|
*
|
|
* The above copyright notice and this permission notice shall be included in
|
|
* all copies or substantial portions of the Software.
|
|
*
|
|
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
|
|
* IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
|
|
* FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
|
|
* THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
|
|
* LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
|
|
* OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
|
|
* THE SOFTWARE.
|
|
*/
|
|
|
|
#include "qemu/osdep.h"
|
|
#include "qemu/error-report.h"
|
|
#include "hw/boards.h"
|
|
#include "hw/xen/xen-legacy-backend.h"
|
|
#include "hw/xen/xen-bus.h"
|
|
#include "sysemu/block-backend.h"
|
|
#include "sysemu/sysemu.h"
|
|
|
|
static void xen_init_pv(MachineState *machine)
|
|
{
|
|
DriveInfo *dinfo;
|
|
int i;
|
|
|
|
setup_xen_backend_ops();
|
|
|
|
/* Initialize backend core & drivers */
|
|
xen_be_init();
|
|
|
|
switch (xen_mode) {
|
|
case XEN_ATTACH:
|
|
/* nothing to do, libxl handles everything */
|
|
break;
|
|
case XEN_EMULATE:
|
|
error_report("xen emulation not implemented (yet)");
|
|
exit(1);
|
|
break;
|
|
default:
|
|
error_report("unhandled xen_mode %d", xen_mode);
|
|
exit(1);
|
|
break;
|
|
}
|
|
|
|
xen_be_register("vfb", &xen_framebuffer_ops);
|
|
xen_be_register("qnic", &xen_netdev_ops);
|
|
|
|
/* configure framebuffer */
|
|
if (vga_interface_type == VGA_XENFB) {
|
|
xen_config_dev_vfb(0, "vnc");
|
|
xen_config_dev_vkbd(0);
|
|
vga_interface_created = true;
|
|
}
|
|
|
|
/* configure disks */
|
|
for (i = 0; i < 16; i++) {
|
|
dinfo = drive_get(IF_XEN, 0, i);
|
|
if (!dinfo)
|
|
continue;
|
|
xen_config_dev_blk(dinfo);
|
|
}
|
|
|
|
/* configure nics */
|
|
for (i = 0; i < nb_nics; i++) {
|
|
if (!nd_table[i].model || 0 != strcmp(nd_table[i].model, "xen"))
|
|
continue;
|
|
xen_config_dev_nic(nd_table + i);
|
|
}
|
|
|
|
xen_bus_init();
|
|
|
|
/* config cleanup hook */
|
|
atexit(xen_config_cleanup);
|
|
}
|
|
|
|
static void xenpv_machine_init(MachineClass *mc)
|
|
{
|
|
mc->desc = "Xen Para-virtualized PC";
|
|
mc->init = xen_init_pv;
|
|
mc->max_cpus = 1;
|
|
mc->default_machine_opts = "accel=xen";
|
|
}
|
|
|
|
DEFINE_MACHINE("xenpv", xenpv_machine_init)
|