Use same state object for state and list

Signed-off-by: Michael Crosby <crosbymichael@gmail.com>

state.go

@@ -5,36 +5,12 @@ package main
 import (
 	"encoding/json"
 	"os"
-	"time"
 
 	"github.com/opencontainers/runc/libcontainer"
 	"github.com/opencontainers/runc/libcontainer/utils"
 	"github.com/urfave/cli"
 )
 
-// cState represents the platform agnostic pieces relating to a running
-// container's status and state.  Note: The fields in this structure adhere to
-// the opencontainers/runtime-spec/specs-go requirement for json fields that must be returned
-// in a state command.
-type cState struct {
-	// Version is the OCI version for the container
-	Version string `json:"ociVersion"`
-	// ID is the container ID
-	ID string `json:"id"`
-	// InitProcessPid is the init process id in the parent namespace
-	InitProcessPid int `json:"pid"`
-	// Bundle is the path on the filesystem to the bundle
-	Bundle string `json:"bundlePath"`
-	// Rootfs is a path to a directory containing the container's root filesystem.
-	Rootfs string `json:"rootfsPath"`
-	// Status is the current status of the container, running, paused, ...
-	Status string `json:"status"`
-	// Created is the unix timestamp for the creation time of the container in UTC
-	Created time.Time `json:"created"`
-	// Annotations is the user defined annotations added to the config.
-	Annotations map[string]string `json:"annotations,omitempty"`
-}
-
 var stateCommand = cli.Command{
 	Name:  "state",
 	Usage: "output the state of a container",
@@ -61,7 +37,7 @@ instance of a container.`,
 			pid = 0
 		}
 		bundle, annotations := utils.Annotations(state.Config.Labels)
-		cs := cState{
+		cs := containerState{
 			Version:        state.BaseState.Config.Version,
 			ID:             state.BaseState.ID,
 			InitProcessPid: pid,