From 3c159525844de8db27ad919d2d30b6a744a01506 Mon Sep 17 00:00:00 2001 From: Ian Campbell Date: Wed, 20 Apr 2011 17:13:07 +0100 Subject: tools: libxl: move all enum values into the libxl namespace Signed-off-by: Ian Campbell Acked-by: Ian Jackson Committed-by: Ian Jackson --- tools/python/xen/lowlevel/xl/xl.c | 32 ++++++++++++++++---------------- 1 file changed, 16 insertions(+), 16 deletions(-) (limited to 'tools/python') diff --git a/tools/python/xen/lowlevel/xl/xl.c b/tools/python/xen/lowlevel/xl/xl.c index 9910c449da..692104816b 100644 --- a/tools/python/xen/lowlevel/xl/xl.c +++ b/tools/python/xen/lowlevel/xl/xl.c @@ -769,8 +769,8 @@ PyMODINIT_FUNC initxl(void) _INT_CONST(m, SHUTDOWN_crash); _INT_CONST(m, SHUTDOWN_watchdog); - _INT_CONST(m, XENFV); - _INT_CONST(m, XENPV); + _INT_CONST_LIBXL(m, QEMU_MACHINE_TYPE_FV); + _INT_CONST_LIBXL(m, QEMU_MACHINE_TYPE_PV); _INT_CONST_LIBXL(m, CONSTYPE_SERIAL); _INT_CONST_LIBXL(m, CONSTYPE_PV); @@ -778,26 +778,26 @@ PyMODINIT_FUNC initxl(void) _INT_CONST_LIBXL(m, CONSBACK_XENCONSOLED); _INT_CONST_LIBXL(m, CONSBACK_IOEMU); - _INT_CONST(m, DISK_FORMAT_UNKNOWN); - _INT_CONST(m, DISK_FORMAT_QCOW); - _INT_CONST(m, DISK_FORMAT_QCOW2); - _INT_CONST(m, DISK_FORMAT_VHD); - _INT_CONST(m, DISK_FORMAT_RAW); - _INT_CONST(m, DISK_FORMAT_EMPTY); + _INT_CONST_LIBXL(m, DISK_FORMAT_UNKNOWN); + _INT_CONST_LIBXL(m, DISK_FORMAT_QCOW); + _INT_CONST_LIBXL(m, DISK_FORMAT_QCOW2); + _INT_CONST_LIBXL(m, DISK_FORMAT_VHD); + _INT_CONST_LIBXL(m, DISK_FORMAT_RAW); + _INT_CONST_LIBXL(m, DISK_FORMAT_EMPTY); - _INT_CONST(m, DISK_BACKEND_UNKNOWN); - _INT_CONST(m, DISK_BACKEND_PHY); - _INT_CONST(m, DISK_BACKEND_TAP); - _INT_CONST(m, DISK_BACKEND_QDISK); + _INT_CONST_LIBXL(m, DISK_BACKEND_UNKNOWN); + _INT_CONST_LIBXL(m, DISK_BACKEND_PHY); + _INT_CONST_LIBXL(m, DISK_BACKEND_TAP); + _INT_CONST_LIBXL(m, DISK_BACKEND_QDISK); - _INT_CONST(m, NICTYPE_IOEMU); - _INT_CONST(m, NICTYPE_VIF); + _INT_CONST_LIBXL(m, NICTYPE_IOEMU); + _INT_CONST_LIBXL(m, NICTYPE_VIF); _INT_CONST_LIBXL(m, EVENT_DOMAIN_DEATH); _INT_CONST_LIBXL(m, EVENT_DISK_EJECT); - _INT_CONST(m, POWER_BUTTON); - _INT_CONST(m, SLEEP_BUTTON); + _INT_CONST_LIBXL(m, BUTTON_POWER); + _INT_CONST_LIBXL(m, BUTTON_SLEEP); genwrap__init(m); } -- cgit v1.2.3