This commit is contained in:
committed by
Git OBS Bridge
parent
997dde689d
commit
b834258fb8
@@ -1,7 +1,7 @@
|
||||
Index: xen-3.3.0-testing/tools/ioemu-remote/block.c
|
||||
Index: xen-3.3.1-testing/tools/ioemu-remote/block.c
|
||||
===================================================================
|
||||
--- xen-3.3.0-testing.orig/tools/ioemu-remote/block.c
|
||||
+++ xen-3.3.0-testing/tools/ioemu-remote/block.c
|
||||
--- xen-3.3.1-testing.orig/tools/ioemu-remote/block.c
|
||||
+++ xen-3.3.1-testing/tools/ioemu-remote/block.c
|
||||
@@ -630,6 +630,9 @@ int bdrv_write(BlockDriverState *bs, int
|
||||
return 0;
|
||||
}
|
||||
@@ -12,10 +12,10 @@ Index: xen-3.3.0-testing/tools/ioemu-remote/block.c
|
||||
return drv->bdrv_write(bs, sector_num, buf, nb_sectors);
|
||||
}
|
||||
}
|
||||
Index: xen-3.3.0-testing/tools/ioemu-remote/hw/ne2000.c
|
||||
Index: xen-3.3.1-testing/tools/ioemu-remote/hw/ne2000.c
|
||||
===================================================================
|
||||
--- xen-3.3.0-testing.orig/tools/ioemu-remote/hw/ne2000.c
|
||||
+++ xen-3.3.0-testing/tools/ioemu-remote/hw/ne2000.c
|
||||
--- xen-3.3.1-testing.orig/tools/ioemu-remote/hw/ne2000.c
|
||||
+++ xen-3.3.1-testing/tools/ioemu-remote/hw/ne2000.c
|
||||
@@ -218,7 +218,7 @@ static int ne2000_can_receive(void *opaq
|
||||
NE2000State *s = opaque;
|
||||
|
||||
@@ -25,10 +25,10 @@ Index: xen-3.3.0-testing/tools/ioemu-remote/hw/ne2000.c
|
||||
return !ne2000_buffer_full(s);
|
||||
}
|
||||
|
||||
Index: xen-3.3.0-testing/tools/ioemu-remote/hw/pc.c
|
||||
Index: xen-3.3.1-testing/tools/ioemu-remote/hw/pc.c
|
||||
===================================================================
|
||||
--- xen-3.3.0-testing.orig/tools/ioemu-remote/hw/pc.c
|
||||
+++ xen-3.3.0-testing/tools/ioemu-remote/hw/pc.c
|
||||
--- xen-3.3.1-testing.orig/tools/ioemu-remote/hw/pc.c
|
||||
+++ xen-3.3.1-testing/tools/ioemu-remote/hw/pc.c
|
||||
@@ -387,7 +387,8 @@ static void bochs_bios_write(void *opaqu
|
||||
case 0x400:
|
||||
case 0x401:
|
||||
@@ -50,10 +50,10 @@ Index: xen-3.3.0-testing/tools/ioemu-remote/hw/pc.c
|
||||
case 0x500:
|
||||
case 0x503:
|
||||
#ifdef DEBUG_BIOS
|
||||
Index: xen-3.3.0-testing/tools/ioemu-remote/target-i386/translate.c
|
||||
Index: xen-3.3.1-testing/tools/ioemu-remote/target-i386/translate.c
|
||||
===================================================================
|
||||
--- xen-3.3.0-testing.orig/tools/ioemu-remote/target-i386/translate.c
|
||||
+++ xen-3.3.0-testing/tools/ioemu-remote/target-i386/translate.c
|
||||
--- xen-3.3.1-testing.orig/tools/ioemu-remote/target-i386/translate.c
|
||||
+++ xen-3.3.1-testing/tools/ioemu-remote/target-i386/translate.c
|
||||
@@ -5661,6 +5661,7 @@ static target_ulong disas_insn(DisasCont
|
||||
gen_jmp_im(pc_start - s->cs_base);
|
||||
gen_op_into(s->pc - pc_start);
|
||||
@@ -70,10 +70,10 @@ Index: xen-3.3.0-testing/tools/ioemu-remote/target-i386/translate.c
|
||||
case 0xfa: /* cli */
|
||||
if (!s->vm86) {
|
||||
if (s->cpl <= s->iopl) {
|
||||
Index: xen-3.3.0-testing/tools/ioemu-remote/vl.c
|
||||
Index: xen-3.3.1-testing/tools/ioemu-remote/vl.c
|
||||
===================================================================
|
||||
--- xen-3.3.0-testing.orig/tools/ioemu-remote/vl.c
|
||||
+++ xen-3.3.0-testing/tools/ioemu-remote/vl.c
|
||||
--- xen-3.3.1-testing.orig/tools/ioemu-remote/vl.c
|
||||
+++ xen-3.3.1-testing/tools/ioemu-remote/vl.c
|
||||
@@ -4380,8 +4380,8 @@ typedef struct NetSocketState {
|
||||
VLANClientState *vc;
|
||||
int fd;
|
||||
|
Reference in New Issue
Block a user