mirror of
https://gitlab.com/libvirt/libvirt.git
synced 2024-08-26 18:41:17 +00:00
* src/xen_internal.c: add report of ACPI/APIC for Xen fully virt,
patch from David Lutterkort * tests/xencapsdata/xen-i686-pae-hvm.xml tests/xencapsdata/xen-ia64-be-hvm.xml tests/xencapsdata/xen-ia64-hvm.xml tests/xencapsdata/xen-x86_64-hvm.xml: this also affects a few tests Daniel
This commit is contained in:
parent
c7722ca345
commit
86d352d4fe
11
ChangeLog
11
ChangeLog
@ -1,7 +1,16 @@
|
||||
Mon Jul 30 12:15:43 CEST 2007 Daniel Veillard <veillard@redhat.com>
|
||||
|
||||
* src/xen_internal.c: add report of ACPI/APIC for Xen fully virt,
|
||||
patch from David Lutterkort
|
||||
* tests/xencapsdata/xen-i686-pae-hvm.xml
|
||||
tests/xencapsdata/xen-ia64-be-hvm.xml
|
||||
tests/xencapsdata/xen-ia64-hvm.xml
|
||||
tests/xencapsdata/xen-x86_64-hvm.xml: this also affects a few tests
|
||||
|
||||
Mon Jul 30 11:59:51 CEST 2007 Daniel Veillard <veillard@redhat.com>
|
||||
|
||||
* src/qemu_conf.[ch] src/qemu_driver.c: add qemu/kvm drivers report
|
||||
features for i686 and x86_64, patch from David Lutterkort
|
||||
ACPI/APIC features for i686 and x86_64, patch from David Lutterkort
|
||||
|
||||
Fri Jul 27 19:19:31 EST 2007 Daniel P. Berrange <berrange@redhat.com>
|
||||
|
||||
|
@ -2050,6 +2050,9 @@ xenHypervisorMakeCapabilitiesXML(virConnectPtr conn ATTRIBUTE_UNUSED,
|
||||
virBufferPtr xml;
|
||||
char *xml_str;
|
||||
|
||||
int hv_major = hv_version >> 16;
|
||||
int hv_minor = hv_version & 0xFFFF;
|
||||
|
||||
memset(guest_archs, 0, sizeof(guest_archs));
|
||||
|
||||
/* /proc/cpuinfo: flags: Intel calls HVM "vmx", AMD calls it "svm".
|
||||
@ -2236,19 +2239,28 @@ xenHypervisorMakeCapabilitiesXML(virConnectPtr conn ATTRIBUTE_UNUSED,
|
||||
if (r == -1) goto vir_buffer_failed;
|
||||
}
|
||||
if (guest_archs[i].nonpae) {
|
||||
r = virBufferAdd (xml,
|
||||
"\
|
||||
<nonpae/>\n", -1);
|
||||
r = virBufferAdd (xml, " <nonpae/>\n", -1);
|
||||
if (r == -1) goto vir_buffer_failed;
|
||||
}
|
||||
if (guest_archs[i].ia64_be) {
|
||||
r = virBufferAdd (xml,
|
||||
"\
|
||||
<ia64_be/>\n", -1);
|
||||
r = virBufferAdd (xml, " <ia64_be/>\n", -1);
|
||||
if (r == -1) goto vir_buffer_failed;
|
||||
}
|
||||
if (guest_archs[i].hvm) {
|
||||
r = virBufferAdd (xml, " <acpi default='on' toggle='yes'/>\n",
|
||||
-1);
|
||||
if (r == -1) goto vir_buffer_failed;
|
||||
// In Xen 3.1.0, APIC is always on and can't be toggled
|
||||
if (hv_major >= 3 && hv_minor > 0) {
|
||||
r = virBufferAdd (xml,
|
||||
"\
|
||||
" <apic default='off' toggle='no'/>\n", -1);
|
||||
} else {
|
||||
r = virBufferAdd (xml,
|
||||
" <apic default='on' toggle='yes'/>\n", -1);
|
||||
}
|
||||
if (r == -1) goto vir_buffer_failed;
|
||||
}
|
||||
r = virBufferAdd (xml, "\
|
||||
</features>\n\
|
||||
</guest>\n", -1);
|
||||
if (r == -1) goto vir_buffer_failed;
|
||||
|
@ -32,6 +32,8 @@
|
||||
<features>
|
||||
<pae/>
|
||||
<nonpae/>
|
||||
<acpi default='on' toggle='yes'/>
|
||||
<apic default='on' toggle='yes'/>
|
||||
</features>
|
||||
</guest>
|
||||
</capabilities>
|
||||
|
@ -30,6 +30,8 @@
|
||||
</arch>
|
||||
<features>
|
||||
<ia64_be/>
|
||||
<acpi default='on' toggle='yes'/>
|
||||
<apic default='on' toggle='yes'/>
|
||||
</features>
|
||||
</guest>
|
||||
</capabilities>
|
||||
|
@ -28,6 +28,8 @@
|
||||
<loader>/usr/lib/xen/boot/hvmloader</loader>
|
||||
</arch>
|
||||
<features>
|
||||
<acpi default='on' toggle='yes'/>
|
||||
<apic default='on' toggle='yes'/>
|
||||
</features>
|
||||
</guest>
|
||||
</capabilities>
|
||||
|
@ -31,6 +31,8 @@
|
||||
<features>
|
||||
<pae/>
|
||||
<nonpae/>
|
||||
<acpi default='on' toggle='yes'/>
|
||||
<apic default='on' toggle='yes'/>
|
||||
</features>
|
||||
</guest>
|
||||
|
||||
@ -45,6 +47,8 @@
|
||||
<loader>/usr/lib/xen/boot/hvmloader</loader>
|
||||
</arch>
|
||||
<features>
|
||||
<acpi default='on' toggle='yes'/>
|
||||
<apic default='on' toggle='yes'/>
|
||||
</features>
|
||||
</guest>
|
||||
</capabilities>
|
||||
|
Loading…
Reference in New Issue
Block a user