80e28a00ec
- unmodified_drivers: handle IRQF_SAMPLE_RANDOM, it was removed in 3.6-rc1 - bnc#778105 - first XEN-PV VM fails to spawn xend: Increase wait time for disk to appear in host bootloader Modified existing xen-domUloader.diff - Disable the snapshot patches. Snapshot only supported the qcow2 image format which was poorly implemented qemu 0.10.2. Snapshot support may be restored in the future when the newer upstream qemu is used by Xen. - bnc#776995 - attaching scsi control luns with pvscsi - xend/pvscsi: fix passing of SCSI control LUNs xen-bug776995-pvscsi-no-devname.patch - xend/pvscsi: fix usage of persistant device names for SCSI devices xen-bug776995-pvscsi-persistent-names.patch - xend/pvscsi: update sysfs parser for Linux 3.0 xen-bug776995-pvscsi-sysfs-parser.patch - Update to Xen 4.2.0 RC3+ c/s 25779 - Update to Xen 4.2.0 RC2+ c/s 25765 OBS-URL: https://build.opensuse.org/package/show/Virtualization/xen?expand=0&rev=199
35 lines
1.4 KiB
Diff
35 lines
1.4 KiB
Diff
|
|
Subject: qdev: convert watchdogs
|
|
From: Markus Armbruster armbru@redhat.com Fri Aug 21 10:31:34 2009 +0200
|
|
Date: Thu Aug 27 20:35:24 2009 -0500:
|
|
Git: 09aaa1602f9381c0e0fb539390b1793e51bdfc7b
|
|
|
|
* THIS IS ONLY THE BUG FIX PART OF THE UPSTREAM PATCH *
|
|
|
|
Fixes ib700 not to use vm_clock before it is initialized: in
|
|
wdt_ib700_init(), called from register_watchdogs(), which runs before
|
|
init_timers(). The bug made ib700_write_enable_reg() crash in
|
|
qemu_del_timer().
|
|
|
|
Signed-off-by: Markus Armbruster <armbru@redhat.com>
|
|
Signed-off-by: Anthony Liguori <aliguori@us.ibm.com>
|
|
|
|
Index: xen-4.2.0-testing/tools/qemu-xen-traditional-dir-remote/hw/wdt_ib700.c
|
|
===================================================================
|
|
--- xen-4.2.0-testing.orig/tools/qemu-xen-traditional-dir-remote/hw/wdt_ib700.c
|
|
+++ xen-4.2.0-testing/tools/qemu-xen-traditional-dir-remote/hw/wdt_ib700.c
|
|
@@ -93,6 +93,7 @@ static int ib700_load(QEMUFile *f, void
|
|
/* Create and initialize a virtual IB700 during PC creation. */
|
|
static void ib700_pc_init(PCIBus *unused)
|
|
{
|
|
+ timer = qemu_new_timer(vm_clock, ib700_timer_expired, NULL);
|
|
register_savevm("ib700_wdt", -1, 0, ib700_save, ib700_load, NULL);
|
|
|
|
register_ioport_write(0x441, 2, 1, ib700_write_disable_reg, NULL);
|
|
@@ -108,5 +109,4 @@ static WatchdogTimerModel model = {
|
|
void wdt_ib700_init(void)
|
|
{
|
|
watchdog_add_model(&model);
|
|
- timer = qemu_new_timer(vm_clock, ib700_timer_expired, NULL);
|
|
}
|