[Spice-commits] 2 commits - spice/Makefile.am spice/meson.build spice/vd_agent.h spice/vdi_dev.h

[GitLab Mirror]

 spice/Makefile.am |    1 
 spice/meson.build |    1 
 spice/vd_agent.h  |    6 ---
 spice/vdi_dev.h   |   87 ------------------------------------------------------
 4 files changed, 95 deletions(-)

New commits:
commit faed1bf410d8c95024d9e19a14332e5c756853cd
Author: Victor Toso <me at victortoso.com>
Date:   Mon Mar 2 18:23:16 2020 +0100

    vdi_dev: remove deprecated header
    
    Deprecated since 2d7bf3e "vdi-dev: mark as deprecated" in 2014-12-04
    and version 0.12.8.
    
    Signed-off-by: Victor Toso <victortoso at redhat.com>

diff --git a/spice/Makefile.am b/spice/Makefile.am
index 69c9976..a626eb8 100644
--- a/spice/Makefile.am
+++ b/spice/Makefile.am
@@ -17,7 +17,6 @@ spice_protocol_include_HEADERS =		\
 	stats.h					\
 	types.h					\
 	vd_agent.h				\
-	vdi_dev.h				\
 	stream-device.h				\
 	$(NULL)
 
diff --git a/spice/meson.build b/spice/meson.build
index 05b2b28..b89185a 100644
--- a/spice/meson.build
+++ b/spice/meson.build
@@ -13,7 +13,6 @@ spice_protocol_headers = [
   'stats.h',
   'types.h',
   'vd_agent.h',
-  'vdi_dev.h',
   'stream-device.h',
 ]
 
diff --git a/spice/vdi_dev.h b/spice/vdi_dev.h
deleted file mode 100644
index a27f395..0000000
--- a/spice/vdi_dev.h
+++ /dev/null
@@ -1,87 +0,0 @@
-/*
-   Copyright (C) 2009 Red Hat, Inc.
-
-   Redistribution and use in source and binary forms, with or without
-   modification, are permitted provided that the following conditions are
-   met:
-
-       * Redistributions of source code must retain the above copyright
-         notice, this list of conditions and the following disclaimer.
-       * Redistributions in binary form must reproduce the above copyright
-         notice, this list of conditions and the following disclaimer in
-         the documentation and/or other materials provided with the
-         distribution.
-       * Neither the name of the copyright holder nor the names of its
-         contributors may be used to endorse or promote products derived
-         from this software without specific prior written permission.
-
-   THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDER AND CONTRIBUTORS "AS
-   IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
-   TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A
-   PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-   HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-   SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-   LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-   DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-   THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-   (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-   OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-*/
-
-#ifndef _H_VDI_DEV
-#define _H_VDI_DEV
-
-#include <spice/types.h>
-#include <spice/barrier.h>
-#include <spice/ipc_ring.h>
-#include <spice/macros.h>
-
-#include <spice/start-packed.h>
-
-#ifndef SPICE_DISABLE_DEPRECATED
-#error "This SPICE interface is deprecated"
-#endif
-
-#define REDHAT_PCI_VENDOR_ID 0x1b36
-
-#define VDI_PORT_DEVICE_ID 0x0105
-#define VDI_PORT_REVISION 0x01
-
-#define VDI_PORT_INTERRUPT (1 << 0)
-
-#define VDI_PORT_MAGIC SPICE_MAGIC_CONST("VDIP")
-
-typedef struct SPICE_ATTR_PACKED VDIPortPacket {
-    uint32_t gen;
-    uint32_t size;
-    uint8_t data[512 - 2 * sizeof(uint32_t)];
-} VDIPortPacket;
-
-SPICE_RING_DECLARE(VDIPortRing, VDIPortPacket, 32);
-
-enum {
-    VDI_PORT_IO_RANGE_INDEX,
-    VDI_PORT_RAM_RANGE_INDEX,
-};
-
-enum {
-    VDI_PORT_IO_CONNECTION,
-    VDI_PORT_IO_NOTIFY = 4,
-    VDI_PORT_IO_UPDATE_IRQ = 8,
-
-    VDI_PORT_IO_RANGE_SIZE = 12
-};
-
-typedef struct SPICE_ATTR_PACKED VDIPortRam {
-    uint32_t magic;
-    uint32_t generation;
-    uint32_t int_pending;
-    uint32_t int_mask;
-    VDIPortRing input;
-    VDIPortRing output;
-    uint32_t reserv[32];
-} VDIPortRam;
-
-#include <spice/end-packed.h>
-
-#endif /* _H_VDI_DEV */
commit 1366a78cac6b955195b140c7e7df3fdd55736ce5
Author: Victor Toso <me at victortoso.com>
Date:   Mon Mar 2 18:15:24 2020 +0100

    vd_agent: remove VD_AGENT_CLIPBOARD_MAX_SIZE_[DEFAULT ENV]
    
    Not used since fc1e7e "Mark VD_AGENT_CLIPBOARD_MAX as deprecated" in
    2013-11-14, release v0.12.7
    
    Signed-off-by: Victor Toso <victortoso at redhat.com>

diff --git a/spice/vd_agent.h b/spice/vd_agent.h
index e4e00a8..84c8647 100644
--- a/spice/vd_agent.h
+++ b/spice/vd_agent.h
@@ -57,12 +57,6 @@ typedef struct SPICE_ATTR_PACKED VDAgentMessage {
 #define VD_AGENT_PROTOCOL 1
 #define VD_AGENT_MAX_DATA_SIZE 2048
 
-#ifdef SPICE_DEPRECATED
-#define VD_AGENT_CLIPBOARD_MAX_SIZE_DEFAULT 1024
-#define VD_AGENT_CLIPBOARD_MAX_SIZE_ENV "SPICE_CLIPBOARD_MAX_SIZE"
-#endif
-
-
 /*
  * Messages and types for guest agent.
  * These messages are sent through the virtio port "com.redhat.spice.0"