From ef7fec116885b4d9ff44c0e49b1a108d8f95ca98 Mon Sep 17 00:00:00 2001 From: Daniel Veillard <veillard@redhat.com> Date: Tue, 12 Aug 2008 11:26:00 +0000 Subject: [PATCH] rename the disk type from 'dos' to 'msdos' * docs/storage.html[.in] src/storage_backend_disk.c: patch from Cole Robinson to rename the disk type from 'dos' to 'msdos' Daniel --- ChangeLog | 5 +++++ docs/storage.html | 4 ++-- docs/storage.html.in | 4 ++-- src/storage_backend_disk.c | 12 ++++++------ 4 files changed, 15 insertions(+), 10 deletions(-) diff --git a/ChangeLog b/ChangeLog index 127f1ec6c7..3bfc5a35b0 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +Tue Aug 12 13:20:07 CEST 2008 Daniel Veillard <veillard@redhat.com> + + * docs/storage.html[.in] src/storage_backend_disk.c: patch from + Cole Robinson to rename the disk type from 'dos' to 'msdos' + Tue Aug 12 17:30:50 JST 2008 Atsushi SAKAI <sakaia@jp.fujitsu.com> * src/domain_conf.h src/qemu_driver.c: name changing of diff --git a/docs/storage.html b/docs/storage.html index d9d62f7353..1b82b36862 100644 --- a/docs/storage.html +++ b/docs/storage.html @@ -331,7 +331,7 @@ libvirt. the common partition table types: </p> <ul><li> - <code>dos</code> + <code>msdos</code> </li><li> <code>dvh</code> </li><li> @@ -346,7 +346,7 @@ libvirt. <code>sun</code> </li></ul> <p> - The <code>dos</code> or <code>gpt</code> formats are recommended for + The <code>msdos</code> or <code>gpt</code> formats are recommended for best portability - the latter is needed for disks larger than 2TB. </p> <h3>Valid volume format types</h3> diff --git a/docs/storage.html.in b/docs/storage.html.in index 40e8e80da5..8cab480b42 100644 --- a/docs/storage.html.in +++ b/docs/storage.html.in @@ -258,7 +258,7 @@ libvirt. </p> <ul> <li> - <code>dos</code> + <code>msdos</code> </li> <li> <code>dvh</code> @@ -280,7 +280,7 @@ libvirt. </li> </ul> <p> - The <code>dos</code> or <code>gpt</code> formats are recommended for + The <code>msdos</code> or <code>gpt</code> formats are recommended for best portability - the latter is needed for disks larger than 2TB. </p> diff --git a/src/storage_backend_disk.c b/src/storage_backend_disk.c index dac827b15c..44a15ba2c9 100644 --- a/src/storage_backend_disk.c +++ b/src/storage_backend_disk.c @@ -29,7 +29,7 @@ #include "memory.h" enum { - VIR_STORAGE_POOL_DISK_DOS = 0, + VIR_STORAGE_POOL_DISK_MSDOS = 0, VIR_STORAGE_POOL_DISK_DVH, VIR_STORAGE_POOL_DISK_GPT, VIR_STORAGE_POOL_DISK_MAC, @@ -64,10 +64,10 @@ static int virStorageBackendDiskPoolFormatFromString(virConnectPtr conn, const char *format) { if (format == NULL) - return VIR_STORAGE_POOL_DISK_DOS; + return VIR_STORAGE_POOL_DISK_MSDOS; - if (STREQ(format, "dos")) - return VIR_STORAGE_POOL_DISK_DOS; + if (STREQ(format, "msdos")) + return VIR_STORAGE_POOL_DISK_MSDOS; if (STREQ(format, "dvh")) return VIR_STORAGE_POOL_DISK_DVH; if (STREQ(format, "gpt")) @@ -90,8 +90,8 @@ static const char * virStorageBackendDiskPoolFormatToString(virConnectPtr conn, int format) { switch (format) { - case VIR_STORAGE_POOL_DISK_DOS: - return "dos"; + case VIR_STORAGE_POOL_DISK_MSDOS: + return "msdos"; case VIR_STORAGE_POOL_DISK_DVH: return "dvh"; case VIR_STORAGE_POOL_DISK_GPT: