[libvirt] [PATCH] Fixed build with clang.

Two unused global variables, and DBUS_TYPE_INVALID used as a const char*. --- src/phyp/phyp_driver.c | 1 - src/storage/storage_backend_scsi.c | 24 ------------------------ src/util/virdbus.c | 2 +- 3 files changed, 1 insertion(+), 26 deletions(-) diff --git a/src/phyp/phyp_driver.c b/src/phyp/phyp_driver.c index 20b5bd4..9adb6b0 100644 --- a/src/phyp/phyp_driver.c +++ b/src/phyp/phyp_driver.c @@ -66,7 +66,6 @@ * */ static unsigned const int HMC = 0; -static unsigned const int IVM = 127; static unsigned const int PHYP_IFACENAME_SIZE = 24; static unsigned const int PHYP_MAC_SIZE = 12; diff --git a/src/storage/storage_backend_scsi.c b/src/storage/storage_backend_scsi.c index b38e530..44f17c9 100644 --- a/src/storage/storage_backend_scsi.c +++ b/src/storage/storage_backend_scsi.c @@ -107,30 +107,6 @@ struct diskType { unsigned long long magic; }; -static struct diskType const disk_types[] = { - { VIR_STORAGE_POOL_DISK_LVM2, 0x218, 8, 0x31303020324D564CULL }, - { VIR_STORAGE_POOL_DISK_GPT, 0x200, 8, 0x5452415020494645ULL }, - { VIR_STORAGE_POOL_DISK_DVH, 0x0, 4, 0x41A9E50BULL }, - { VIR_STORAGE_POOL_DISK_MAC, 0x0, 2, 0x5245ULL }, - { VIR_STORAGE_POOL_DISK_BSD, 0x40, 4, 0x82564557ULL }, - { VIR_STORAGE_POOL_DISK_SUN, 0x1fc, 2, 0xBEDAULL }, - /* - * NOTE: pc98 is funky; the actual signature is 0x55AA (just like dos), so - * we can't use that. At the moment I'm relying on the "dummy" IPL - * bootloader data that comes from parted. Luckily, the chances of running - * into a pc98 machine running libvirt are approximately nil. - */ - /*{ 0x1fe, 2, 0xAA55UL },*/ - { VIR_STORAGE_POOL_DISK_PC98, 0x0, 8, 0x314C5049000000CBULL }, - /* - * NOTE: the order is important here; some other disk types (like GPT and - * and PC98) also have 0x55AA at this offset. For that reason, the DOS - * one must be the last one. - */ - { VIR_STORAGE_POOL_DISK_DOS, 0x1fe, 2, 0xAA55ULL }, - { -1, 0x0, 0, 0x0ULL }, -}; - static int virStorageBackendSCSIUpdateVolTargetInfo(virStorageVolTargetPtr target, unsigned long long *allocation, diff --git a/src/util/virdbus.c b/src/util/virdbus.c index a0cbbfe..a6232b7 100644 --- a/src/util/virdbus.c +++ b/src/util/virdbus.c @@ -1281,7 +1281,7 @@ int virDBusIsServiceEnabled(const char *name) "/org/freedesktop/DBus", "org.freedesktop.DBus", "ListActivatableNames", - DBUS_TYPE_INVALID) < 0) + NULL) < 0) return ret; if (!dbus_message_iter_init(reply, &iter) || -- 1.8.5.2