diff --git a/docs/drvqemu.html.in b/docs/drvqemu.html.in index 4977ea1957..fa1eca78a2 100644 --- a/docs/drvqemu.html.in +++ b/docs/drvqemu.html.in @@ -8,9 +8,7 @@

The libvirt KVM/QEMU driver can manage any QEMU emulator from - version 0.12.0 or later. It can also manage Xenner, which - provides the same QEMU command line syntax and monitor - interaction. + version 0.12.0 or later.

Project Links

@@ -43,12 +41,6 @@ node. If both are found, then KVM fullyvirtualized, hardware accelerated guests will be available. -
  • - Xenner hypervisor: The driver will probe /usr/bin - for the presence of xenner and /dev/kvm device - node. If both are found, then Xen paravirtualized guests can be run using - the KVM hardware acceleration. -
  • Connections to QEMU driver

    @@ -647,9 +639,5 @@ $ virsh domxml-to-native qemu-argv demo.xml </devices> </domain> -

    Xen paravirtualized guests with hardware acceleration

    - - - diff --git a/src/qemu/qemu_capabilities.c b/src/qemu/qemu_capabilities.c index bbb64def02..9594e8c71b 100644 --- a/src/qemu/qemu_capabilities.c +++ b/src/qemu/qemu_capabilities.c @@ -1096,10 +1096,6 @@ virQEMUCapsComputeCmdFlags(const char *help, virQEMUCapsSet(qemuCaps, QEMU_CAPS_ENABLE_KVM); if (strstr(help, ",process=")) virQEMUCapsSet(qemuCaps, QEMU_CAPS_NAME_PROCESS); - if (strstr(help, "-xen-domid")) - virQEMUCapsSet(qemuCaps, QEMU_CAPS_XEN_DOMID); - else if (strstr(help, "-domid")) - virQEMUCapsSet(qemuCaps, QEMU_CAPS_DOMID); cache = strstr(help, "cache="); if (cache && (p = strchr(cache, ']'))) { diff --git a/src/qemu/qemu_capabilities.h b/src/qemu/qemu_capabilities.h index 5370743c9e..faca5994f2 100644 --- a/src/qemu/qemu_capabilities.h +++ b/src/qemu/qemu_capabilities.h @@ -55,7 +55,7 @@ typedef enum { /* 5 */ X_QEMU_CAPS_NAME, /* Is the -name flag available */ X_QEMU_CAPS_UUID, /* Is the -uuid flag available */ - QEMU_CAPS_DOMID, /* Xenner: -domid flag available */ + X_QEMU_CAPS_DOMID, /* Xenner: -domid flag available */ QEMU_CAPS_VNET_HDR, QEMU_CAPS_MIGRATE_KVM_STDIO, /* avoid kvm tcp migration bug */ @@ -74,7 +74,7 @@ typedef enum { QEMU_CAPS_DRIVE_SERIAL, /* -driver serial= available */ /* 20 */ - QEMU_CAPS_XEN_DOMID, /* -xen-domid */ + X_QEMU_CAPS_XEN_DOMID, /* -xen-domid */ QEMU_CAPS_MIGRATE_QEMU_UNIX, /* qemu migration via unix sockets */ QEMU_CAPS_CHARDEV, /* Is the new -chardev arg available */ QEMU_CAPS_ENABLE_KVM, /* -enable-kvm flag */ diff --git a/src/qemu/qemu_command.c b/src/qemu/qemu_command.c index 9fa3f61566..c9c86abe28 100644 --- a/src/qemu/qemu_command.c +++ b/src/qemu/qemu_command.c @@ -9464,16 +9464,10 @@ qemuBuildCommandLine(virConnectPtr conn, if (def->virtType == VIR_DOMAIN_VIRT_XEN || def->os.type == VIR_DOMAIN_OSTYPE_XEN || def->os.type == VIR_DOMAIN_OSTYPE_LINUX) { - if (virQEMUCapsGet(qemuCaps, QEMU_CAPS_XEN_DOMID)) { - virCommandAddArg(cmd, "-xen-attach"); - virCommandAddArg(cmd, "-xen-domid"); - virCommandAddArgFormat(cmd, "%d", def->id); - } else { - virReportError(VIR_ERR_INTERNAL_ERROR, - _("qemu emulator '%s' does not support xen"), - def->emulator); - goto error; - } + virReportError(VIR_ERR_INTERNAL_ERROR, + _("qemu emulator '%s' does not support xen"), + def->emulator); + goto error; } if ((def->os.smbios_mode != VIR_DOMAIN_SMBIOS_NONE) && @@ -12916,15 +12910,10 @@ qemuParseCommandLine(virCapsPtr qemuCaps, if (!(path = last_component(def->emulator))) goto error; - if (strstr(path, "xenner")) { + def->os.type = VIR_DOMAIN_OSTYPE_HVM; + if (strstr(path, "kvm")) { def->virtType = VIR_DOMAIN_VIRT_KVM; - def->os.type = VIR_DOMAIN_OSTYPE_XEN; - } else { - def->os.type = VIR_DOMAIN_OSTYPE_HVM; - if (strstr(path, "kvm")) { - def->virtType = VIR_DOMAIN_VIRT_KVM; - def->features[VIR_DOMAIN_FEATURE_PAE] = VIR_TRISTATE_SWITCH_ON; - } + def->features[VIR_DOMAIN_FEATURE_PAE] = VIR_TRISTATE_SWITCH_ON; } if (def->virtType == VIR_DOMAIN_VIRT_KVM) diff --git a/tests/qemuargv2xmltest.c b/tests/qemuargv2xmltest.c index 96453e55f1..c436258558 100644 --- a/tests/qemuargv2xmltest.c +++ b/tests/qemuargv2xmltest.c @@ -179,9 +179,6 @@ mymain(void) /* This needs ./qemu.sh which doesn't work here. */ /*DO_TEST("cpu-kvmclock");*/ - /* Can't roundtrip xenner arch */ - /*DO_TEST("bootloader");*/ - DO_TEST("reboot-timeout-enabled"); DO_TEST("reboot-timeout-disabled"); @@ -238,8 +235,6 @@ mymain(void) DO_TEST("nographics-vga"); DO_TEST("input-usbmouse"); DO_TEST("input-usbtablet"); - /* Can't rountrip xenner arch */ - /*DO_TEST("input-xen");*/ DO_TEST("misc-acpi"); DO_TEST("misc-disable-s3"); DO_TEST("misc-disable-suspends"); diff --git a/tests/qemuhelptest.c b/tests/qemuhelptest.c index e5b7b7c3f0..414c87460e 100644 --- a/tests/qemuhelptest.c +++ b/tests/qemuhelptest.c @@ -162,7 +162,6 @@ mymain(void) QEMU_CAPS_0_10, QEMU_CAPS_ENABLE_KVM, QEMU_CAPS_SDL, - QEMU_CAPS_XEN_DOMID, QEMU_CAPS_MIGRATE_QEMU_UNIX, QEMU_CAPS_CHARDEV, QEMU_CAPS_BALLOON, @@ -288,7 +287,6 @@ mymain(void) QEMU_CAPS_KVM, QEMU_CAPS_DRIVE_FORMAT, QEMU_CAPS_DRIVE_SERIAL, - QEMU_CAPS_XEN_DOMID, QEMU_CAPS_DRIVE_READONLY, QEMU_CAPS_VGA, QEMU_CAPS_0_10, @@ -493,7 +491,6 @@ mymain(void) QEMU_CAPS_DRIVE_CACHE_UNSAFE, QEMU_CAPS_DRIVE_FORMAT, QEMU_CAPS_DRIVE_SERIAL, - QEMU_CAPS_XEN_DOMID, QEMU_CAPS_DRIVE_READONLY, QEMU_CAPS_VGA, QEMU_CAPS_0_10, @@ -581,7 +578,6 @@ mymain(void) QEMU_CAPS_DRIVE_CACHE_UNSAFE, QEMU_CAPS_DRIVE_FORMAT, QEMU_CAPS_DRIVE_SERIAL, - QEMU_CAPS_XEN_DOMID, QEMU_CAPS_DRIVE_READONLY, QEMU_CAPS_VGA, QEMU_CAPS_0_10, diff --git a/tests/qemuxml2argvdata/qemuxml2argv-machine-xen-vmport-opt.xml b/tests/qemuxml2argvdata/qemuxml2argv-machine-xen-vmport-opt.xml deleted file mode 100644 index 4466d1a367..0000000000 --- a/tests/qemuxml2argvdata/qemuxml2argv-machine-xen-vmport-opt.xml +++ /dev/null @@ -1,27 +0,0 @@ - - XenGuest2 - c7a5fdb2-cdaf-9455-926a-d65c16db1809 - 592896 - 403456 - 1 - - hvm - /usr/lib/xen/boot/hvmloader - - - - - - - - - - - - destroy - restart - restart - - /usr/lib/xen/bin/qemu-dm - - diff --git a/tests/qemuxml2argvtest.c b/tests/qemuxml2argvtest.c index 3d7bca8e78..6970b7495d 100644 --- a/tests/qemuxml2argvtest.c +++ b/tests/qemuxml2argvtest.c @@ -600,8 +600,6 @@ mymain(void) QEMU_CAPS_MACHINE_USB_OPT); DO_TEST("machine-vmport-opt", QEMU_CAPS_MACHINE_OPT, QEMU_CAPS_MACHINE_VMPORT_OPT); - DO_TEST_FAILURE("machine-xen-vmport-opt", QEMU_CAPS_MACHINE_OPT, - QEMU_CAPS_MACHINE_VMPORT_OPT); DO_TEST("kvm", QEMU_CAPS_MACHINE_OPT); DO_TEST("default-kvm-host-arch", QEMU_CAPS_MACHINE_OPT); DO_TEST("default-qemu-host-arch", QEMU_CAPS_MACHINE_OPT); diff --git a/tests/testutilsqemu.c b/tests/testutilsqemu.c index 2f2be125e1..8a4f567b0b 100644 --- a/tests/testutilsqemu.c +++ b/tests/testutilsqemu.c @@ -315,9 +315,6 @@ virCapsPtr testQemuCapsInit(void) virCapsGuestPtr guest; virCapsGuestMachinePtr *machines = NULL; int nmachines = 0; - static const char *const xen_machines[] = { - "xenner" - }; if (!(caps = virCapabilitiesNew(VIR_ARCH_X86_64, false, false))) return NULL; @@ -400,16 +397,6 @@ virCapsPtr testQemuCapsInit(void) goto cleanup; machines = NULL; - nmachines = ARRAY_CARDINALITY(xen_machines); - if ((machines = virCapabilitiesAllocMachines(xen_machines, nmachines)) == NULL) - goto cleanup; - - if ((guest = virCapabilitiesAddGuest(caps, VIR_DOMAIN_OSTYPE_XEN, VIR_ARCH_X86_64, - "/usr/bin/xenner", NULL, - nmachines, machines)) == NULL) - goto cleanup; - machines = NULL; - if (virCapabilitiesAddGuestDomain(guest, VIR_DOMAIN_VIRT_KVM, "/usr/bin/kvm",