conf: Rename virconsole.* to virchrdev.*

This is just code motion, in preparation to rename identifiers to be
less console-specific.

diff --git a/po/POTFILES.in b/po/POTFILES.in
index 4d947998bad59f281d6190dd15f2a517f1a2dd41..95619f9f053fdc9f201f435eedb3b88624a3f36c 100644 (file)
--- a/po/POTFILES.in
+++ b/po/POTFILES.in
@@ -22,7 +22,7 @@ src/conf/secret_conf.c
 src/conf/snapshot_conf.c
 src/conf/storage_conf.c
 src/conf/storage_encryption_conf.c
-src/conf/virconsole.c
+src/conf/virchrdev.c
 src/cpu/cpu.c
 src/cpu/cpu_generic.c
 src/cpu/cpu_map.c

diff --git a/src/Makefile.am b/src/Makefile.am
index 0cfc1eda0016392db91f4dc95e23277dfc437e84..97adc090df0d977882e46d0700e616849ff0949a 100644 (file)
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -246,7 +246,7 @@ CPU_CONF_SOURCES =                                          \
 
 # Safe console handling helper APIs
 CONSOLE_CONF_SOURCES =                                         \
-               conf/virconsole.c conf/virconsole.h
+               conf/virchrdev.c conf/virchrdev.h
 
 # Device Helper APIs
 DEVICE_CONF_SOURCES =                                           \

diff --git a/src/conf/virconsole.c b/src/conf/virchrdev.c
similarity index 99%
rename from src/conf/virconsole.c
rename to src/conf/virchrdev.c
index 239e2d2af50db60ea156b3cea6bc03960246a399..7b471aed11d892833a53805b4afb9d58582aa38e 100644 (file)
--- a/src/conf/virconsole.c
+++ b/src/conf/virchrdev.c
@@ -1,5 +1,5 @@
 /**
- * virconsole.c: api to guarantee mutually exclusive
+ * virchrdev.c: api to guarantee mutually exclusive
  * access to domain's consoles
  *
  * Copyright (C) 2011-2012 Red Hat, Inc.
@@ -27,7 +27,7 @@
 #include <unistd.h>
 #include <sys/types.h>
 
-#include "virconsole.h"
+#include "virchrdev.h"
 #include "virhash.h"
 #include "fdstream.h"
 #include "internal.h"

diff --git a/src/conf/virconsole.h b/src/conf/virchrdev.h
similarity index 95%
rename from src/conf/virconsole.h
rename to src/conf/virchrdev.h
index df9dfe850c1d1c4d03a4e64578cce419174a3554..d5a926a163cdca468a898ad790fb151d62fb9d01 100644 (file)
--- a/src/conf/virconsole.h
+++ b/src/conf/virchrdev.h
@@ -1,5 +1,5 @@
 /**
- * virconsole.h: api to guarantee mutually exclusive
+ * virchrdev.h: api to guarantee mutually exclusive
  * access to domain's consoles
  *
  * Copyright (C) 2011-2012 Red Hat, Inc.

diff --git a/src/libvirt_private.syms b/src/libvirt_private.syms
index 497d5d3a795ddfaafa3cc6c2a6376dfba64c0dc0..b09287d52d0eaf65e954459b6bb207d375752ee1 100644 (file)
--- a/src/libvirt_private.syms
+++ b/src/libvirt_private.syms
@@ -1355,7 +1355,7 @@ virArchGetWordSize;
 virArchToString;
 
 
-# virconsole.h
+# virchrdev.h
 virConsoleAlloc;
 virConsoleFree;
 virConsoleOpen;

diff --git a/src/qemu/qemu_domain.h b/src/qemu/qemu_domain.h
index 00648cf50e36103146bbc8edef69bb25b22c446f..465dc55ff48efa1b7619d449f63024b213d14699 100644 (file)
--- a/src/qemu/qemu_domain.h
+++ b/src/qemu/qemu_domain.h
@@ -31,7 +31,7 @@
 # include "qemu_agent.h"
 # include "qemu_conf.h"
 # include "qemu_capabilities.h"
-# include "virconsole.h"
+# include "virchrdev.h"
 
 # define QEMU_EXPECTED_VIRT_TYPES      \
     ((1 << VIR_DOMAIN_VIRT_QEMU) |     \