From e4a68a70ad01a1ef2e2a42de94515c78cf4d5a92 Mon Sep 17 00:00:00 2001
From: Julio Montes <julio.montes@intel.com>
Date: Thu, 12 Nov 2020 15:51:03 -0600
Subject: [PATCH] runtime: clh: update cloud-hypervisor

Update cloud-hypervisor to commit 2706319.
Fixes a limitation in OpenAPITools/openapi-generator tool,
it's impossible to send go zero types, like false and 0 to
cloud-hypervisor because `omitempty` is added if a field is not
required.
See cloud-hypervisor/cloud-hypervisor#1961 for more information

Depends-on: github.com/kata-containers/tests#3058

Signed-off-by: Julio Montes <julio.montes@intel.com>
---
 versions.yaml                                             | 2 +-
 .../pkg/cloud-hypervisor/client/api/openapi.yaml          | 4 ++++
 .../pkg/cloud-hypervisor/client/docs/FsConfig.md          | 8 ++++----
 .../pkg/cloud-hypervisor/client/model_fs_config.go        | 8 ++++----
 virtcontainers/pkg/cloud-hypervisor/cloud-hypervisor.yaml | 6 +++++-
 5 files changed, 18 insertions(+), 10 deletions(-)

diff --git a/versions.yaml b/versions.yaml
index 421e282efd..7084b5d4ca 100644
--- a/versions.yaml
+++ b/versions.yaml
@@ -75,7 +75,7 @@ assets:
       url: "https://github.com/cloud-hypervisor/cloud-hypervisor"
       uscan-url: >-
         https://github.com/cloud-hypervisor/cloud-hypervisor/tags.*/v?(\d\S+)\.tar\.gz
-      version: "v0.11.0"
+      version: "270631922deee9bdea13635a104e111768446c7b"
 
     firecracker:
       description: "Firecracker micro-VMM"
diff --git a/virtcontainers/pkg/cloud-hypervisor/client/api/openapi.yaml b/virtcontainers/pkg/cloud-hypervisor/client/api/openapi.yaml
index 1b52394ad5..6a22d1eeb0 100644
--- a/virtcontainers/pkg/cloud-hypervisor/client/api/openapi.yaml
+++ b/virtcontainers/pkg/cloud-hypervisor/client/api/openapi.yaml
@@ -1078,6 +1078,10 @@ components:
         id:
           type: string
       required:
+      - cache_size
+      - dax
+      - num_queues
+      - queue_size
       - socket
       - tag
       type: object
diff --git a/virtcontainers/pkg/cloud-hypervisor/client/docs/FsConfig.md b/virtcontainers/pkg/cloud-hypervisor/client/docs/FsConfig.md
index d9bb88b953..bf8e7e0700 100644
--- a/virtcontainers/pkg/cloud-hypervisor/client/docs/FsConfig.md
+++ b/virtcontainers/pkg/cloud-hypervisor/client/docs/FsConfig.md
@@ -6,10 +6,10 @@ Name | Type | Description | Notes
 ------------ | ------------- | ------------- | -------------
 **Tag** | **string** |  | 
 **Socket** | **string** |  | 
-**NumQueues** | **int32** |  | [optional] [default to 1]
-**QueueSize** | **int32** |  | [optional] [default to 1024]
-**Dax** | **bool** |  | [optional] [default to true]
-**CacheSize** | **int64** |  | [optional] 
+**NumQueues** | **int32** |  | [default to 1]
+**QueueSize** | **int32** |  | [default to 1024]
+**Dax** | **bool** |  | [default to true]
+**CacheSize** | **int64** |  | 
 **Id** | **string** |  | [optional] 
 
 [[Back to Model list]](../README.md#documentation-for-models) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to README]](../README.md)
diff --git a/virtcontainers/pkg/cloud-hypervisor/client/model_fs_config.go b/virtcontainers/pkg/cloud-hypervisor/client/model_fs_config.go
index 568915feb0..6b1ccb8644 100644
--- a/virtcontainers/pkg/cloud-hypervisor/client/model_fs_config.go
+++ b/virtcontainers/pkg/cloud-hypervisor/client/model_fs_config.go
@@ -12,9 +12,9 @@ package openapi
 type FsConfig struct {
 	Tag string `json:"tag"`
 	Socket string `json:"socket"`
-	NumQueues int32 `json:"num_queues,omitempty"`
-	QueueSize int32 `json:"queue_size,omitempty"`
-	Dax bool `json:"dax,omitempty"`
-	CacheSize int64 `json:"cache_size,omitempty"`
+	NumQueues int32 `json:"num_queues"`
+	QueueSize int32 `json:"queue_size"`
+	Dax bool `json:"dax"`
+	CacheSize int64 `json:"cache_size"`
 	Id string `json:"id,omitempty"`
 }
diff --git a/virtcontainers/pkg/cloud-hypervisor/cloud-hypervisor.yaml b/virtcontainers/pkg/cloud-hypervisor/cloud-hypervisor.yaml
index 5de235755c..06a9bb3f59 100644
--- a/virtcontainers/pkg/cloud-hypervisor/cloud-hypervisor.yaml
+++ b/virtcontainers/pkg/cloud-hypervisor/cloud-hypervisor.yaml
@@ -654,8 +654,12 @@ components:
 
     FsConfig:
       required:
-      - tag
+      - cache_size
+      - dax
+      - num_queues
+      - queue_size
       - socket
+      - tag
       type: object
       properties:
         tag: