cryptospore / rpms / qemu-kvm

Forked from rpms/qemu-kvm 2 years ago
Clone

Blame SOURCES/kvm-fw_cfg-remove-support-for-guest-side-data-writes.patch

5d360b
From bc5ebe6df8479b32dbf46f75f32cfad7008a14f0 Mon Sep 17 00:00:00 2001
5d360b
From: =?UTF-8?q?Marc-Andr=C3=A9=20Lureau?= <marcandre.lureau@redhat.com>
5d360b
Date: Wed, 13 Dec 2017 13:38:32 +0100
5d360b
Subject: [PATCH 01/41] fw_cfg: remove support for guest-side data writes
5d360b
MIME-Version: 1.0
5d360b
Content-Type: text/plain; charset=UTF-8
5d360b
Content-Transfer-Encoding: 8bit
5d360b
5d360b
RH-Author: Marc-André Lureau <marcandre.lureau@redhat.com>
5d360b
Message-id: <20171213133912.26176-2-marcandre.lureau@redhat.com>
5d360b
Patchwork-id: 78353
5d360b
O-Subject: [RHEL-7.5 qemu-kvm PATCH v3 01/41] fw_cfg: remove support for guest-side data writes
5d360b
Bugzilla: 1411490
5d360b
RH-Acked-by: Laszlo Ersek <lersek@redhat.com>
5d360b
RH-Acked-by: Michael S. Tsirkin <mst@redhat.com>
5d360b
RH-Acked-by: Miroslav Rezanina <mrezanin@redhat.com>
5d360b
5d360b
From: "Gabriel L. Somlo" <somlo@cmu.edu>
5d360b
5d360b
>From this point forward, any guest-side writes to the fw_cfg
5d360b
data register will be treated as no-ops. This patch also removes
5d360b
the unused host-side API function fw_cfg_add_callback(), which
5d360b
allowed the registration of a callback to be executed each time
5d360b
the guest completed a full overwrite of a given fw_cfg data item.
5d360b
5d360b
Signed-off-by: Gabriel Somlo <somlo@cmu.edu>
5d360b
Reviewed-by: Laszlo Ersek <lersek@redhat.com>
5d360b
Signed-off-by: Gerd Hoffmann <kraxel@redhat.com>
5d360b
5d360b
(cherry picked from commit 023e3148567ac898c7258138f8e86c3c2bb40d07)
5d360b
5d360b
RHEL: Fix conflicts, due to fw_cfg_modify_bytes_read() introduction in
5d360b
      upstream commit bdbb5b1706d165e8d4222121f1e9b59b6b4359ce.
5d360b
5d360b
Signed-off-by: Marc-André Lureau <marcandre.lureau@redhat.com>
5d360b
Signed-off-by: Miroslav Rezanina <mrezanin@redhat.com>
5d360b
---
5d360b
 hw/nvram/fw_cfg.c         | 35 +----------------------------------
5d360b
 include/hw/nvram/fw_cfg.h |  2 --
5d360b
 trace-events              |  1 -
5d360b
 3 files changed, 1 insertion(+), 37 deletions(-)
5d360b
5d360b
diff --git a/hw/nvram/fw_cfg.c b/hw/nvram/fw_cfg.c
5d360b
index fcb3146..9d7b99e 100644
5d360b
--- a/hw/nvram/fw_cfg.c
5d360b
+++ b/hw/nvram/fw_cfg.c
5d360b
@@ -40,7 +40,6 @@ typedef struct FWCfgEntry {
5d360b
     uint32_t len;
5d360b
     uint8_t *data;
5d360b
     void *callback_opaque;
5d360b
-    FWCfgCallback callback;
5d360b
     FWCfgReadCallback read_callback;
5d360b
 } FWCfgEntry;
5d360b
 
5d360b
@@ -206,22 +205,7 @@ static void fw_cfg_reboot(FWCfgState *s)
5d360b
 
5d360b
 static void fw_cfg_write(FWCfgState *s, uint8_t value)
5d360b
 {
5d360b
-    int arch = !!(s->cur_entry & FW_CFG_ARCH_LOCAL);
5d360b
-    FWCfgEntry *e = (s->cur_entry == FW_CFG_INVALID) ? NULL :
5d360b
-                     &s->entries[arch][s->cur_entry & FW_CFG_ENTRY_MASK];
5d360b
-
5d360b
-    trace_fw_cfg_write(s, value);
5d360b
-
5d360b
-    if (s->cur_entry & FW_CFG_WRITE_CHANNEL
5d360b
-        && e != NULL
5d360b
-        && e->callback
5d360b
-        && s->cur_offset < e->len) {
5d360b
-        e->data[s->cur_offset++] = value;
5d360b
-        if (s->cur_offset == e->len) {
5d360b
-            e->callback(e->callback_opaque, e->data);
5d360b
-            s->cur_offset = 0;
5d360b
-        }
5d360b
-    }
5d360b
+    /* nothing, write support removed in QEMU v2.4+ */
5d360b
 }
5d360b
 
5d360b
 static int fw_cfg_select(FWCfgState *s, uint16_t key)
5d360b
@@ -442,23 +426,6 @@ void fw_cfg_add_i64(FWCfgState *s, uint16_t key, uint64_t value)
5d360b
     fw_cfg_add_bytes(s, key, copy, sizeof(value));
5d360b
 }
5d360b
 
5d360b
-void fw_cfg_add_callback(FWCfgState *s, uint16_t key, FWCfgCallback callback,
5d360b
-                         void *callback_opaque, void *data, size_t len)
5d360b
-{
5d360b
-    int arch = !!(key & FW_CFG_ARCH_LOCAL);
5d360b
-
5d360b
-    assert(key & FW_CFG_WRITE_CHANNEL);
5d360b
-
5d360b
-    key &= FW_CFG_ENTRY_MASK;
5d360b
-
5d360b
-    assert(key < FW_CFG_MAX_ENTRY && len <= UINT32_MAX);
5d360b
-
5d360b
-    s->entries[arch][key].data = data;
5d360b
-    s->entries[arch][key].len = (uint32_t)len;
5d360b
-    s->entries[arch][key].callback_opaque = callback_opaque;
5d360b
-    s->entries[arch][key].callback = callback;
5d360b
-}
5d360b
-
5d360b
 void fw_cfg_add_file_callback(FWCfgState *s,  const char *filename,
5d360b
                               FWCfgReadCallback callback, void *callback_opaque,
5d360b
                               void *data, size_t len)
5d360b
diff --git a/include/hw/nvram/fw_cfg.h b/include/hw/nvram/fw_cfg.h
5d360b
index 72b1549..aa5f351 100644
5d360b
--- a/include/hw/nvram/fw_cfg.h
5d360b
+++ b/include/hw/nvram/fw_cfg.h
5d360b
@@ -69,8 +69,6 @@ void fw_cfg_add_string(FWCfgState *s, uint16_t key, const char *value);
5d360b
 void fw_cfg_add_i16(FWCfgState *s, uint16_t key, uint16_t value);
5d360b
 void fw_cfg_add_i32(FWCfgState *s, uint16_t key, uint32_t value);
5d360b
 void fw_cfg_add_i64(FWCfgState *s, uint16_t key, uint64_t value);
5d360b
-void fw_cfg_add_callback(FWCfgState *s, uint16_t key, FWCfgCallback callback,
5d360b
-                         void *callback_opaque, void *data, size_t len);
5d360b
 void fw_cfg_add_file(FWCfgState *s, const char *filename, void *data,
5d360b
                      size_t len);
5d360b
 void fw_cfg_add_file_callback(FWCfgState *s, const char *filename,
5d360b
diff --git a/trace-events b/trace-events
5d360b
index fa2618d..a987dfa 100644
5d360b
--- a/trace-events
5d360b
+++ b/trace-events
5d360b
@@ -176,7 +176,6 @@ ecc_diag_mem_writeb(uint64_t addr, uint32_t val) "Write diagnostic %"PRId64" = %
5d360b
 ecc_diag_mem_readb(uint64_t addr, uint32_t ret) "Read diagnostic %"PRId64"= %02x"
5d360b
 
5d360b
 # hw/nvram/fw_cfg.c
5d360b
-fw_cfg_write(void *s, uint8_t value) "%p %d"
5d360b
 fw_cfg_select(void *s, uint16_t key, int ret) "%p key %d = %d"
5d360b
 fw_cfg_read(void *s, uint8_t ret) "%p = %d"
5d360b
 fw_cfg_add_file_dupe(void *s, char *name) "%p %s"
5d360b
-- 
5d360b
1.8.3.1
5d360b