diff options
Diffstat (limited to 'hw/xenpv/xen_machine_pv.c')
| -rw-r--r-- | hw/xenpv/xen_machine_pv.c | 21 |
1 files changed, 5 insertions, 16 deletions
diff --git a/hw/xenpv/xen_machine_pv.c b/hw/xenpv/xen_machine_pv.c index 44d67b87c4..dcaf2a01a3 100644 --- a/hw/xenpv/xen_machine_pv.c +++ b/hw/xenpv/xen_machine_pv.c @@ -26,8 +26,8 @@ #include "qemu/error-report.h" #include "hw/hw.h" #include "hw/boards.h" -#include "hw/xen/xen_backend.h" -#include "xen_domainbuild.h" +#include "hw/xen/xen-legacy-backend.h" +#include "hw/xen/xen-bus.h" #include "sysemu/block-backend.h" static void xen_init_pv(MachineState *machine) @@ -43,21 +43,8 @@ static void xen_init_pv(MachineState *machine) switch (xen_mode) { case XEN_ATTACH: - /* nothing to do, xend handles everything */ + /* nothing to do, libxl handles everything */ break; -#ifdef CONFIG_XEN_PV_DOMAIN_BUILD - case XEN_CREATE: { - const char *kernel_filename = machine->kernel_filename; - const char *kernel_cmdline = machine->kernel_cmdline; - const char *initrd_filename = machine->initrd_filename; - if (xen_domain_build_pv(kernel_filename, initrd_filename, - kernel_cmdline) < 0) { - error_report("xen pv domain creation failed"); - exit(1); - } - break; - } -#endif case XEN_EMULATE: error_report("xen emulation not implemented (yet)"); exit(1); @@ -93,6 +80,8 @@ static void xen_init_pv(MachineState *machine) xen_config_dev_nic(nd_table + i); } + xen_bus_init(); + /* config cleanup hook */ atexit(xen_config_cleanup); } |