- bnc#717650 - Unable to start VM
- Update to Xen 4.1.2_rc2 c/s 23152 - bnc#716695 - domUs using tap devices will not start updated multi-xvdp.patch - Upstream patches from Jan 23803-intel-pmu-models.patch 23800-x86_64-guest-addr-range.patch 23795-intel-ich10-quirk.patch 23804-x86-IPI-counts.patch - bnc#706106 - Inconsistent reporting of VM names during migration xend-migration-domname-fix.patch - bnc#712823 - L3:Xen guest does not start reliable when rebooted xend-vcpu-affinity-fix.patch OBS-URL: https://build.opensuse.org/package/show/Virtualization/xen?expand=0&rev=143
This commit is contained in:
committed by
Git OBS Bridge
parent
679b440be4
commit
800917b5a2
@@ -4,10 +4,10 @@ kernel and initrd, which could be accessed by hvmloader.
|
||||
|
||||
Signed-off-by: Chunyan Liu <cyliu@novell.com>
|
||||
|
||||
Index: xen-4.1.1-testing/tools/ioemu-qemu-xen/block.c
|
||||
Index: xen-4.1.2-testing/tools/ioemu-qemu-xen/block.c
|
||||
===================================================================
|
||||
--- xen-4.1.1-testing.orig/tools/ioemu-qemu-xen/block.c
|
||||
+++ xen-4.1.1-testing/tools/ioemu-qemu-xen/block.c
|
||||
--- xen-4.1.2-testing.orig/tools/ioemu-qemu-xen/block.c
|
||||
+++ xen-4.1.2-testing/tools/ioemu-qemu-xen/block.c
|
||||
@@ -596,6 +596,16 @@ int bdrv_read(BlockDriverState *bs, int6
|
||||
|
||||
if (bdrv_check_request(bs, sector_num, nb_sectors))
|
||||
@@ -79,10 +79,10 @@ Index: xen-4.1.1-testing/tools/ioemu-qemu-xen/block.c
|
||||
ret = drv->bdrv_aio_write(bs, sector_num, buf, nb_sectors, cb, opaque);
|
||||
|
||||
if (ret) {
|
||||
Index: xen-4.1.1-testing/tools/ioemu-qemu-xen/block_int.h
|
||||
Index: xen-4.1.2-testing/tools/ioemu-qemu-xen/block_int.h
|
||||
===================================================================
|
||||
--- xen-4.1.1-testing.orig/tools/ioemu-qemu-xen/block_int.h
|
||||
+++ xen-4.1.1-testing/tools/ioemu-qemu-xen/block_int.h
|
||||
--- xen-4.1.2-testing.orig/tools/ioemu-qemu-xen/block_int.h
|
||||
+++ xen-4.1.2-testing/tools/ioemu-qemu-xen/block_int.h
|
||||
@@ -122,6 +122,9 @@ struct BlockDriverState {
|
||||
BlockDriver *drv; /* NULL means no media */
|
||||
void *opaque;
|
||||
@@ -93,10 +93,10 @@ Index: xen-4.1.1-testing/tools/ioemu-qemu-xen/block_int.h
|
||||
char filename[1024];
|
||||
char backing_file[1024]; /* if non zero, the image is a diff of
|
||||
this file image */
|
||||
Index: xen-4.1.1-testing/tools/ioemu-qemu-xen/hw/pc.c
|
||||
Index: xen-4.1.2-testing/tools/ioemu-qemu-xen/hw/pc.c
|
||||
===================================================================
|
||||
--- xen-4.1.1-testing.orig/tools/ioemu-qemu-xen/hw/pc.c
|
||||
+++ xen-4.1.1-testing/tools/ioemu-qemu-xen/hw/pc.c
|
||||
--- xen-4.1.2-testing.orig/tools/ioemu-qemu-xen/hw/pc.c
|
||||
+++ xen-4.1.2-testing/tools/ioemu-qemu-xen/hw/pc.c
|
||||
@@ -474,45 +474,28 @@ static void bochs_bios_init(void)
|
||||
|
||||
/* Generate an initial boot sector which sets state and jump to
|
||||
@@ -231,10 +231,10 @@ Index: xen-4.1.1-testing/tools/ioemu-qemu-xen/hw/pc.c
|
||||
cpu_irq = qemu_allocate_irqs(pic_irq_request, NULL, 1);
|
||||
i8259 = i8259_init(cpu_irq[0]);
|
||||
ferr_irq = i8259[13];
|
||||
Index: xen-4.1.1-testing/tools/ioemu-qemu-xen/block.h
|
||||
Index: xen-4.1.2-testing/tools/ioemu-qemu-xen/block.h
|
||||
===================================================================
|
||||
--- xen-4.1.1-testing.orig/tools/ioemu-qemu-xen/block.h
|
||||
+++ xen-4.1.1-testing/tools/ioemu-qemu-xen/block.h
|
||||
--- xen-4.1.2-testing.orig/tools/ioemu-qemu-xen/block.h
|
||||
+++ xen-4.1.2-testing/tools/ioemu-qemu-xen/block.h
|
||||
@@ -82,6 +82,7 @@ int64_t bdrv_getlength(BlockDriverState
|
||||
void bdrv_get_geometry(BlockDriverState *bs, uint64_t *nb_sectors_ptr);
|
||||
void bdrv_guess_geometry(BlockDriverState *bs, int *pcyls, int *pheads, int *psecs);
|
||||
|
Reference in New Issue
Block a user