Drop duplicated code. Minor codechanges were required
as geometry is a sub-structure now.
Signed-off-by: NMichael S. Tsirkin <mst@redhat.com>
Reviewed-by: NThomas Huth <thuth@linux.vnet.ibm.com>