← Back to branch summary

~serge-hallyn/ubuntu/oneiric/libvirt/fix-shutdown

« back to all changes in this revision

Viewing changes to src/remote/remote_protocol.c

  • Committer: Bazaar Package Importer
  • Author(s): Serge Hallyn
  • Date: 2010-11-02 16:26:51 UTC
  • mfrom: (1.2.7 upstream)
  • Revision ID: james.westby@ubuntu.com-20101102162651-aq8tnbz58mdf01bf
Tags: 0.8.5-0ubuntu1
* New upstream release.
* Removed a slew of patches which have been
  applied upstream since 0.8.3.
  - 9012-apparmor-extra-tests.patch
  - 9013-apparmor-chardev.patch
  - 9015-Add-ubd-to-the-list-of-disk-prefixes.patch
  - 9016-Close-fd-s-of-persistent-tap-devices.patch
  - 9017-Make-sure-all-command-line-arguments-get-passed-to-U.patch
  - 9018-Make-umlConnectTapDevice-ask-brAddTap-for-a-persiste.patch
  - 9019-uml-fix-logic-bug-in-checking-reply-length.patch
  - 9021-Allow-chardev-of-type-file-for-UML-domains.patch
  - 9022-Rename-qemudShrinkDisks-to-virDomainDiskRemove-and-m.patch
  - 9023-Support-virDomainAttachDevice-and-virDomainDetachDev.patch
  - 9024-Explicitly-pass-uml_dir-argument-to-user-mode-linux.patch
  - 9025-Add-nwfilter-support-to-UML-driver.patch
  - 9026-Rebuild-network-filter-for-UML-guests-on-updates.patch
  - 9027-Make-newfilter-xml-transformations-endian-safe.patch
  - 9028-lp628055.patch
* Updated 9002-better_default_uri_virsh.patch to use vshStrdup,
  as now required in that file.  (use of strdup now causes compilation
  to fail)
* Removed 9008-run-as-root-by-default.patch, which has not been
  applied for awhile now, with no ill effects.
* Simple refresh of:
  - 0001-remove-RHism.diff.patch
  - 0003-allow-libvirt-group-to-access-the-socket.patch
  - 0004-fix-Debian-specific-path-to-hvm-loader.patch
  - 0006-patch-qemuMonitorTextGetMigrationStatus-to-intercept.patch
  - 9000-delayed_iff_up_bridge.patch
  - 9001-dont_clobber_existing_bridges.patch
  - 9003-better-default-arch.patch
  - 9004-libvirtd-group-name.patch
  - 9005-increase-unix-socket-timeout.patch
  - 9006-default-config-test-case.patch
  - 9009-autodetect-nc-params.patch
  - 9010-dont-disable-ipv6.patch
  - 9011-move-ebtables-script.patch
  - 9014-skip-nodeinfotest.patch
  - 9020-lp545795.patch
* Create a patch to include stdint.h so lxc_container.h, which
  #includes linux/fs.h, doesn't trip up on undefined uint64_t.

Show diffs side-by-side

added added

removed removed

Lines of Context:
src/remote/remote_protocol.c
16
16
#ifndef IXDR_GET_INT32
17
17
# define IXDR_GET_INT32 IXDR_GET_LONG
18
18
#endif
 
19
#ifndef IXDR_PUT_U_INT32
 
20
# define IXDR_PUT_U_INT32 IXDR_PUT_U_LONG
 
21
#endif
 
22
#ifndef IXDR_GET_U_INT32
 
23
# define IXDR_GET_U_INT32 IXDR_GET_U_LONG
 
24
#endif
19
25
 
20
26
bool_t
21
27
xdr_remote_nonnull_string (XDR *xdrs, remote_nonnull_string *objp)
302
308
}
303
309
 
304
310
bool_t
 
311
xdr_remote_memory_param_value (XDR *xdrs, remote_memory_param_value *objp)
 
312
{
 
313
 
 
314
         if (!xdr_int (xdrs, &objp->type))
 
315
                 return FALSE;
 
316
        switch (objp->type) {
 
317
        case VIR_DOMAIN_MEMORY_PARAM_INT:
 
318
                         return FALSE;
 
319
                break;
 
320
        case VIR_DOMAIN_MEMORY_PARAM_UINT:
 
321
                 if (!xdr_u_int (xdrs, &objp->remote_memory_param_value_u.ui))
 
322
                         return FALSE;
 
323
                break;
 
324
        case VIR_DOMAIN_MEMORY_PARAM_LLONG:
 
325
                 if (!xdr_int64_t (xdrs, &objp->remote_memory_param_value_u.l))
 
326
                         return FALSE;
 
327
                break;
 
328
        case VIR_DOMAIN_MEMORY_PARAM_ULLONG:
 
329
                 if (!xdr_uint64_t (xdrs, &objp->remote_memory_param_value_u.ul))
 
330
                         return FALSE;
 
331
                break;
 
332
        case VIR_DOMAIN_MEMORY_PARAM_DOUBLE:
 
333
                 if (!xdr_double (xdrs, &objp->remote_memory_param_value_u.d))
 
334
                         return FALSE;
 
335
                break;
 
336
        case VIR_DOMAIN_MEMORY_PARAM_BOOLEAN:
 
337
                 if (!xdr_int (xdrs, &objp->remote_memory_param_value_u.b))
 
338
                         return FALSE;
 
339
                break;
 
340
        default:
 
341
                return FALSE;
 
342
        }
 
343
        return TRUE;
 
344
}
 
345
 
 
346
bool_t
 
347
xdr_remote_memory_param (XDR *xdrs, remote_memory_param *objp)
 
348
{
 
349
 
 
350
         if (!xdr_remote_nonnull_string (xdrs, &objp->field))
 
351
                 return FALSE;
 
352
         if (!xdr_remote_memory_param_value (xdrs, &objp->value))
 
353
                 return FALSE;
 
354
        return TRUE;
 
355
}
 
356
 
 
357
bool_t
305
358
xdr_remote_open_args (XDR *xdrs, remote_open_args *objp)
306
359
{
307
360
 
575
628
}
576
629
 
577
630
bool_t
 
631
xdr_remote_domain_set_memory_parameters_args (XDR *xdrs, remote_domain_set_memory_parameters_args *objp)
 
632
{
 
633
        char **objp_cpp0 = (char **) (void *) &objp->params.params_val;
 
634
 
 
635
         if (!xdr_remote_nonnull_domain (xdrs, &objp->dom))
 
636
                 return FALSE;
 
637
         if (!xdr_array (xdrs, objp_cpp0, (u_int *) &objp->params.params_len, REMOTE_DOMAIN_MEMORY_PARAMETERS_MAX,
 
638
                sizeof (remote_memory_param), (xdrproc_t) xdr_remote_memory_param))
 
639
                 return FALSE;
 
640
         if (!xdr_u_int (xdrs, &objp->flags))
 
641
                 return FALSE;
 
642
        return TRUE;
 
643
}
 
644
 
 
645
bool_t
 
646
xdr_remote_domain_get_memory_parameters_args (XDR *xdrs, remote_domain_get_memory_parameters_args *objp)
 
647
{
 
648
 
 
649
         if (!xdr_remote_nonnull_domain (xdrs, &objp->dom))
 
650
                 return FALSE;
 
651
         if (!xdr_int (xdrs, &objp->nparams))
 
652
                 return FALSE;
 
653
         if (!xdr_u_int (xdrs, &objp->flags))
 
654
                 return FALSE;
 
655
        return TRUE;
 
656
}
 
657
 
 
658
bool_t
 
659
xdr_remote_domain_get_memory_parameters_ret (XDR *xdrs, remote_domain_get_memory_parameters_ret *objp)
 
660
{
 
661
        char **objp_cpp0 = (char **) (void *) &objp->params.params_val;
 
662
 
 
663
         if (!xdr_array (xdrs, objp_cpp0, (u_int *) &objp->params.params_len, REMOTE_DOMAIN_MEMORY_PARAMETERS_MAX,
 
664
                sizeof (remote_memory_param), (xdrproc_t) xdr_remote_memory_param))
 
665
                 return FALSE;
 
666
         if (!xdr_int (xdrs, &objp->nparams))
 
667
                 return FALSE;
 
668
        return TRUE;
 
669
}
 
670
 
 
671
bool_t
578
672
xdr_remote_domain_block_stats_args (XDR *xdrs, remote_domain_block_stats_args *objp)
579
673
{
580
674
 
1261
1355
}
1262
1356
 
1263
1357
bool_t
 
1358
xdr_remote_domain_set_vcpus_flags_args (XDR *xdrs, remote_domain_set_vcpus_flags_args *objp)
 
1359
{
 
1360
 
 
1361
         if (!xdr_remote_nonnull_domain (xdrs, &objp->dom))
 
1362
                 return FALSE;
 
1363
         if (!xdr_u_int (xdrs, &objp->nvcpus))
 
1364
                 return FALSE;
 
1365
         if (!xdr_u_int (xdrs, &objp->flags))
 
1366
                 return FALSE;
 
1367
        return TRUE;
 
1368
}
 
1369
 
 
1370
bool_t
 
1371
xdr_remote_domain_get_vcpus_flags_args (XDR *xdrs, remote_domain_get_vcpus_flags_args *objp)
 
1372
{
 
1373
 
 
1374
         if (!xdr_remote_nonnull_domain (xdrs, &objp->dom))
 
1375
                 return FALSE;
 
1376
         if (!xdr_u_int (xdrs, &objp->flags))
 
1377
                 return FALSE;
 
1378
        return TRUE;
 
1379
}
 
1380
 
 
1381
bool_t
 
1382
xdr_remote_domain_get_vcpus_flags_ret (XDR *xdrs, remote_domain_get_vcpus_flags_ret *objp)
 
1383
{
 
1384
 
 
1385
         if (!xdr_int (xdrs, &objp->num))
 
1386
                 return FALSE;
 
1387
        return TRUE;
 
1388
}
 
1389
 
 
1390
bool_t
1264
1391
xdr_remote_domain_pin_vcpu_args (XDR *xdrs, remote_domain_pin_vcpu_args *objp)
1265
1392
{
1266
1393
        char **objp_cpp0 = (char **) (void *) &objp->cpumap.cpumap_val;