fixed block device mapping for request-spot-instances

Author: timkay

aws

@@ -200,7 +200,13 @@ $iam_version = "2010-05-08";
 									      [kernel => "LaunchSpecification.KernelId"],
 									      [ramdisk => "LaunchSpecification.RamdiskId"],
 									      [subnet => "LaunchSpecification.SubnetId"],
-									      ["block-device-mapping b" => "LaunchSpecification.blockDeviceMapping.N.DeviceName"],
+									      ["block-device-mapping b", undef, undef, \&parse_block_device_mapping],
+									      ["device-name" => "BlockDeviceMapping.N.DeviceName"],
+									      ["no-device" => "BlockDeviceMapping.N.Ebs.NoDevice"],
+									      ["virtual-name" => "BlockDeviceMapping.N.VirtualName"],
+									      [snapshot => "BlockDeviceMapping.N.Ebs.SnapshotId"],
+									      ["volume-size" => "BlockDeviceMapping.N.Ebs.VolumeSize"],
+									      ["delete-on-termination" => "BlockDeviceMapping.N.Ebs.DeleteOnTermination"],
 									      [monitor => "LaunchSpecification.Monitoring.Enabled"],
 								 ]],
 	["ec2", "revoke", RevokeSecurityGroupIngress, [