From 4c85421c6c8efcd8d13865e9ad9044a55ca001c5 Mon Sep 17 00:00:00 2001 From: John Eckersberg Date: Wed, 2 Jan 2013 10:38:51 -0500 Subject: [PATCH] conf: Rename virconsole.* to virchrdev.* This is just code motion, in preparation to rename identifiers to be less console-specific. --- po/POTFILES.in | 2 +- src/Makefile.am | 2 +- src/conf/{virconsole.c => virchrdev.c} | 4 ++-- src/conf/{virconsole.h => virchrdev.h} | 2 +- src/libvirt_private.syms | 2 +- src/qemu/qemu_domain.h | 2 +- 6 files changed, 7 insertions(+), 7 deletions(-) rename src/conf/{virconsole.c => virchrdev.c} (99%) rename src/conf/{virconsole.h => virchrdev.h} (95%) diff --git a/po/POTFILES.in b/po/POTFILES.in index 4d947998ba..95619f9f05 100644 --- 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 0cfc1eda00..97adc090df 100644 --- 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 239e2d2af5..7b471aed11 100644 --- 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 #include -#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 df9dfe850c..d5a926a163 100644 --- 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 497d5d3a79..b09287d52d 100644 --- 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 00648cf50e..465dc55ff4 100644 --- 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) | \ -- 2.47.2