SHA256
1
0
forked from pool/xen
OBS User unknown
2008-03-14 23:07:14 +00:00
committed by Git OBS Bridge
parent 0ef5182655
commit 9c16971e0e
65 changed files with 3459 additions and 1613 deletions

View File

@@ -1,8 +1,8 @@
Index: xen-3.2-testing/tools/ioemu/block.c
Index: xen-3.2.1-testing/tools/ioemu/block.c
===================================================================
--- xen-3.2-testing.orig/tools/ioemu/block.c
+++ xen-3.2-testing/tools/ioemu/block.c
@@ -558,6 +558,9 @@ int bdrv_write(BlockDriverState *bs, int
--- xen-3.2.1-testing.orig/tools/ioemu/block.c
+++ xen-3.2.1-testing/tools/ioemu/block.c
@@ -583,6 +583,9 @@ int bdrv_write(BlockDriverState *bs, int
else
return 0;
} else {
@@ -12,10 +12,10 @@ Index: xen-3.2-testing/tools/ioemu/block.c
return drv->bdrv_write(bs, sector_num, buf, nb_sectors);
}
}
Index: xen-3.2-testing/tools/ioemu/hw/cirrus_vga.c
Index: xen-3.2.1-testing/tools/ioemu/hw/cirrus_vga.c
===================================================================
--- xen-3.2-testing.orig/tools/ioemu/hw/cirrus_vga.c
+++ xen-3.2-testing/tools/ioemu/hw/cirrus_vga.c
--- xen-3.2.1-testing.orig/tools/ioemu/hw/cirrus_vga.c
+++ xen-3.2.1-testing/tools/ioemu/hw/cirrus_vga.c
@@ -220,6 +220,20 @@
#define CIRRUS_HOOK_NOT_HANDLED 0
#define CIRRUS_HOOK_HANDLED 1
@@ -143,10 +143,10 @@ Index: xen-3.2-testing/tools/ioemu/hw/cirrus_vga.c
for (x = 0; x < 8; x++) {
if (val & 0x80) {
*dst = s->cirrus_shadow_gr1;
Index: xen-3.2-testing/tools/ioemu/hw/cirrus_vga_rop.h
Index: xen-3.2.1-testing/tools/ioemu/hw/cirrus_vga_rop.h
===================================================================
--- xen-3.2-testing.orig/tools/ioemu/hw/cirrus_vga_rop.h
+++ xen-3.2-testing/tools/ioemu/hw/cirrus_vga_rop.h
--- xen-3.2.1-testing.orig/tools/ioemu/hw/cirrus_vga_rop.h
+++ xen-3.2.1-testing/tools/ioemu/hw/cirrus_vga_rop.h
@@ -49,6 +49,12 @@ glue(cirrus_bitblt_rop_fwd_, ROP_NAME)(C
src = src_ - src_base;
dstpitch -= bltwidth;
@@ -160,10 +160,10 @@ Index: xen-3.2-testing/tools/ioemu/hw/cirrus_vga_rop.h
for (y = 0; y < bltheight; y++) {
for (x = 0; x < bltwidth; x++) {
ROP_OP(*(dst_base + m(dst)), *(src_base + m(src)));
Index: xen-3.2-testing/tools/ioemu/hw/i8259.c
Index: xen-3.2.1-testing/tools/ioemu/hw/i8259.c
===================================================================
--- xen-3.2-testing.orig/tools/ioemu/hw/i8259.c
+++ xen-3.2-testing/tools/ioemu/hw/i8259.c
--- xen-3.2.1-testing.orig/tools/ioemu/hw/i8259.c
+++ xen-3.2.1-testing/tools/ioemu/hw/i8259.c
@@ -299,9 +299,11 @@ static void pic_ioport_write(void *opaqu
s->init_state = 1;
s->init4 = val & 1;
@@ -178,10 +178,10 @@ Index: xen-3.2-testing/tools/ioemu/hw/i8259.c
} else if (val & 0x08) {
if (val & 0x04)
s->poll = 1;
Index: xen-3.2-testing/tools/ioemu/hw/ne2000.c
Index: xen-3.2.1-testing/tools/ioemu/hw/ne2000.c
===================================================================
--- xen-3.2-testing.orig/tools/ioemu/hw/ne2000.c
+++ xen-3.2-testing/tools/ioemu/hw/ne2000.c
--- xen-3.2.1-testing.orig/tools/ioemu/hw/ne2000.c
+++ xen-3.2.1-testing/tools/ioemu/hw/ne2000.c
@@ -221,7 +221,7 @@ static int ne2000_can_receive(void *opaq
NE2000State *s = opaque;
@@ -191,10 +191,10 @@ Index: xen-3.2-testing/tools/ioemu/hw/ne2000.c
return !ne2000_buffer_full(s);
}
Index: xen-3.2-testing/tools/ioemu/hw/pc.c
Index: xen-3.2.1-testing/tools/ioemu/hw/pc.c
===================================================================
--- xen-3.2-testing.orig/tools/ioemu/hw/pc.c
+++ xen-3.2-testing/tools/ioemu/hw/pc.c
--- xen-3.2.1-testing.orig/tools/ioemu/hw/pc.c
+++ xen-3.2.1-testing/tools/ioemu/hw/pc.c
@@ -315,7 +315,8 @@ void bochs_bios_write(void *opaque, uint
case 0x400:
case 0x401:
@@ -216,10 +216,10 @@ Index: xen-3.2-testing/tools/ioemu/hw/pc.c
case 0x500:
case 0x503:
#ifdef DEBUG_BIOS
Index: xen-3.2-testing/tools/ioemu/target-i386/translate.c
Index: xen-3.2.1-testing/tools/ioemu/target-i386/translate.c
===================================================================
--- xen-3.2-testing.orig/tools/ioemu/target-i386/translate.c
+++ xen-3.2-testing/tools/ioemu/target-i386/translate.c
--- xen-3.2.1-testing.orig/tools/ioemu/target-i386/translate.c
+++ xen-3.2.1-testing/tools/ioemu/target-i386/translate.c
@@ -5326,7 +5326,12 @@ static target_ulong disas_insn(DisasCont
if (CODE64(s))
goto illegal_op;
@@ -250,11 +250,11 @@ Index: xen-3.2-testing/tools/ioemu/target-i386/translate.c
case 0xfa: /* cli */
if (!s->vm86) {
if (s->cpl <= s->iopl) {
Index: xen-3.2-testing/tools/ioemu/vl.c
Index: xen-3.2.1-testing/tools/ioemu/vl.c
===================================================================
--- xen-3.2-testing.orig/tools/ioemu/vl.c
+++ xen-3.2-testing/tools/ioemu/vl.c
@@ -3582,8 +3582,8 @@ typedef struct NetSocketState {
--- xen-3.2.1-testing.orig/tools/ioemu/vl.c
+++ xen-3.2.1-testing/tools/ioemu/vl.c
@@ -3602,8 +3602,8 @@ typedef struct NetSocketState {
VLANClientState *vc;
int fd;
int state; /* 0 = getting length, 1 = getting data */
@@ -265,7 +265,7 @@ Index: xen-3.2-testing/tools/ioemu/vl.c
uint8_t buf[4096];
struct sockaddr_in dgram_dst; /* contains inet host and port destination iff connectionless (SOCK_DGRAM) */
} NetSocketState;
@@ -3614,7 +3614,8 @@ static void net_socket_receive_dgram(voi
@@ -3634,7 +3634,8 @@ static void net_socket_receive_dgram(voi
static void net_socket_send(void *opaque)
{
NetSocketState *s = opaque;
@@ -275,7 +275,7 @@ Index: xen-3.2-testing/tools/ioemu/vl.c
uint8_t buf1[4096];
const uint8_t *buf;
@@ -3653,7 +3654,15 @@ static void net_socket_send(void *opaque
@@ -3673,7 +3674,15 @@ static void net_socket_send(void *opaque
l = s->packet_len - s->index;
if (l > size)
l = size;