# HG changeset patch
# User Keir Fraser <keir.fraser@xxxxxxxxxx>
# Date 1258026122 0
# Node ID 687297d1e90b5cb76fc2c4192a26b46e97eaa25d
# Parent b7181e5d466611dca5aa37eaf7efe63a05ab605b
A few trivial cleanups
Alphabetize object files and guest config options for better
readability. Also remove svm interrupt prototypes which do not
exist.
Signed-off-by: Christoph Egger <Christoph.Egger@xxxxxxx>
---
tools/python/xen/xm/create.py | 30 +++++++++++++++++++++---------
xen/arch/x86/hvm/Makefile | 16 ++++++++--------
xen/include/asm-x86/hvm/svm/intr.h | 5 +----
3 files changed, 30 insertions(+), 21 deletions(-)
diff -r b7181e5d4666 -r 687297d1e90b tools/python/xen/xm/create.py
--- a/tools/python/xen/xm/create.py Thu Nov 12 11:40:44 2009 +0000
+++ b/tools/python/xen/xm/create.py Thu Nov 12 11:42:02 2009 +0000
@@ -994,15 +994,27 @@ def configure_hvm(config_image, vals):
def configure_hvm(config_image, vals):
"""Create the config for HVM devices.
"""
- args = [ 'device_model', 'pae', 'vcpus', 'boot', 'fda', 'fdb',
'timer_mode',
- 'localtime', 'serial', 'stdvga', 'isa', 'nographic', 'soundhw',
- 'vnc', 'vncdisplay', 'vncunused', 'vncconsole', 'vnclisten',
- 'sdl', 'display', 'xauthority', 'rtc_timeoffset', 'monitor',
- 'acpi', 'apic', 'usb', 'usbdevice', 'keymap', 'pci', 'hpet',
- 'guest_os_type', 'hap', 'oos', 'opengl', 'cpuid', 'cpuid_check',
- 'viridian', 'xen_extended_power_mgmt', 'pci_msitranslate',
- 'vpt_align', 'pci_power_mgmt', 'xen_platform_pci',
- 'gfx_passthru', 'description' ]
+ args = [ 'acpi', 'apic',
+ 'boot',
+ 'cpuid', 'cpuid_check',
+ 'description', 'device_model', 'display',
+ 'fda', 'fdb',
+ 'gfx_passthru', 'guest_os_type',
+ 'hap', 'hpet',
+ 'isa',
+ 'keymap',
+ 'localtime',
+ 'monitor',
+ 'nographic',
+ 'opengl', 'oos',
+ 'pae', 'pci', 'pci_msitranslate', 'pci_power_mgmt',
+ 'rtc_timeoffset',
+ 'sdl', 'serial', 'soundhw', 'stdvga',
+ 'timer_mode',
+ 'usb', 'usbdevice',
+ 'vcpus', 'vnc', 'vncconsole', 'vncdisplay', 'vnclisten',
+ 'vncunused', 'viridian', 'vpt_align',
+ 'xauthority', 'xen_extended_power_mgmt', 'xen_platform_pci' ]
for a in args:
if a in vals.__dict__ and vals.__dict__[a] is not None:
diff -r b7181e5d4666 -r 687297d1e90b xen/arch/x86/hvm/Makefile
--- a/xen/arch/x86/hvm/Makefile Thu Nov 12 11:40:44 2009 +0000
+++ b/xen/arch/x86/hvm/Makefile Thu Nov 12 11:42:02 2009 +0000
@@ -2,6 +2,7 @@ subdir-y += vmx
subdir-y += vmx
obj-y += emulate.o
+obj-y += hpet.o
obj-y += hvm.o
obj-y += i8254.o
obj-y += intercept.o
@@ -11,12 +12,11 @@ obj-y += pmtimer.o
obj-y += pmtimer.o
obj-y += quirks.o
obj-y += rtc.o
-obj-y += hpet.o
+obj-y += save.o
+obj-y += stdvga.o
+obj-y += vioapic.o
+obj-y += viridian.o
+obj-y += vlapic.o
+obj-y += vmsi.o
+obj-y += vpic.o
obj-y += vpt.o
-obj-y += vioapic.o
-obj-y += vlapic.o
-obj-y += vpic.o
-obj-y += save.o
-obj-y += vmsi.o
-obj-y += stdvga.o
-obj-y += viridian.o
diff -r b7181e5d4666 -r 687297d1e90b xen/include/asm-x86/hvm/svm/intr.h
--- a/xen/include/asm-x86/hvm/svm/intr.h Thu Nov 12 11:40:44 2009 +0000
+++ b/xen/include/asm-x86/hvm/svm/intr.h Thu Nov 12 11:42:02 2009 +0000
@@ -21,9 +21,6 @@
#ifndef __ASM_X86_HVM_SVM_INTR_H__
#define __ASM_X86_HVM_SVM_INTR_H__
-extern void svm_intr_assist(void);
-extern void svm_intr_assist_update(struct vcpu *v, int highest_vector);
-extern void svm_intr_assist_test_valid(struct vcpu *v,
- unsigned long *intr_result);
+void svm_intr_assist(void);
#endif /* __ASM_X86_HVM_SVM_INTR_H__ */
_______________________________________________
Xen-changelog mailing list
Xen-changelog@xxxxxxxxxxxxxxxxxxx
http://lists.xensource.com/xen-changelog
|
Home