rpm/xen
SHA256
1
0
Fork 0
forked from pool/xen
Code Pull Requests Activity

OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/xen?expand=0&rev=48

Browse Source
This commit is contained in:
OBS User unknown
2008-07-18 23:04:37 +00:00
committed by Git OBS Bridge
parent 8ae8ea2a74
commit f5d6338f4d
101 changed files with 2069 additions and 10556 deletions
Download Patch File Download Diff File Expand all files Collapse all files

58
xen-ioemu-hvm-pv-support.diff
View File

@@ -1,8 +1,8 @@
Index: xen-3.2.1-testing/tools/ioemu/hw/ide.c
Index: xen-3.3.0-testing/tools/ioemu/hw/ide.c
===================================================================
--- xen-3.2.1-testing.orig/tools/ioemu/hw/ide.c
+++ xen-3.2.1-testing/tools/ioemu/hw/ide.c
@@ -395,6 +395,9 @@ typedef struct PCIIDEState {
--- xen-3.3.0-testing.orig/tools/ioemu/hw/ide.c
+++ xen-3.3.0-testing/tools/ioemu/hw/ide.c
@@ -406,6 +406,9 @@ typedef struct PCIIDEState {
int type; /* see IDE_TYPE_xxx */
} PCIIDEState;
@@ -12,7 +12,7 @@ Index: xen-3.2.1-testing/tools/ioemu/hw/ide.c
#if defined(__ia64__)
#include <xen/hvm/ioreq.h>
@@ -2288,6 +2291,27 @@ static void ide_reset(IDEState *s)
@@ -2305,6 +2308,27 @@ static void ide_reset(IDEState *s)
ide_dummy_transfer_stop(s);
}
@@ -40,7 +40,7 @@ Index: xen-3.2.1-testing/tools/ioemu/hw/ide.c
struct partition {
uint8_t boot_ind; /* 0x80 - active */
uint8_t head; /* starting head */
@@ -2689,6 +2713,9 @@ void pci_cmd646_ide_init(PCIBus *bus, Bl
@@ -2707,6 +2731,9 @@ void pci_cmd646_ide_init(PCIBus *bus, Bl
sizeof(PCIIDEState),
-1,
NULL, NULL);
@@ -50,7 +50,7 @@ Index: xen-3.2.1-testing/tools/ioemu/hw/ide.c
d->type = IDE_TYPE_CMD646;
pci_conf = d->dev.config;
pci_conf[0x00] = 0x95; // CMD646
@@ -2863,6 +2890,9 @@ void pci_piix_ide_init(PCIBus *bus, Bloc
@@ -2884,6 +2911,9 @@ void pci_piix_ide_init(PCIBus *bus, Bloc
NULL, NULL);
d->type = IDE_TYPE_PIIX3;
@@ -60,7 +60,7 @@ Index: xen-3.2.1-testing/tools/ioemu/hw/ide.c
pci_conf = d->dev.config;
pci_conf[0x00] = 0x86; // Intel
pci_conf[0x01] = 0x80;
@@ -2909,6 +2939,9 @@ void pci_piix3_ide_init(PCIBus *bus, Blo
@@ -2930,6 +2960,9 @@ void pci_piix3_ide_init(PCIBus *bus, Blo
NULL, NULL);
d->type = IDE_TYPE_PIIX3;
@@ -70,11 +70,11 @@ Index: xen-3.2.1-testing/tools/ioemu/hw/ide.c
pci_conf = d->dev.config;
pci_conf[0x00] = 0x86; // Intel
pci_conf[0x01] = 0x80;
Index: xen-3.2.1-testing/tools/ioemu/hw/pci.c
Index: xen-3.3.0-testing/tools/ioemu/hw/pci.c
===================================================================
--- xen-3.2.1-testing.orig/tools/ioemu/hw/pci.c
+++ xen-3.2.1-testing/tools/ioemu/hw/pci.c
@@ -573,6 +573,28 @@ void pci_nic_init(PCIBus *bus, NICInfo *
--- xen-3.3.0-testing.orig/tools/ioemu/hw/pci.c
+++ xen-3.3.0-testing/tools/ioemu/hw/pci.c
@@ -594,6 +594,28 @@ void pci_nic_init(PCIBus *bus, NICInfo *
}
}
@@ -103,10 +103,10 @@ Index: xen-3.2.1-testing/tools/ioemu/hw/pci.c
typedef struct {
PCIDevice dev;
PCIBus *bus;
Index: xen-3.2.1-testing/tools/ioemu/hw/xen_platform.c
Index: xen-3.3.0-testing/tools/ioemu/hw/xen_platform.c
===================================================================
--- xen-3.2.1-testing.orig/tools/ioemu/hw/xen_platform.c
+++ xen-3.2.1-testing/tools/ioemu/hw/xen_platform.c
--- xen-3.3.0-testing.orig/tools/ioemu/hw/xen_platform.c
+++ xen-3.3.0-testing/tools/ioemu/hw/xen_platform.c
@@ -23,15 +23,53 @@
* THE SOFTWARE.
*/
@@ -162,13 +162,13 @@ Index: xen-3.2.1-testing/tools/ioemu/hw/xen_platform.c
}
static uint32_t platform_mmio_read(void *opaque, target_phys_addr_t addr)
Index: xen-3.2.1-testing/tools/ioemu/vl.c
Index: xen-3.3.0-testing/tools/ioemu/vl.c
===================================================================
--- xen-3.2.1-testing.orig/tools/ioemu/vl.c
+++ xen-3.2.1-testing/tools/ioemu/vl.c
@@ -197,6 +197,20 @@ int xc_handle;
char domain_name[64] = "Xen-no-name";
extern int domid;
--- xen-3.3.0-testing.orig/tools/ioemu/vl.c
+++ xen-3.3.0-testing/tools/ioemu/vl.c
@@ -217,6 +217,20 @@ extern int domid;
PCI_EMULATION_INFO *PciEmulationInfoHead = NULL;
+typedef struct IOHandlerRecord {
+ int fd;
@@ -187,7 +187,7 @@ Index: xen-3.2.1-testing/tools/ioemu/vl.c
/***********************************************************/
/* x86 ISA bus support */
@@ -3424,6 +3438,7 @@ void net_slirp_smb(const char *exported_
@@ -3449,6 +3463,7 @@ void net_slirp_smb(const char *exported_
typedef struct TAPState {
VLANClientState *vc;
int fd;
@@ -195,7 +195,7 @@ Index: xen-3.2.1-testing/tools/ioemu/vl.c
} TAPState;
static void tap_receive(void *opaque, const uint8_t *buf, int size)
@@ -3451,6 +3466,36 @@ static void tap_send(void *opaque)
@@ -3476,6 +3491,36 @@ static void tap_send(void *opaque)
}
}
@@ -232,7 +232,7 @@ Index: xen-3.2.1-testing/tools/ioemu/vl.c
/* fd support */
static TAPState *net_tap_fd_init(VLANState *vlan, int fd)
@@ -3462,6 +3507,8 @@ static TAPState *net_tap_fd_init(VLANSta
@@ -3487,6 +3532,8 @@ static TAPState *net_tap_fd_init(VLANSta
return NULL;
s->fd = fd;
s->vc = qemu_new_vlan_client(vlan, tap_receive, NULL, s);
@@ -241,7 +241,7 @@ Index: xen-3.2.1-testing/tools/ioemu/vl.c
qemu_set_fd_handler(s->fd, tap_send, NULL, s);
snprintf(s->vc->info_str, sizeof(s->vc->info_str), "tap: fd=%d", fd);
return s;
@@ -4432,20 +4479,6 @@ void dumb_display_init(DisplayState *ds)
@@ -4500,20 +4547,6 @@ void dumb_display_init(DisplayState *ds)
#define MAX_IO_HANDLERS 64
@@ -262,11 +262,11 @@ Index: xen-3.2.1-testing/tools/ioemu/vl.c
/* XXX: fd_read_poll should be suppressed, but an API change is
necessary in the character devices to suppress fd_can_read(). */
int qemu_set_fd_handler2(int fd,
Index: xen-3.2.1-testing/tools/ioemu/vl.h
Index: xen-3.3.0-testing/tools/ioemu/vl.h
===================================================================
--- xen-3.2.1-testing.orig/tools/ioemu/vl.h
+++ xen-3.2.1-testing/tools/ioemu/vl.h
@@ -1501,6 +1501,8 @@ void kqemu_record_dump(void);
--- xen-3.3.0-testing.orig/tools/ioemu/vl.h
+++ xen-3.3.0-testing/tools/ioemu/vl.h
@@ -1578,6 +1578,8 @@ void kqemu_record_dump(void);
extern char domain_name[];
void destroy_hvm_domain(void);