Fix compilation errors

Change-Id: I03c31fe1680f65f4622e0a0c4e743790a61d48fe
Signed-off-by: SeokYeon Hwang <syeon.hwang@samsung.com>

diff --git a/block/vmdk.c b/block/vmdk.c
index 009c35301b877f43f461b8e86bf3dbd9c5edf69e..346bb5cad9559588a392b3ca859692fc7cacb26e 100644 (file)
--- a/block/vmdk.c
+++ b/block/vmdk.c
@@ -524,7 +524,6 @@ static int vmdk_open_vmdk4(BlockDriverState *bs,
         return ret;
     }
     if (header.capacity == 0) {
-        int64_t desc_offset = le64_to_cpu(header.desc_offset);
         uint64_t desc_offset = le64_to_cpu(header.desc_offset);
         if (desc_offset) {
             return vmdk_open_desc_file(bs, flags, desc_offset << 9);

diff --git a/configure b/configure
index 3cdb221e41a377c608a2450f7b42c36d57ad2051..1c98b15a0253d6e4de6cdb8822690b215d6bd48c 100755 (executable)
--- a/configure
+++ b/configure
@@ -1145,7 +1145,6 @@ echo "  --enable-bluez           enable bluez stack connectivity"
 echo "  --disable-slirp          disable SLIRP userspace network connectivity"
 echo "  --disable-kvm            disable KVM acceleration support"
 echo "  --enable-kvm             enable KVM acceleration support"
-echo "  --disable-gl             disable GL acceleration support"
 
 echo "  --disable-hax            disable HAX acceleration support"
 echo "  --enable-hax             enable HAX acceleration support"
@@ -4483,13 +4482,13 @@ case "$target_name" in
       fi
     fi
 esac
-case "$target_arch2" in
+case "$target_name" in
   i386|x86_64)
     echo "CONFIG_HAVE_GET_MEMORY_MAPPING=y" >> $config_target_mak
 esac
 if test "$hax" = "yes" ; then
   if test "$target_softmmu" = "yes" ; then
-    case "$target_arch2" in
+    case "$target_name" in
     i386|x86_64)
       echo "CONFIG_HAX=y" >> $config_target_mak
     ;;
@@ -4502,7 +4501,7 @@ if test "$hax" = "yes" ; then
   fi
 fi
 if test "$gl" = "yes" ; then
-  case "$target_arch2" in
+  case "$target_name" in
   i386|x86_64|arm)
     echo "CONFIG_GL=y" >> $config_target_mak
     if test "$mingw32" = "yes" ; then
@@ -4518,9 +4517,6 @@ if test "$gl" = "yes" ; then
   ;;
   esac
 fi
-if test "$target_arch2" = "ppc64" -a "$fdt" = "yes"; then
-  echo "CONFIG_PSERIES=y" >> $config_target_mak
-fi
 if test "$target_bigendian" = "yes" ; then
   echo "TARGET_WORDS_BIGENDIAN=y" >> $config_target_mak
 fi

diff --git a/hw/display/vga-pci.c b/hw/display/vga-pci.c
index 4932670c1ea60e3eccb78477c5e8e5e4a06cab8b..16f073a8d85d71069ee300051de1a81552a16137 100644 (file)
--- a/hw/display/vga-pci.c
+++ b/hw/display/vga-pci.c
@@ -151,7 +151,7 @@ static int pci_std_vga_initfn(PCIDevice *dev)
 
     /* vga + console init */
 #ifdef CONFIG_MARU
-    maru_vga_common_init(s);
+    maru_vga_common_init(s, OBJECT(dev));
 #else
     vga_common_init(s, OBJECT(dev));
 #endif

diff --git a/hw/pci/pci-hotplug-old.c b/hw/pci/pci-hotplug-old.c
index 50d924b57098eac6e7a203616c7f6021506059d2..6538138a8e0d2a673d4525ec655f070b0740d38f 100644 (file)
--- a/hw/pci/pci-hotplug-old.c
+++ b/hw/pci/pci-hotplug-old.c
@@ -267,10 +267,17 @@ static PCIDevice *qemu_pci_hot_add_keyboard(Monitor *mon,
                                             const char *opts)
 {
     PCIDevice *dev;
+    PCIBus *root = pci_find_primary_bus();
     PCIBus *bus;
     int devfn;
 
-    bus = pci_get_bus_devfn(&devfn, devaddr);
+    if (!root) {
+        monitor_printf(mon, "no primary PCI bus (if there are multiple"
+                       " PCI roots, you must use device_add instead)");
+        return NULL;
+    }
+
+    bus = pci_get_bus_devfn(&devfn, root, devaddr);
     if (!bus) {
         monitor_printf(mon, "Invalid PCI device address %s\n", devaddr);
         return NULL;

diff --git a/include/exec/cpu-defs.h b/include/exec/cpu-defs.h
index 21a694e15263d635cda125b78c1e1e9f57d39355..a4a527b2a08b4dcf073463f73a37cd71678ac70e 100644 (file)
--- a/include/exec/cpu-defs.h
+++ b/include/exec/cpu-defs.h
@@ -180,8 +180,6 @@ typedef struct CPUWatchpoint {
     int hax_vcpu_dirty;                                                 \
     struct hax_vcpu_state *hax_vcpu;                                    \
                                                                         \
-    CPUArchState *next_cpu; /* next CPU sharing TB cache */                 \
-
     /* user data */                                                     \
     void *opaque;                                                       \
                                                                         \

diff --git a/qapi-schema.json b/qapi-schema.json
index 904b56091638ce0aa9b2fe352311274d21f1d03a..cdbe4a909f60633ab05f3e231ab0d58dc847acc9 100644 (file)
--- a/qapi-schema.json
+++ b/qapi-schema.json
@@ -3082,7 +3082,7 @@
 # Since: 1.2.0
 ##
 { 'type': 'FdsetInfo',
-  'data': {'fdset-id': yy'int', 'fds': ['FdsetFdInfo']} }
+  'data': {'fdset-id': 'int', 'fds': ['FdsetFdInfo']} }
 
 ##
 # @query-fdsets:
@@ -3121,8 +3121,6 @@
 ##
 { 'command': 'query-target', 'returns': 'TargetInfo' }
 
-
-
 ## Eric 2013.3.7 ##
 
 ##
@@ -3139,17 +3137,6 @@
 { 'type': 'AccelInfo',
   'data': { 'Xaxis': 'int', 'Yaxis': 'int', 'Zaxis' : 'int'} }
 
-##
-# @query-accel:
-#
-# Return information about the acceleration sensor value
-#
-# Returns: AccelInfo
-#
-# Since: 1.2.0
-##
-{ 'command': 'query-accel', 'returns': 'AccelInfo' }
-
 ##
 # @QKeyCode:
 #