ia64/xen-unstable

changeset 1053:4d8a0cc41eb6

bitkeeper revision 1.692 (40121d1bBkNbPNTOp6omHUYX1QhV1w)

xl_vbd.c, XenoUtil.py, VBD-HOWTO.txt:
Fix VBD init code, and move the sqlite db again.
author kaf24@scramble.cl.cam.ac.uk
date Sat Jan 24 07:22:03 2004 +0000 (2004-01-24)
parents cc2a9e8d1568
children 8fbde9a89a05
files docs/VBD-HOWTO.txt tools/xc/py/XenoUtil.py xenolinux-2.4.24-sparse/arch/xeno/drivers/block/xl_vbd.c
line diff
     1.1 --- a/docs/VBD-HOWTO.txt	Sat Jan 24 01:13:55 2004 +0000
     1.2 +++ b/docs/VBD-HOWTO.txt	Sat Jan 24 07:22:03 2004 +0000
     1.3 @@ -86,7 +86,7 @@ Virtual Disk Management
     1.4  The VD management code runs entirely in userspace.  The code is written in
     1.5  Python and can therefore be accessed from custom scripts, as well as from the
     1.6  convenience scripts provided.  The underlying VD database is a SQLite database
     1.7 -in /var/lib/xen_vdisks.sqlite.
     1.8 +in /var/db/xen_vdisks.sqlite.
     1.9  
    1.10  The scripts provided are as follows:
    1.11  
    1.12 @@ -131,7 +131,7 @@ More detail:
    1.13  
    1.14  When you use vd_format.py to add a device to the free space pool, the device is
    1.15  logically split up into extents.  These extents are recorded in the Virtual
    1.16 -Disk Management database in /var/lib/xen_vdisks.sqlite.
    1.17 +Disk Management database in /var/db/xen_vdisks.sqlite.
    1.18  
    1.19  When you use vd_create.py to add create a virtual disk, some of the extents in
    1.20  the free space pool are reallocated for that virtual disk and a record for that
     2.1 --- a/tools/xc/py/XenoUtil.py	Sat Jan 24 01:13:55 2004 +0000
     2.2 +++ b/tools/xc/py/XenoUtil.py	Sat Jan 24 07:22:03 2004 +0000
     2.3 @@ -3,9 +3,9 @@ import string, re, os, sys
     2.4  ##### Module variables
     2.5  
     2.6  """Location of the Virtual Disk management database.
     2.7 -   defaults to /var/lib/xen_vdisks.sqlite
     2.8 +   defaults to /var/db/xen_vdisks.sqlite
     2.9  """
    2.10 -VD_DB_FILE = "/var/lib/xen_vdisks.sqlite"
    2.11 +VD_DB_FILE = "/var/db/xen_vdisks.sqlite"
    2.12  
    2.13  """VBD expertise level - determines the strictness of the sanity checking.
    2.14    This mode determines the level of complaints when disk sharing occurs
     3.1 --- a/xenolinux-2.4.24-sparse/arch/xeno/drivers/block/xl_vbd.c	Sat Jan 24 01:13:55 2004 +0000
     3.2 +++ b/xenolinux-2.4.24-sparse/arch/xeno/drivers/block/xl_vbd.c	Sat Jan 24 07:22:03 2004 +0000
     3.3 @@ -457,7 +457,7 @@ void xlvbd_update_vbds(void)
     3.4          else
     3.5          {
     3.6              if ( (memcmp(&old_info[i], &new_info[j], sizeof(xen_disk_t)) == 0) ||
     3.7 -                 (xlvbd_remove_device(old_info[i].device) == 0) )
     3.8 +                 (xlvbd_remove_device(old_info[i].device) != 0) )
     3.9                  memcpy(&merged_info[k++], &old_info[i], sizeof(xen_disk_t));
    3.10              else if ( xlvbd_init_device(&new_info[j]) == 0 )
    3.11                  memcpy(&merged_info[k++], &new_info[j], sizeof(xen_disk_t));