diff -r 0a71dab025de -r f7afada7979c libxkutil/device_parsing.h --- a/libxkutil/device_parsing.h Thu Mar 06 09:59:23 2008 +0800 +++ b/libxkutil/device_parsing.h Fri Mar 07 12:30:05 2008 +0100 @@ -64,11 +64,11 @@ struct graphics_device {
struct virt_device { enum { - VIRT_DEV_NET = CIM_RASD_TYPE_NET, - VIRT_DEV_DISK = CIM_RASD_TYPE_DISK, - VIRT_DEV_MEM = CIM_RASD_TYPE_MEM, - VIRT_DEV_VCPU = CIM_RASD_TYPE_PROC, - VIRT_DEV_UNKNOWN = 1000, + VIRT_DEV_NET = CIM_RES_TYPE_NET, + VIRT_DEV_DISK = CIM_RES_TYPE_DISK, + VIRT_DEV_MEM = CIM_RES_TYPE_MEM, + VIRT_DEV_VCPU = CIM_RES_TYPE_PROC, + VIRT_DEV_UNKNOWN = CIM_RES_TYPE_UNKNOWN, VIRT_DEV_EMU, VIRT_DEV_GRAPHICS,
This set applied and test fine on my system. I'm guessing the VIRT_DEV_* pieces were left here so that this set could be applied without breaking providers that still use VIRT_DEV_*. I think this set is good to go as long as the VIRT_DEV_* enum is cleaned up once all the references to VIRT_DEV_* are removed. Thoughts? -- Kaitlin Rupert IBM Linux Technology Center kaitlin@linux.vnet.ibm.com