rpms/kernel-xen-2.6/devel kernel-xen.spec, 1.7, 1.8 linux-2.6-xen.patch, 1.1, 1.2

fedora-cvs-commits at redhat.com fedora-cvs-commits at redhat.com
Fri Jan 26 12:07:02 UTC 2007


Author: armbru

Update of /cvs/dist/rpms/kernel-xen-2.6/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv22051

Modified Files:
	kernel-xen.spec linux-2.6-xen.patch 
Log Message:
- Revert upstream xen-unstable chnageset 12680, because that breaks
  with console=tty console=xvc.
- Change default domU console back to /dev/xcv0.


Index: kernel-xen.spec
===================================================================
RCS file: /cvs/dist/rpms/kernel-xen-2.6/devel/kernel-xen.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- kernel-xen.spec	25 Jan 2007 02:21:19 -0000	1.7
+++ kernel-xen.spec	26 Jan 2007 12:06:59 -0000	1.8
@@ -2053,6 +2053,11 @@
 %endif
 
 %changelog
+* Fri Jan 26 2007 Markus Armbruster <armbru at redhat.com>
+- Revert upstream xen-unstable chnageset 12680, because that breaks
+  with console=tty console=xvc.
+- Change default domU console back to /dev/xcv0.
+
 * Wed Jan 24 2007 Jeremy Katz <katzj at redhat.com>
 - don't build this for ppc either
 

linux-2.6-xen.patch:
 arch/i386/Kconfig                                   |   85 
 arch/i386/Kconfig.cpu                               |    4 
 arch/i386/Kconfig.debug                             |    1 
 arch/i386/Makefile                                  |   24 
 arch/i386/boot-xen/Makefile                         |   21 
 arch/i386/kernel/Makefile                           |   21 
 arch/i386/kernel/acpi/Makefile                      |    4 
 arch/i386/kernel/acpi/boot-xen.c                    | 1332 ++++++++
 arch/i386/kernel/alternative.c                      |   11 
 arch/i386/kernel/apic-xen.c                         |  223 +
 arch/i386/kernel/asm-offsets.c                      |    7 
 arch/i386/kernel/cpu/Makefile                       |    5 
 arch/i386/kernel/cpu/common-xen.c                   |  747 +++++
 arch/i386/kernel/cpu/mtrr/Makefile                  |    7 
 arch/i386/kernel/cpu/mtrr/main-xen.c                |  198 +
 arch/i386/kernel/crash.c                            |    4 
 arch/i386/kernel/early_printk-xen.c                 |    2 
 arch/i386/kernel/entry-xen.S                        | 1254 ++++++++
 arch/i386/kernel/entry.S                            |    6 
 arch/i386/kernel/fixup.c                            |   95 
 arch/i386/kernel/head-xen.S                         |  201 +
 arch/i386/kernel/init_task-xen.c                    |   51 
 arch/i386/kernel/io_apic-xen.c                      | 2965 ++++++++++++++++++++
 arch/i386/kernel/ioport-xen.c                       |  121 
 arch/i386/kernel/irq-xen.c                          |  328 ++
 arch/i386/kernel/ldt-xen.c                          |  270 +
 arch/i386/kernel/machine_kexec.c                    |   40 
 arch/i386/kernel/microcode-xen.c                    |  141 
 arch/i386/kernel/mpparse-xen.c                      | 1157 +++++++
 arch/i386/kernel/pci-dma-xen.c                      |  377 ++
 arch/i386/kernel/process-xen.c                      |  852 +++++
 arch/i386/kernel/quirks-xen.c                       |   47 
 arch/i386/kernel/setup-xen.c                        | 1747 +++++++++++
 arch/i386/kernel/smp-xen.c                          |  635 ++++
 arch/i386/kernel/swiotlb.c                          |  683 ++++
 arch/i386/kernel/sysenter.c                         |   22 
 arch/i386/kernel/time-xen.c                         | 1121 +++++++
 arch/i386/kernel/traps-xen.c                        | 1248 ++++++++
 arch/i386/kernel/traps.c                            |    9 
 arch/i386/kernel/tsc.c                              |    2 
 arch/i386/kernel/vm86.c                             |   12 
 arch/i386/kernel/vsyscall-note-xen.S                |   32 
 arch/i386/lib/delay.c                               |    3 
 arch/i386/mach-xen/Makefile                         |    5 
 arch/i386/mach-xen/irqflags.c                       |   99 
 arch/i386/mach-xen/setup.c                          |  169 +
 arch/i386/mm/Makefile                               |    8 
 arch/i386/mm/fault-xen.c                            |  756 +++++
 arch/i386/mm/highmem-xen.c                          |  121 
 arch/i386/mm/hypervisor.c                           |  449 +++
 arch/i386/mm/init-xen.c                             |  879 +++++
 arch/i386/mm/ioremap-xen.c                          |  443 ++
 arch/i386/mm/pageattr.c                             |    2 
 arch/i386/mm/pgtable-xen.c                          |  728 ++++
 arch/i386/oprofile/Makefile                         |    7 
 arch/i386/oprofile/xenoprof.c                       |  179 +
 arch/i386/pci/Makefile                              |    9 
 arch/i386/pci/irq-xen.c                             | 1167 +++++++
 arch/i386/pci/pcifront.c                            |   55 
 arch/i386/power/Makefile                            |    4 
 arch/ia64/Kconfig                                   |   72 
 arch/ia64/Makefile                                  |   16 
 arch/ia64/dig/setup.c                               |   17 
 arch/ia64/hp/sim/Makefile                           |    2 
 arch/ia64/kernel/asm-offsets.c                      |   24 
 arch/ia64/kernel/entry.S                            |   36 
 arch/ia64/kernel/gate.S                             |  116 
 arch/ia64/kernel/gate.lds.S                         |   22 
 arch/ia64/kernel/head.S                             |    6 
 arch/ia64/kernel/iosapic.c                          |   75 
 arch/ia64/kernel/irq_ia64.c                         |  328 ++
 arch/ia64/kernel/pal.S                              |    3 
 arch/ia64/kernel/patch.c                            |   71 
 arch/ia64/kernel/perfmon.c                          |   89 
 arch/ia64/kernel/setup.c                            |  130 
 arch/ia64/mm/ioremap.c                              |    3 
 arch/ia64/oprofile/Makefile                         |    4 
 arch/ia64/oprofile/init.c                           |   14 
 arch/ia64/oprofile/oprofile_perfmon.h               |   30 
 arch/ia64/oprofile/perfmon.c                        |   35 
 arch/ia64/oprofile/xenoprof.c                       |  142 
 arch/ia64/xen/Makefile                              |    9 
 arch/ia64/xen/drivers/README                        |    2 
 arch/ia64/xen/hypercall.S                           |  411 ++
 arch/ia64/xen/hypervisor.c                          | 1104 +++++++
 arch/ia64/xen/mem.c                                 |   76 
 arch/ia64/xen/util.c                                |  117 
 arch/ia64/xen/xcom_hcall.c                          |  365 ++
 arch/ia64/xen/xcom_mini.c                           |  417 ++
 arch/ia64/xen/xcom_privcmd.c                        |  663 ++++
 arch/ia64/xen/xencomm.c                             |  263 +
 arch/ia64/xen/xenentry.S                            |  908 ++++++
 arch/ia64/xen/xenhpski.c                            |   19 
 arch/ia64/xen/xenivt.S                              | 2178 ++++++++++++++
 arch/ia64/xen/xenminstate.h                         |  368 ++
 arch/ia64/xen/xenpal.S                              |   76 
 arch/ia64/xen/xensetup.S                            |   53 
 arch/um/kernel/physmem.c                            |    4 
 arch/x86_64/Kconfig                                 |   62 
 arch/x86_64/Makefile                                |   20 
 arch/x86_64/ia32/Makefile                           |   20 
 arch/x86_64/ia32/ia32entry-xen.S                    |  743 +++++
 arch/x86_64/ia32/syscall32-xen.c                    |  128 
 arch/x86_64/ia32/syscall32_syscall-xen.S            |   28 
 arch/x86_64/ia32/vsyscall-int80.S                   |   58 
 arch/x86_64/ia32/vsyscall-sigreturn.S               |    2 
 arch/x86_64/kernel/Makefile                         |   20 
 arch/x86_64/kernel/acpi/Makefile                    |    1 
 arch/x86_64/kernel/apic-xen.c                       |  254 +
 arch/x86_64/kernel/asm-offsets.c                    |    2 
 arch/x86_64/kernel/crash.c                          |    6 
 arch/x86_64/kernel/e820-xen.c                       |  763 +++++
 arch/x86_64/kernel/early_printk-xen.c               |  299 ++
 arch/x86_64/kernel/entry-xen.S                      | 1217 ++++++++
 arch/x86_64/kernel/genapic-xen.c                    |  143 
 arch/x86_64/kernel/genapic_xen.c                    |  190 +
 arch/x86_64/kernel/head-xen.S                       |  189 +
 arch/x86_64/kernel/head64-xen.c                     |  119 
 arch/x86_64/kernel/init_task.c                      |    3 
 arch/x86_64/kernel/io_apic-xen.c                    | 2182 ++++++++++++++
 arch/x86_64/kernel/ioport-xen.c                     |   99 
 arch/x86_64/kernel/irq.c                            |    4 
 arch/x86_64/kernel/irqflags-xen.c                   |  100 
 arch/x86_64/kernel/ldt-xen.c                        |  283 +
 arch/x86_64/kernel/machine_kexec.c                  |  119 
 arch/x86_64/kernel/mpparse-xen.c                    |  850 +++++
 arch/x86_64/kernel/pci-swiotlb-xen.c                |   55 
 arch/x86_64/kernel/process-xen.c                    |  859 +++++
 arch/x86_64/kernel/setup-xen.c                      | 1481 +++++++++
 arch/x86_64/kernel/setup64-xen.c                    |  356 ++
 arch/x86_64/kernel/smp-xen.c                        |  571 +++
 arch/x86_64/kernel/traps-xen.c                      | 1245 ++++++++
 arch/x86_64/kernel/vmlinux.lds.S                    |    2 
 arch/x86_64/kernel/vsyscall-xen.c                   |  329 ++
 arch/x86_64/kernel/xen_entry.S                      |   40 
 arch/x86_64/mm/Makefile                             |   10 
 arch/x86_64/mm/fault-xen.c                          |  717 ++++
 arch/x86_64/mm/init-xen.c                           | 1182 +++++++
 arch/x86_64/mm/pageattr-xen.c                       |  396 ++
 arch/x86_64/oprofile/Makefile                       |   10 
 arch/x86_64/pci/Makefile                            |   12 
 drivers/Makefile                                    |    1 
 drivers/acpi/Kconfig                                |    3 
 drivers/char/hangcheck-timer.c                      |    2 
 drivers/char/mem.c                                  |    6 
 drivers/char/tpm/Kconfig                            |   12 
 drivers/char/tpm/Makefile                           |    2 
 drivers/char/tpm/tpm.c                              |   55 
 drivers/char/tpm/tpm.h                              |    7 
 drivers/char/tpm/tpm_vtpm.c                         |  547 +++
 drivers/char/tpm/tpm_vtpm.h                         |   68 
 drivers/char/tpm/tpm_xen.c                          |  760 +++++
 drivers/firmware/Kconfig                            |    2 
 drivers/ide/ide-lib.c                               |    8 
 drivers/oprofile/buffer_sync.c                      |   66 
 drivers/oprofile/cpu_buffer.c                       |   51 
 drivers/oprofile/cpu_buffer.h                       |    9 
 drivers/oprofile/event_buffer.h                     |    7 
 drivers/oprofile/oprof.c                            |   32 
 drivers/oprofile/oprof.h                            |    3 
 drivers/oprofile/oprofile_files.c                   |  207 +
 drivers/pci/Kconfig                                 |    3 
 drivers/serial/Kconfig                              |    1 
 drivers/xen/Kconfig                                 |  283 +
 drivers/xen/Makefile                                |   19 
 drivers/xen/balloon/Makefile                        |    2 
 drivers/xen/balloon/balloon.c                       |  624 ++++
 drivers/xen/balloon/common.h                        |   58 
 drivers/xen/balloon/sysfs.c                         |  164 +
 drivers/xen/blkback/Makefile                        |    3 
 drivers/xen/blkback/blkback.c                       |  581 +++
 drivers/xen/blkback/common.h                        |  138 
 drivers/xen/blkback/interface.c                     |  171 +
 drivers/xen/blkback/vbd.c                           |  118 
 drivers/xen/blkback/xenbus.c                        |  485 +++
 drivers/xen/blkfront/Kconfig                        |    6 
 drivers/xen/blkfront/Makefile                       |    5 
 drivers/xen/blkfront/blkfront.c                     |  891 ++++++
 drivers/xen/blkfront/block.h                        |  156 +
 drivers/xen/blkfront/vbd.c                          |  375 ++
 drivers/xen/blktap/Makefile                         |    6 
 drivers/xen/blktap/blktap.c                         | 1517 ++++++++++
 drivers/xen/blktap/blktapmain.c                     | 1507 ++++++++++
 drivers/xen/blktap/common.h                         |  120 
 drivers/xen/blktap/interface.c                      |  164 +
 drivers/xen/blktap/xenbus.c                         |  366 ++
 drivers/xen/char/Makefile                           |    2 
 drivers/xen/char/mem.c                              |  203 +
 drivers/xen/console/Makefile                        |    2 
 drivers/xen/console/console.c                       |  715 ++++
 drivers/xen/console/xencons_ring.c                  |  143 
 drivers/xen/core/Makefile                           |   14 
 drivers/xen/core/cpu_hotplug.c                      |  188 +
 drivers/xen/core/evtchn.c                           |  861 +++++
 drivers/xen/core/features.c                         |   34 
 drivers/xen/core/gnttab.c                           |  487 +++
 drivers/xen/core/hypervisor_sysfs.c                 |   59 
 drivers/xen/core/machine_kexec.c                    |  190 +
 drivers/xen/core/machine_reboot.c                   |  185 +
 drivers/xen/core/reboot.c                           |  221 +
 drivers/xen/core/skbuff.c                           |  144 
 drivers/xen/core/smpboot.c                          |  461 +++
 drivers/xen/core/xen_proc.c                         |   18 
 drivers/xen/core/xen_sysfs.c                        |  378 ++
 drivers/xen/evtchn/Makefile                         |    2 
 drivers/xen/evtchn/evtchn.c                         |  456 +++
 drivers/xen/fbfront/Makefile                        |    2 
 drivers/xen/fbfront/xenfb.c                         |  750 +++++
 drivers/xen/fbfront/xenkbd.c                        |  300 ++
 drivers/xen/netback/Makefile                        |    5 
 drivers/xen/netback/common.h                        |  146 
 drivers/xen/netback/interface.c                     |  349 ++
 drivers/xen/netback/loopback.c                      |  320 ++
 drivers/xen/netback/netback.c                       | 1524 ++++++++++
 drivers/xen/netback/xenbus.c                        |  450 +++
 drivers/xen/netfront/Kconfig                        |    6 
 drivers/xen/netfront/Makefile                       |    4 
 drivers/xen/netfront/netfront.c                     | 2114 ++++++++++++++
 drivers/xen/pciback/Makefile                        |   15 
 drivers/xen/pciback/conf_space.c                    |  425 ++
 drivers/xen/pciback/conf_space.h                    |  126 
 drivers/xen/pciback/conf_space_capability.c         |   71 
 drivers/xen/pciback/conf_space_capability.h         |   23 
 drivers/xen/pciback/conf_space_capability_pm.c      |  113 
 drivers/xen/pciback/conf_space_capability_vpd.c     |   42 
 drivers/xen/pciback/conf_space_header.c             |  299 ++
 drivers/xen/pciback/conf_space_quirks.c             |  128 
 drivers/xen/pciback/conf_space_quirks.h             |   35 
 drivers/xen/pciback/passthrough.c                   |  157 +
 drivers/xen/pciback/pci_stub.c                      |  916 ++++++
 drivers/xen/pciback/pciback.h                       |   93 
 drivers/xen/pciback/pciback_ops.c                   |   95 
 drivers/xen/pciback/slot.c                          |  151 +
 drivers/xen/pciback/vpci.c                          |  204 +
 drivers/xen/pciback/xenbus.c                        |  458 +++
 drivers/xen/pcifront/Makefile                       |    7 
 drivers/xen/pcifront/pci.c                          |   46 
 drivers/xen/pcifront/pci_op.c                       |  273 +
 drivers/xen/pcifront/pcifront.h                     |   40 
 drivers/xen/pcifront/xenbus.c                       |  295 +
 drivers/xen/privcmd/Makefile                        |    2 
 drivers/xen/privcmd/privcmd.c                       |  285 +
 drivers/xen/tpmback/Makefile                        |    4 
 drivers/xen/tpmback/common.h                        |   86 
 drivers/xen/tpmback/interface.c                     |  182 +
 drivers/xen/tpmback/tpmback.c                       |  944 ++++++
 drivers/xen/tpmback/xenbus.c                        |  289 +
 drivers/xen/util.c                                  |   70 
 drivers/xen/xenbus/Makefile                         |    9 
 drivers/xen/xenbus/xenbus_backend_client.c          |  147 
 drivers/xen/xenbus/xenbus_client.c                  |  305 ++
 drivers/xen/xenbus/xenbus_comms.c                   |  210 +
 drivers/xen/xenbus/xenbus_comms.h                   |   44 
 drivers/xen/xenbus/xenbus_dev.c                     |  361 ++
 drivers/xen/xenbus/xenbus_probe.c                   | 1017 ++++++
 drivers/xen/xenbus/xenbus_probe.h                   |   73 
 drivers/xen/xenbus/xenbus_probe_backend.c           |  271 +
 drivers/xen/xenbus/xenbus_xs.c                      |  859 +++++
 drivers/xen/xenoprof/xenoprofile.c                  |  500 +++
 fs/Kconfig                                          |    1 
 include/asm-i386/apic.h                             |    2 
 include/asm-i386/kexec.h                            |   14 
 include/asm-i386/mach-default/mach_traps.h          |   12 
 include/asm-i386/mach-xen/asm/agp.h                 |   37 
 include/asm-i386/mach-xen/asm/desc.h                |  203 +
 include/asm-i386/mach-xen/asm/dma-mapping.h         |  151 +
 include/asm-i386/mach-xen/asm/fixmap.h              |  160 +
 include/asm-i386/mach-xen/asm/floppy.h              |  147 
 include/asm-i386/mach-xen/asm/highmem.h             |   80 
 include/asm-i386/mach-xen/asm/hypercall.h           |  407 ++
 include/asm-i386/mach-xen/asm/hypervisor.h          |  245 +
 include/asm-i386/mach-xen/asm/io.h                  |  363 ++
 include/asm-i386/mach-xen/asm/irqflags.h            |   81 
 include/asm-i386/mach-xen/asm/kmap_types.h          |   31 
 include/asm-i386/mach-xen/asm/maddr.h               |  176 +
 include/asm-i386/mach-xen/asm/mmu.h                 |   29 
 include/asm-i386/mach-xen/asm/mmu_context.h         |  108 
 include/asm-i386/mach-xen/asm/page.h                |  231 +
 include/asm-i386/mach-xen/asm/pci.h                 |  153 +
 include/asm-i386/mach-xen/asm/pgalloc.h             |   63 
 include/asm-i386/mach-xen/asm/pgtable-2level.h      |   78 
 include/asm-i386/mach-xen/asm/pgtable-3level-defs.h |   24 
 include/asm-i386/mach-xen/asm/pgtable-3level.h      |  195 +
 include/asm-i386/mach-xen/asm/pgtable.h             |  551 +++
 include/asm-i386/mach-xen/asm/processor.h           |  737 ++++
 include/asm-i386/mach-xen/asm/scatterlist.h         |   22 
 include/asm-i386/mach-xen/asm/segment.h             |  132 
 include/asm-i386/mach-xen/asm/setup.h               |   81 
 include/asm-i386/mach-xen/asm/smp.h                 |  114 
 include/asm-i386/mach-xen/asm/swiotlb.h             |   43 
 include/asm-i386/mach-xen/asm/synch_bitops.h        |  145 
 include/asm-i386/mach-xen/asm/system.h              |  531 +++
 include/asm-i386/mach-xen/asm/timer.h               |   67 
 include/asm-i386/mach-xen/asm/tlbflush.h            |   99 
 include/asm-i386/mach-xen/asm/vga.h                 |   20 
 include/asm-i386/mach-xen/asm/xenoprof.h            |   48 
 include/asm-i386/mach-xen/irq_vectors.h             |  125 
 include/asm-i386/mach-xen/mach_traps.h              |   33 
 include/asm-i386/mach-xen/setup_arch.h              |    5 
 include/asm-i386/pgtable-2level-defs.h              |    2 
 include/asm-i386/pgtable-3level-defs.h              |    2 
 include/asm-i386/spinlock.h                         |    5 
 include/asm-ia64/agp.h                              |   31 
 include/asm-ia64/dma-mapping.h                      |   98 
 include/asm-ia64/fixmap.h                           |    2 
 include/asm-ia64/gcc_intrin.h                       |   60 
 include/asm-ia64/hw_irq.h                           |   10 
 include/asm-ia64/hypercall.h                        |  463 +++
 include/asm-ia64/hypervisor.h                       |  224 +
 include/asm-ia64/intel_intrin.h                     |   68 
 include/asm-ia64/io.h                               |   56 
 include/asm-ia64/iosapic.h                          |    2 
 include/asm-ia64/irq.h                              |   33 
 include/asm-ia64/machvec_dig.h                      |   15 
 include/asm-ia64/maddr.h                            |  102 
 include/asm-ia64/meminit.h                          |    5 
 include/asm-ia64/page.h                             |   52 
 include/asm-ia64/pal.h                              |    1 
 include/asm-ia64/pgalloc.h                          |    4 
 include/asm-ia64/privop.h                           |   60 
 include/asm-ia64/processor.h                        |    1 
 include/asm-ia64/sal.h                              |   21 
 include/asm-ia64/synch_bitops.h                     |   61 
 include/asm-ia64/system.h                           |    4 
 include/asm-ia64/uaccess.h                          |   20 
 include/asm-ia64/xen/privop.h                       |  303 ++
 include/asm-ia64/xen/xcom_hcall.h                   |   86 
 include/asm-ia64/xen/xencomm.h                      |   60 
 include/asm-ia64/xenoprof.h                         |   48 
 include/asm-um/page.h                               |    2 
 include/asm-x86_64/acpi.h                           |    2 
 include/asm-x86_64/apic.h                           |    2 
 include/asm-x86_64/dwarf2.h                         |    2 
 include/asm-x86_64/ipi.h                            |    5 
 include/asm-x86_64/kexec.h                          |   13 
 include/asm-x86_64/mach-xen/asm/agp.h               |   35 
 include/asm-x86_64/mach-xen/asm/arch_hooks.h        |   27 
 include/asm-x86_64/mach-xen/asm/bootsetup.h         |   40 
 include/asm-x86_64/mach-xen/asm/desc.h              |  263 +
 include/asm-x86_64/mach-xen/asm/dma-mapping.h       |  200 +
 include/asm-x86_64/mach-xen/asm/dmi.h               |   29 
 include/asm-x86_64/mach-xen/asm/e820.h              |   59 
 include/asm-x86_64/mach-xen/asm/fixmap.h            |  108 
 include/asm-x86_64/mach-xen/asm/floppy.h            |  207 +
 include/asm-x86_64/mach-xen/asm/hw_irq.h            |  136 
 include/asm-x86_64/mach-xen/asm/hypercall.h         |  406 ++
 include/asm-x86_64/mach-xen/asm/hypervisor.h        |    2 
 include/asm-x86_64/mach-xen/asm/io.h                |  301 ++
 include/asm-x86_64/mach-xen/asm/irq.h               |   34 
 include/asm-x86_64/mach-xen/asm/irqflags.h          |   65 
 include/asm-x86_64/mach-xen/asm/maddr.h             |  150 +
 include/asm-x86_64/mach-xen/asm/mmu.h               |   38 
 include/asm-x86_64/mach-xen/asm/mmu_context.h       |  135 
 include/asm-x86_64/mach-xen/asm/msr.h               |  410 ++
 include/asm-x86_64/mach-xen/asm/nmi.h               |   96 
 include/asm-x86_64/mach-xen/asm/page.h              |  214 +
 include/asm-x86_64/mach-xen/asm/pci.h               |  173 +
 include/asm-x86_64/mach-xen/asm/pgalloc.h           |  224 +
 include/asm-x86_64/mach-xen/asm/pgtable.h           |  562 +++
 include/asm-x86_64/mach-xen/asm/processor.h         |  499 +++
 include/asm-x86_64/mach-xen/asm/smp.h               |  132 
 include/asm-x86_64/mach-xen/asm/synch_bitops.h      |    2 
 include/asm-x86_64/mach-xen/asm/system.h            |  266 +
 include/asm-x86_64/mach-xen/asm/timer.h             |   67 
 include/asm-x86_64/mach-xen/asm/tlbflush.h          |  120 
 include/asm-x86_64/mach-xen/asm/vga.h               |   20 
 include/asm-x86_64/mach-xen/asm/xenoprof.h          |    1 
 include/asm-x86_64/mach-xen/asm/xor.h               |  328 ++
 include/asm-x86_64/mach-xen/irq_vectors.h           |  123 
 include/asm-x86_64/mach-xen/mach_time.h             |  111 
 include/asm-x86_64/mach-xen/mach_timer.h            |   48 
 include/asm-x86_64/mach-xen/setup_arch_post.h       |   63 
 include/asm-x86_64/mach-xen/setup_arch_pre.h        |    5 
 include/linux/gfp.h                                 |    6 
 include/linux/highmem.h                             |    6 
 include/linux/interrupt.h                           |    6 
 include/linux/kexec.h                               |   13 
 include/linux/mm.h                                  |   10 
 include/linux/oprofile.h                            |   11 
 include/linux/pfn.h                                 |    4 
 include/linux/skbuff.h                              |   15 
 include/xen/balloon.h                               |   57 
 include/xen/cpu_hotplug.h                           |   43 
 include/xen/driver_util.h                           |   15 
 include/xen/evtchn.h                                |  113 
 include/xen/features.h                              |   20 
 include/xen/foreign_page.h                          |   30 
 include/xen/gnttab.h                                |  151 +
 include/xen/hvm.h                                   |   24 
 include/xen/hypervisor_sysfs.h                      |   32 
 include/xen/interface/COPYING                       |   38 
 include/xen/interface/acm.h                         |  205 +
 include/xen/interface/acm_ops.h                     |  120 
 include/xen/interface/arch-ia64.h                   |  500 +++
 include/xen/interface/arch-powerpc.h                |  121 
 include/xen/interface/arch-x86/xen-x86_32.h         |  151 +
 include/xen/interface/arch-x86/xen-x86_64.h         |  208 +
 include/xen/interface/arch-x86/xen.h                |  190 +
 include/xen/interface/arch-x86_32.h                 |   27 
 include/xen/interface/arch-x86_64.h                 |   27 
 include/xen/interface/callback.h                    |   92 
 include/xen/interface/dom0_ops.h                    |  120 
 include/xen/interface/domctl.h                      |  437 ++
 include/xen/interface/elfnote.h                     |  179 +
 include/xen/interface/event_channel.h               |  251 +
 include/xen/interface/features.h                    |   71 
 include/xen/interface/grant_table.h                 |  380 ++
 include/xen/interface/hvm/e820.h                    |   47 
 include/xen/interface/hvm/hvm_info_table.h          |   41 
 include/xen/interface/hvm/hvm_op.h                  |   53 
 include/xen/interface/hvm/ioreq.h                   |   97 
 include/xen/interface/hvm/params.h                  |   36 
 include/xen/interface/hvm/vmx_assist.h              |  116 
 include/xen/interface/io/blkif.h                    |  126 
 include/xen/interface/io/console.h                  |   51 
 include/xen/interface/io/fbif.h                     |  138 
 include/xen/interface/io/kbdif.h                    |  130 
 include/xen/interface/io/netif.h                    |  184 +
 include/xen/interface/io/pciif.h                    |   83 
 include/xen/interface/io/ring.h                     |  299 ++
 include/xen/interface/io/tpmif.h                    |   77 
 include/xen/interface/io/xenbus.h                   |   73 
 include/xen/interface/io/xs_wire.h                  |  116 
 include/xen/interface/kexec.h                       |  137 
 include/xen/interface/memory.h                      |  276 +
 include/xen/interface/nmi.h                         |   78 
 include/xen/interface/physdev.h                     |  169 +
 include/xen/interface/platform.h                    |  143 
 include/xen/interface/sched.h                       |  121 
 include/xen/interface/sysctl.h                      |  169 +
 include/xen/interface/trace.h                       |  102 
 include/xen/interface/vcpu.h                        |  142 
 include/xen/interface/version.h                     |   91 
 include/xen/interface/xen-compat.h                  |   51 
 include/xen/interface/xen.h                         |  597 ++++
 include/xen/interface/xencomm.h                     |   41 
 include/xen/interface/xenoprof.h                    |  130 
 include/xen/pcifront.h                              |   76 
 include/xen/public/evtchn.h                         |   88 
 include/xen/public/privcmd.h                        |   79 
 include/xen/xen_proc.h                              |   12 
 include/xen/xenbus.h                                |  307 ++
 include/xen/xencons.h                               |   17 
 include/xen/xenoprof.h                              |   42 
 kernel/Kconfig.preempt                              |    1 
 kernel/fork.c                                       |    3 
 kernel/irq/manage.c                                 |    1 
 kernel/kexec.c                                      |   48 
 lib/Kconfig.debug                                   |    2 
 lib/Makefile                                        |    1 
 mm/Kconfig                                          |    3 
 mm/highmem.c                                        |   11 
 mm/memory.c                                         |  120 
 mm/mmap.c                                           |    4 
 mm/page_alloc.c                                     |    6 
 net/core/dev.c                                      |   63 
 net/core/skbuff.c                                   |   29 
 net/ipv4/netfilter/ip_nat_proto_tcp.c               |    7 
 net/ipv4/netfilter/ip_nat_proto_udp.c               |    7 
 net/ipv4/xfrm4_output.c                             |    6 
 net/ipv6/addrconf.c                                 |    3 
 scripts/Makefile.xen                                |   14 
 462 files changed, 96315 insertions(+), 236 deletions(-)

Index: linux-2.6-xen.patch
===================================================================
RCS file: /cvs/dist/rpms/kernel-xen-2.6/devel/linux-2.6-xen.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- linux-2.6-xen.patch	24 Jan 2007 01:28:48 -0000	1.1
+++ linux-2.6-xen.patch	26 Jan 2007 12:07:00 -0000	1.2
@@ -11048,7 +11048,7 @@
 diff -urNp --exclude='.hg*' --exclude=.git --exclude=CVS --exclude='*~' --exclude='.#*' --exclude=TAGS /scratch/src/linux-2.6.19.2/arch/i386/kernel/setup-xen.c source/arch/i386/kernel/setup-xen.c
 --- /scratch/src/linux-2.6.19.2/arch/i386/kernel/setup-xen.c	1970-01-01 01:00:00.000000000 +0100
 +++ source/arch/i386/kernel/setup-xen.c	2007-01-15 15:48:21.000000000 +0100
-@@ -0,0 +1,1748 @@
+@@ -0,0 +1,1747 @@
 +/*
 + *  linux/arch/i386/kernel/setup.c
 + *
@@ -12759,7 +12759,6 @@
 +		conswitchp = &dummy_con;
 +#endif
 +	}
-+	xencons_early_setup();
 +#ifdef CONFIG_X86_TSC
 +	tsc_init();
 +#endif
@@ -23425,7 +23424,7 @@
  	ia64_patch_vtop((u64) __start___vtop_patchlist, (u64) __end___vtop_patchlist);
  
  	*cmdline_p = __va(ia64_boot_param->command_line);
-@@ -479,7 +577,26 @@ setup_arch (char **cmdline_p)
+@@ -479,7 +577,25 @@ setup_arch (char **cmdline_p)
  			conswitchp = &vga_con;
  # endif
  	}
@@ -23445,7 +23444,6 @@
  #endif
 +		}
 +	}
-+	xencons_early_setup();
 +#endif
 +#endif
 +
@@ -40500,7 +40498,7 @@
 diff -urNp --exclude='.hg*' --exclude=.git --exclude=CVS --exclude='*~' --exclude='.#*' --exclude=TAGS /scratch/src/linux-2.6.19.2/arch/x86_64/kernel/setup-xen.c source/arch/x86_64/kernel/setup-xen.c
 --- /scratch/src/linux-2.6.19.2/arch/x86_64/kernel/setup-xen.c	1970-01-01 01:00:00.000000000 +0100
 +++ source/arch/x86_64/kernel/setup-xen.c	2007-01-23 00:24:18.000000000 +0100
-@@ -0,0 +1,1482 @@
+@@ -0,0 +1,1481 @@
 +/*
 + *  linux/arch/x86-64/kernel/setup.c
 + *
@@ -41271,7 +41269,6 @@
 +#endif
 +                }
 +	}
-+	xencons_early_setup();
 +#else	/* CONFIG_XEN */
 +
 +#ifdef CONFIG_VT
@@ -48257,44 +48254,6 @@
 +module_init(tpmif_init);
 +
 +MODULE_LICENSE("Dual BSD/GPL");
-diff -urNp --exclude='.hg*' --exclude=.git --exclude=CVS --exclude='*~' --exclude='.#*' --exclude=TAGS /scratch/src/linux-2.6.19.2/drivers/char/tty_io.c source/drivers/char/tty_io.c
---- /scratch/src/linux-2.6.19.2/drivers/char/tty_io.c	2006-11-29 22:57:37.000000000 +0100
-+++ source/drivers/char/tty_io.c	2007-01-15 15:48:32.000000000 +0100
-@@ -131,6 +131,8 @@ LIST_HEAD(tty_drivers);			/* linked list
- DEFINE_MUTEX(tty_mutex);
- EXPORT_SYMBOL(tty_mutex);
- 
-+int console_use_vt = 1;
-+
- #ifdef CONFIG_UNIX98_PTYS
- extern struct tty_driver *ptm_driver;	/* Unix98 pty masters; for /dev/ptmx */
- extern int pty_limit;		/* Config limit on Unix98 ptys */
-@@ -2477,7 +2479,7 @@ retry_open:
- 		goto got_driver;
- 	}
- #ifdef CONFIG_VT
--	if (device == MKDEV(TTY_MAJOR,0)) {
-+	if (console_use_vt && (device == MKDEV(TTY_MAJOR,0))) {
- 		extern struct tty_driver *console_driver;
- 		driver = console_driver;
- 		index = fg_console;
-@@ -3912,6 +3914,8 @@ static int __init tty_init(void)
- #endif
- 
- #ifdef CONFIG_VT
-+	if (!console_use_vt)
-+		goto out_vt;
- 	cdev_init(&vc0_cdev, &console_fops);
- 	if (cdev_add(&vc0_cdev, MKDEV(TTY_MAJOR, 0), 1) ||
- 	    register_chrdev_region(MKDEV(TTY_MAJOR, 0), 1, "/dev/vc/0") < 0)
-@@ -3919,6 +3923,7 @@ static int __init tty_init(void)
- 	class_device_create(tty_class, NULL, MKDEV(TTY_MAJOR, 0), NULL, "tty0");
- 
- 	vty_init();
-+ out_vt:
- #endif
- 	return 0;
- }
 diff -urNp --exclude='.hg*' --exclude=.git --exclude=CVS --exclude='*~' --exclude='.#*' --exclude=TAGS /scratch/src/linux-2.6.19.2/drivers/firmware/Kconfig source/drivers/firmware/Kconfig
 --- /scratch/src/linux-2.6.19.2/drivers/firmware/Kconfig	2006-11-29 22:57:37.000000000 +0100
 +++ source/drivers/firmware/Kconfig	2007-01-15 15:48:33.000000000 +0100
@@ -56713,7 +56672,7 @@
 diff -urNp --exclude='.hg*' --exclude=.git --exclude=CVS --exclude='*~' --exclude='.#*' --exclude=TAGS /scratch/src/linux-2.6.19.2/drivers/xen/console/console.c source/drivers/xen/console/console.c
 --- /scratch/src/linux-2.6.19.2/drivers/xen/console/console.c	1970-01-01 01:00:00.000000000 +0100
 +++ source/drivers/xen/console/console.c	2007-01-15 15:48:48.000000000 +0100
-@@ -0,0 +1,717 @@
+@@ -0,0 +1,715 @@
 +/******************************************************************************
 + * console.c
 + * 
@@ -56782,14 +56741,14 @@
 + *  'xencons=tty'  [XC_TTY]:     Console attached to '/dev/tty[0-9]+'.
 + *  'xencons=ttyS' [XC_SERIAL]:  Console attached to '/dev/ttyS[0-9]+'.
 + *  'xencons=xvc'  [XC_XVC]:     Console attached to '/dev/xvc0'.
-+ *  default:                     DOM0 -> XC_SERIAL ; all others -> XC_TTY.
++ *                 [XC_DEFAULT]: DOM0 -> XC_SERIAL ; all others -> XC_TTY.
 + * 
 + * NB. In mode XC_TTY, we create dummy consoles for tty2-63. This suppresses
 + * warnings from standard distro startup scripts.
 + */
 +static enum {
-+	XC_OFF, XC_TTY, XC_SERIAL, XC_XVC
-+} xc_mode;
++	XC_OFF, XC_DEFAULT, XC_TTY, XC_SERIAL, XC_XVC
++} xc_mode = XC_DEFAULT;
 +static int xc_num = -1;
 +
 +/* /dev/xvc0 device number allocated by lanana.org. */
@@ -56801,32 +56760,17 @@
 +extern int sysrq_enabled;
 +#endif
 +
-+void xencons_early_setup(void)
-+{
-+	extern int console_use_vt;
-+
-+	if (is_initial_xendomain()) {
-+		xc_mode = XC_SERIAL;
-+	} else {
-+		xc_mode = XC_TTY;
-+		console_use_vt = 0;
-+	}
-+}
-+
 +static int __init xencons_setup(char *str)
 +{
 +	char *q;
 +	int n;
-+	extern int console_use_vt;
 +
-+	console_use_vt = 1;
 +	if (!strncmp(str, "ttyS", 4)) {
 +		xc_mode = XC_SERIAL;
 +		str += 4;
 +	} else if (!strncmp(str, "tty", 3)) {
 +		xc_mode = XC_TTY;
 +		str += 3;
-+		console_use_vt = 0;
 +	} else if (!strncmp(str, "xvc", 3)) {
 +		xc_mode = XC_XVC;
 +		str += 3;
@@ -56924,10 +56868,14 @@
 +		goto out;
 +
 +	if (is_initial_xendomain()) {
++		if (xc_mode == XC_DEFAULT)
++			xc_mode = XC_SERIAL;
 +		kcons_info.write = kcons_write_dom0;
 +	} else {
 +		if (!xen_start_info->console.domU.evtchn)
 +			goto out;
++		if (xc_mode == XC_DEFAULT)
++			xc_mode = XC_XVC;
 +		kcons_info.write = kcons_write;
 +	}
 +
@@ -57425,6 +57373,15 @@
 +	printk("Xen virtual console successfully installed as %s%d\n",
 +	       DRV(xencons_driver)->name, xc_num);
 +
++        /* Check about framebuffer messing up the console */
++        if (!is_initial_xendomain() &&
++	    !xenbus_exists(XBT_NIL, "device", "vfb")) {
++		/* FIXME: this is ugly */
++		unregister_console(&kcons_info);
++		kcons_info.flags |= CON_CONSDEV;
++		register_console(&kcons_info);
++	}
++
 +	return 0;
 +}
 +
@@ -100312,7 +100269,7 @@
 diff -urNp --exclude='.hg*' --exclude=.git --exclude=CVS --exclude='*~' --exclude='.#*' --exclude=TAGS /scratch/src/linux-2.6.19.2/include/xen/xencons.h source/include/xen/xencons.h
 --- /scratch/src/linux-2.6.19.2/include/xen/xencons.h	1970-01-01 01:00:00.000000000 +0100
 +++ source/include/xen/xencons.h	2007-01-15 15:49:03.000000000 +0100
-@@ -0,0 +1,19 @@
+@@ -0,0 +1,17 @@
 +#ifndef __ASM_XENCONS_H__
 +#define __ASM_XENCONS_H__
 +
@@ -100329,8 +100286,6 @@
 +int xencons_ring_init(void);
 +int xencons_ring_send(const char *data, unsigned len);
 +
-+void xencons_early_setup(void);
-+
 +#endif /* __ASM_XENCONS_H__ */
 diff -urNp --exclude='.hg*' --exclude=.git --exclude=CVS --exclude='*~' --exclude='.#*' --exclude=TAGS /scratch/src/linux-2.6.19.2/include/xen/xenoprof.h source/include/xen/xenoprof.h
 --- /scratch/src/linux-2.6.19.2/include/xen/xenoprof.h	1970-01-01 01:00:00.000000000 +0100




More information about the fedora-cvs-commits mailing list