|
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index] [Xen-changelog] [xen-unstable] [qemu patches] Update patches for changeset 11161:5c1021595e3c.
# HG changeset patch
# User chris@xxxxxxxxxxxxxxxxxxxxxxxx
# Node ID 130eee9e972876bba82c73a19e56d314859d8b77
# Parent 5c1021595e3ce923ff11e338172d4639da2aecb5
[qemu patches] Update patches for changeset 11161:5c1021595e3c.
Signed-off-by: Christian Limpach <Christian.Limpach@xxxxxxxxxxxxx>
---
tools/ioemu/patches/series | 1
tools/ioemu/patches/xen-platform-device | 37 ++++++++++++++++++++++++++++++++
2 files changed, 38 insertions(+)
diff -r 5c1021595e3c -r 130eee9e9728 tools/ioemu/patches/series
--- a/tools/ioemu/patches/series Thu Aug 17 12:01:23 2006 +0100
+++ b/tools/ioemu/patches/series Thu Aug 17 12:01:44 2006 +0100
@@ -42,3 +42,4 @@ qemu-fix-write-to-disk-synchronous
qemu-fix-write-to-disk-synchronous
xen-support-buffered-ioreqs
qemu-daemonize
+xen-platform-device
diff -r 5c1021595e3c -r 130eee9e9728 tools/ioemu/patches/xen-platform-device
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/tools/ioemu/patches/xen-platform-device Thu Aug 17 12:01:44 2006 +0100
@@ -0,0 +1,186 @@
+Add the xen platform device to the qemu PCI bus. Useful functionality
+will come later.
+
+Index: ioemu/Makefile.target
+===================================================================
+--- ioemu.orig/Makefile.target 2006-08-17 11:37:49.910902700 +0100
++++ ioemu/Makefile.target 2006-08-17 11:42:15.196191649 +0100
+@@ -359,6 +359,7 @@
+ VL_OBJS+= usb-uhci.o
+ VL_OBJS+= piix4acpi.o
+ VL_OBJS+= xenstore.o
++VL_OBJS+= xen_platform.o
+ DEFINES += -DHAS_AUDIO
+ endif
+ ifeq ($(TARGET_BASE_ARCH), ppc)
+Index: ioemu/hw/pc.c
+===================================================================
+--- ioemu.orig/hw/pc.c 2006-08-17 11:37:49.794915697 +0100
++++ ioemu/hw/pc.c 2006-08-17 11:43:11.818853900 +0100
+@@ -823,6 +823,9 @@
+ }
+ #endif /* !CONFIG_DM */
+
++ if (pci_enabled)
++ pci_xen_platform_init(pci_bus);
++
+ for(i = 0; i < MAX_SERIAL_PORTS; i++) {
+ if (serial_hds[i]) {
+ serial_init(&pic_set_irq_new, isa_pic,
+Index: ioemu/hw/xen_platform.c
+===================================================================
+--- /dev/null 1970-01-01 00:00:00.000000000 +0000
++++ ioemu/hw/xen_platform.c 2006-08-17 11:56:16.043076969 +0100
+@@ -0,0 +1,138 @@
++/*
++ * XEN platform fake pci device, formerly known as the event channel device
++ *
++ * Copyright (c) 2003-2004 Intel Corp.
++ * Copyright (c) 2006 XenSource
++ *
++ * Permission is hereby granted, free of charge, to any person obtaining a
copy
++ * of this software and associated documentation files (the "Software"), to
deal
++ * in the Software without restriction, including without limitation the
rights
++ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
++ * copies of the Software, and to permit persons to whom the Software is
++ * furnished to do so, subject to the following conditions:
++ *
++ * The above copyright notice and this permission notice shall be included in
++ * all copies or substantial portions of the Software.
++ *
++ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
++ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
++ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
++ * THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
++ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
FROM,
++ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
++ * THE SOFTWARE.
++ */
++#include "vl.h"
++
++#include <xenguest.h>
++#include <xc_private.h>
++
++extern FILE *logfile;
++
++static void platform_ioport_write(void *opaque, uint32_t addr, uint32_t val)
++{
++ return;
++}
++
++static uint32_t platform_ioport_read(void *opaque, uint32_t addr)
++{
++ return 0;
++}
++
++static void platform_ioport_map(PCIDevice *pci_dev, int region_num,
++ uint32_t addr, uint32_t size, int type)
++{
++ register_ioport_write(addr, 16, 4, platform_ioport_write, NULL);
++ register_ioport_read(addr, 16, 1, platform_ioport_read, NULL);
++}
++
++static uint32_t platform_mmio_read(void *opaque, target_phys_addr_t addr)
++{
++ fprintf(logfile, "Warning: try read from xen platform mmio space\n");
++ return 0;
++}
++
++static void platform_mmio_write(void *opaque, target_phys_addr_t addr,
++ uint32_t val)
++{
++ fprintf(logfile, "Warning: try write to xen platform mmio space\n");
++ return;
++}
++
++static CPUReadMemoryFunc *platform_mmio_read_funcs[3] = {
++ platform_mmio_read,
++ platform_mmio_read,
++ platform_mmio_read,
++};
++
++static CPUWriteMemoryFunc *platform_mmio_write_funcs[3] = {
++ platform_mmio_write,
++ platform_mmio_write,
++ platform_mmio_write,
++};
++
++static void platform_mmio_map(PCIDevice *d, int region_num,
++ uint32_t addr, uint32_t size, int type)
++{
++ int mmio_io_addr;
++
++ mmio_io_addr = cpu_register_io_memory(0, platform_mmio_read_funcs,
++ platform_mmio_write_funcs, NULL);
++
++ cpu_register_physical_memory(addr, 0x1000000, mmio_io_addr);
++}
++
++struct pci_config_header {
++ uint16_t vendor_id;
++ uint16_t device_id;
++ uint16_t command;
++ uint16_t status;
++ uint8_t revision;
++ uint8_t api;
++ uint8_t subclass;
++ uint8_t class;
++ uint8_t cache_line_size; /* Units of 32 bit words */
++ uint8_t latency_timer; /* In units of bus cycles */
++ uint8_t header_type; /* Should be 0 */
++ uint8_t bist; /* Built in self test */
++ uint32_t base_address_regs[6];
++ uint32_t reserved1;
++ uint32_t reserved2;
++ uint32_t rom_addr;
++ uint32_t reserved3;
++ uint32_t reserved4;
++ uint8_t interrupt_line;
++ uint8_t interrupt_pin;
++ uint8_t min_gnt;
++ uint8_t max_lat;
++};
++
++void pci_xen_platform_init(PCIBus *bus)
++{
++ PCIDevice *d;
++ struct pci_config_header *pch;
++
++ printf("Register xen platform.\n");
++ d = pci_register_device(bus, "xen-platform", sizeof(PCIDevice), -1, NULL,
++ NULL);
++ pch = (struct pci_config_header *)d->config;
++ pch->vendor_id = 0xfffd;
++ pch->device_id = 0x0101;
++ pch->command = 3; /* IO and memory access */
++ pch->revision = 0;
++ pch->api = 0;
++ pch->subclass = 0x80; /* Other */
++ pch->class = 0xff; /* Unclassified device class */
++ pch->header_type = 0;
++ pch->interrupt_pin = 1;
++
++ pci_register_io_region(d, 0, 0x100, PCI_ADDRESS_SPACE_IO,
++ platform_ioport_map);
++
++ /* reserve 16MB mmio address for share memory*/
++ pci_register_io_region(d, 1, 0x1000000, PCI_ADDRESS_SPACE_MEM_PREFETCH,
++ platform_mmio_map);
++
++ register_savevm("platform", 0, 1, generic_pci_save, generic_pci_load, d);
++ printf("Done register platform.\n");
++}
+Index: ioemu/vl.h
+===================================================================
+--- ioemu.orig/vl.h 2006-08-17 11:37:49.932900235 +0100
++++ ioemu/vl.h 2006-08-17 11:44:59.487739984 +0100
+@@ -1208,6 +1208,9 @@
+ void xenstore_check_new_media_present(int timeout);
+ void xenstore_write_vncport(int vnc_display);
+
++/* xen_platform.c */
++void pci_xen_platform_init(PCIBus *bus);
++
+
+ void kqemu_record_dump(void);
+
_______________________________________________
Xen-changelog mailing list
Xen-changelog@xxxxxxxxxxxxxxxxxxx
http://lists.xensource.com/xen-changelog
|
 |
Lists.xenproject.org is hosted with RackSpace, monitoring our |