Merge pull request #1791 from wainersm/virtcontainers-1

virtcontainers: check that both initrd and image are not set

src/runtime/virtcontainers/hypervisor.go

@@ -547,6 +547,10 @@ func (conf *HypervisorConfig) Valid() error {
 		return fmt.Errorf("Missing image and initrd path")
 	}
 
+	if conf.ImagePath != "" && conf.InitrdPath != "" {
+		return fmt.Errorf("Image and initrd path cannot be both set")
+	}
+
 	if err := conf.CheckTemplateConfig(); err != nil {
 		return err
 	}

src/runtime/virtcontainers/hypervisor_test.go

@@ -134,6 +134,17 @@ func TestHypervisorConfigIsValid(t *testing.T) {
 	testHypervisorConfigValid(t, hypervisorConfig, true)
 }
 
+func TestHypervisorConfigBothInitrdAndImage(t *testing.T) {
+	hypervisorConfig := &HypervisorConfig{
+		KernelPath:     fmt.Sprintf("%s/%s", testDir, testKernel),
+		ImagePath:      fmt.Sprintf("%s/%s", testDir, testImage),
+		InitrdPath:     fmt.Sprintf("%s/%s", testDir, testInitrd),
+		HypervisorPath: "",
+	}
+
+	testHypervisorConfigValid(t, hypervisorConfig, false)
+}
+
 func TestHypervisorConfigValidTemplateConfig(t *testing.T) {
 	hypervisorConfig := &HypervisorConfig{
 		KernelPath:       fmt.Sprintf("%s/%s", testDir, testKernel),

src/runtime/virtcontainers/qemu_test.go

@@ -25,7 +25,6 @@ import (
 func newQemuConfig() HypervisorConfig {
 	return HypervisorConfig{
 		KernelPath:        testQemuKernelPath,
-		ImagePath:         testQemuImagePath,
 		InitrdPath:        testQemuInitrdPath,
 		HypervisorPath:    testQemuPath,
 		NumVCPUs:          defaultVCPUs,